From 19c05e8d43fc4aef12668ecc9144bb9669cc7bbc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Silva?=
<123550+andresilva@users.noreply.github.com>
Date: Thu, 23 Nov 2023 17:00:54 +0000
Subject: [PATCH] Fix trait imports from sp-api (#2472)
Broken after #2446.
---
Cargo.lock | 1 +
.../relay-chain-minimal-node/src/blockchain_rpc_client.rs | 3 ++-
polkadot/node/subsystem-types/Cargo.toml | 1 +
polkadot/node/subsystem-types/src/runtime_client.rs | 3 ++-
4 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
index 1fe9d1b8192..abd539ea799 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -12860,6 +12860,7 @@ dependencies = [
"sp-authority-discovery",
"sp-blockchain",
"sp-consensus-babe",
+ "sp-runtime",
"substrate-prometheus-endpoint",
"thiserror",
]
diff --git a/cumulus/client/relay-chain-minimal-node/src/blockchain_rpc_client.rs b/cumulus/client/relay-chain-minimal-node/src/blockchain_rpc_client.rs
index c40ca5c858b..d9e4155d9c5 100644
--- a/cumulus/client/relay-chain-minimal-node/src/blockchain_rpc_client.rs
+++ b/cumulus/client/relay-chain-minimal-node/src/blockchain_rpc_client.rs
@@ -28,8 +28,9 @@ use polkadot_primitives::{
};
use sc_authority_discovery::{AuthorityDiscovery, Error as AuthorityDiscoveryError};
use sc_client_api::AuxStore;
-use sp_api::{ApiError, BlockT, HeaderT, NumberFor, RuntimeApiInfo};
+use sp_api::{ApiError, RuntimeApiInfo};
use sp_blockchain::Info;
+use sp_runtime::traits::{Block as BlockT, Header as HeaderT, NumberFor};
#[derive(Clone)]
pub struct BlockChainRpcClient {
diff --git a/polkadot/node/subsystem-types/Cargo.toml b/polkadot/node/subsystem-types/Cargo.toml
index 8e345cf222c..71e5257cab9 100644
--- a/polkadot/node/subsystem-types/Cargo.toml
+++ b/polkadot/node/subsystem-types/Cargo.toml
@@ -19,6 +19,7 @@ sc-network = { path = "../../../substrate/client/network" }
sp-api = { path = "../../../substrate/primitives/api" }
sp-blockchain = { path = "../../../substrate/primitives/blockchain" }
sp-consensus-babe = { path = "../../../substrate/primitives/consensus/babe" }
+sp-runtime = { path = "../../../substrate/primitives/runtime" }
sp-authority-discovery = { path = "../../../substrate/primitives/authority-discovery" }
sc-client-api = { path = "../../../substrate/client/api" }
sc-transaction-pool-api = { path = "../../../substrate/client/transaction-pool/api" }
diff --git a/polkadot/node/subsystem-types/src/runtime_client.rs b/polkadot/node/subsystem-types/src/runtime_client.rs
index 36e3365cf08..21df1483b9e 100644
--- a/polkadot/node/subsystem-types/src/runtime_client.rs
+++ b/polkadot/node/subsystem-types/src/runtime_client.rs
@@ -25,10 +25,11 @@ use polkadot_primitives::{
};
use sc_client_api::HeaderBackend;
use sc_transaction_pool_api::OffchainTransactionPoolFactory;
-use sp_api::{ApiError, ApiExt, HeaderT, NumberFor, ProvideRuntimeApi};
+use sp_api::{ApiError, ApiExt, ProvideRuntimeApi};
use sp_authority_discovery::AuthorityDiscoveryApi;
use sp_blockchain::Info;
use sp_consensus_babe::{BabeApi, Epoch};
+use sp_runtime::traits::{Header as HeaderT, NumberFor};
use std::{collections::BTreeMap, sync::Arc};
/// Offers header utilities.
--
GitLab