From e3a764aa4f753a96a6df4aae6377e3a9d6d04c3f Mon Sep 17 00:00:00 2001 From: Sebastian Kunert Date: Fri, 10 Mar 2023 12:09:33 +0100 Subject: [PATCH 1/2] Remove unused dependencies --- Cargo.lock | 18 ------------------ client/relay-chain-interface/Cargo.toml | 1 - client/relay-chain-minimal-node/Cargo.toml | 6 ------ client/service/Cargo.toml | 1 - parachain-template/node/Cargo.toml | 6 ------ polkadot-parachain/Cargo.toml | 2 -- test/service/Cargo.toml | 2 -- 7 files changed, 36 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3ab2692d430..d5d085ec57b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1957,7 +1957,6 @@ dependencies = [ "cumulus-relay-chain-interface", "cumulus-relay-chain-minimal-node", "futures", - "parking_lot 0.12.1", "polkadot-primitives", "sc-client-api", "sc-consensus", @@ -2255,7 +2254,6 @@ dependencies = [ "sp-blockchain", "sp-state-machine", "thiserror", - "tokio", ] [[package]] @@ -2278,15 +2276,10 @@ dependencies = [ "polkadot-service", "sc-authority-discovery", "sc-client-api", - "sc-consensus", - "sc-keystore", "sc-network", "sc-network-common", "sc-service", - "sc-telemetry", "sc-tracing", - "sc-transaction-pool", - "sc-transaction-pool-api", "sp-api", "sp-blockchain", "sp-consensus", @@ -2294,7 +2287,6 @@ dependencies = [ "sp-runtime", "tokio", "tracing", - "url", ] [[package]] @@ -2417,7 +2409,6 @@ dependencies = [ "cumulus-client-cli", "cumulus-client-consensus-common", "cumulus-client-consensus-relay-chain", - "cumulus-client-network", "cumulus-client-pov-recovery", "cumulus-client-service", "cumulus-primitives-core", @@ -2425,7 +2416,6 @@ dependencies = [ "cumulus-relay-chain-inprocess-interface", "cumulus-relay-chain-interface", "cumulus-relay-chain-minimal-node", - "cumulus-relay-chain-rpc-interface", "cumulus-test-relay-validation-worker-provider", "cumulus-test-runtime", "frame-system", @@ -7094,7 +7084,6 @@ dependencies = [ "cumulus-client-cli", "cumulus-client-consensus-aura", "cumulus-client-consensus-common", - "cumulus-client-network", "cumulus-client-service", "cumulus-primitives-core", "cumulus-primitives-parachain-inherent", @@ -7108,14 +7097,12 @@ dependencies = [ "parity-scale-codec", "polkadot-cli", "polkadot-primitives", - "polkadot-service", "sc-basic-authorship", "sc-chain-spec", "sc-cli", "sc-client-api", "sc-consensus", "sc-executor", - "sc-network", "sc-network-common", "sc-network-sync", "sc-rpc", @@ -7133,11 +7120,8 @@ dependencies = [ "sp-core", "sp-io", "sp-keystore", - "sp-offchain", "sp-runtime", - "sp-session", "sp-timestamp", - "sp-transaction-pool", "substrate-build-script-utils", "substrate-frame-rpc-system", "substrate-prometheus-endpoint", @@ -8353,7 +8337,6 @@ dependencies = [ "cumulus-client-consensus-aura", "cumulus-client-consensus-common", "cumulus-client-consensus-relay-chain", - "cumulus-client-network", "cumulus-client-service", "cumulus-primitives-core", "cumulus-primitives-parachain-inherent", @@ -8395,7 +8378,6 @@ dependencies = [ "sp-api", "sp-block-builder", "sp-blockchain", - "sp-consensus", "sp-consensus-aura", "sp-core", "sp-io", diff --git a/client/relay-chain-interface/Cargo.toml b/client/relay-chain-interface/Cargo.toml index d6c9981d98d..28edc3e61bc 100644 --- a/client/relay-chain-interface/Cargo.toml +++ b/client/relay-chain-interface/Cargo.toml @@ -14,7 +14,6 @@ sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "mas sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "master" } sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" } -tokio = { version = "1.25.0", features = ["sync"] } futures = "0.3.26" async-trait = "0.1.63" thiserror = "1.0.38" diff --git a/client/relay-chain-minimal-node/Cargo.toml b/client/relay-chain-minimal-node/Cargo.toml index 5cdbd405a23..6b46d9250d9 100644 --- a/client/relay-chain-minimal-node/Cargo.toml +++ b/client/relay-chain-minimal-node/Cargo.toml @@ -17,15 +17,10 @@ polkadot-network-bridge = { git = "https://github.com/paritytech/polkadot", bran # substrate deps sc-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "master" } sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" } sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" } sc-network-common = { git = "https://github.com/paritytech/substrate", branch = "master" } sc-service = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" } sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "master" } @@ -42,5 +37,4 @@ lru = "0.9" tracing = "0.1.37" async-trait = "0.1.63" futures = "0.3.26" -url = "2.2.2" tokio = { version = "1.25.0", features = ["macros"] } diff --git a/client/service/Cargo.toml b/client/service/Cargo.toml index d72cbed4b8a..f758116f33c 100644 --- a/client/service/Cargo.toml +++ b/client/service/Cargo.toml @@ -5,7 +5,6 @@ authors = ["Parity Technologies "] edition = "2021" [dependencies] -parking_lot = "0.12.1" futures = "0.3.26" # Substrate diff --git a/parachain-template/node/Cargo.toml b/parachain-template/node/Cargo.toml index e0d1e670e2c..088727e4dad 100644 --- a/parachain-template/node/Cargo.toml +++ b/parachain-template/node/Cargo.toml @@ -29,7 +29,6 @@ sc-cli = { git = "https://github.com/paritytech/substrate", branch = "master" } sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" } sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" } sc-executor = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" } sc-network-common = { git = "https://github.com/paritytech/substrate", branch = "master" } sc-network-sync = { git = "https://github.com/paritytech/substrate", branch = "master" } sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "master" } @@ -45,12 +44,9 @@ sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "mas sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-io = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "master" } substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate", branch = "master" } substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "master" } try-runtime-cli = { git = "https://github.com/paritytech/substrate", branch = "master", optional = true } @@ -58,14 +54,12 @@ try-runtime-cli = { git = "https://github.com/paritytech/substrate", branch = "m # Polkadot polkadot-cli = { git = "https://github.com/paritytech/polkadot", branch = "master" } polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "master" } -polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "master" } xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" } # Cumulus cumulus-client-cli = { path = "../../client/cli" } cumulus-client-consensus-aura = { path = "../../client/consensus/aura" } cumulus-client-consensus-common = { path = "../../client/consensus/common" } -cumulus-client-network = { path = "../../client/network" } cumulus-client-service = { path = "../../client/service" } cumulus-primitives-core = { path = "../../primitives/core" } cumulus-primitives-parachain-inherent = { path = "../../primitives/parachain-inherent" } diff --git a/polkadot-parachain/Cargo.toml b/polkadot-parachain/Cargo.toml index 32c50b43a84..ecb11cafa93 100644 --- a/polkadot-parachain/Cargo.toml +++ b/polkadot-parachain/Cargo.toml @@ -41,7 +41,6 @@ frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", bran sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } sp-io = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-session = { git = "https://github.com/paritytech/substrate", branch = "master" } sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" } sc-cli = { git = "https://github.com/paritytech/substrate", branch = "master" } @@ -86,7 +85,6 @@ cumulus-client-consensus-aura = { path = "../client/consensus/aura" } cumulus-client-consensus-relay-chain = { path = "../client/consensus/relay-chain" } cumulus-client-consensus-common = { path = "../client/consensus/common" } cumulus-client-service = { path = "../client/service" } -cumulus-client-network = { path = "../client/network" } cumulus-primitives-core = { path = "../primitives/core" } cumulus-primitives-parachain-inherent = { path = "../primitives/parachain-inherent" } cumulus-relay-chain-interface = { path = "../client/relay-chain-interface" } diff --git a/test/service/Cargo.toml b/test/service/Cargo.toml index 97c6ab1d157..1c7ef7a3b12 100644 --- a/test/service/Cargo.toml +++ b/test/service/Cargo.toml @@ -62,13 +62,11 @@ cumulus-client-cli = { path = "../../client/cli" } parachains-common = { path = "../../parachains/common" } cumulus-client-consensus-common = { path = "../../client/consensus/common" } cumulus-client-consensus-relay-chain = { path = "../../client/consensus/relay-chain" } -cumulus-client-network = { path = "../../client/network" } cumulus-client-service = { path = "../../client/service" } cumulus-primitives-core = { path = "../../primitives/core" } cumulus-primitives-parachain-inherent = { path = "../../primitives/parachain-inherent" } cumulus-relay-chain-inprocess-interface = { path = "../../client/relay-chain-inprocess-interface" } cumulus-relay-chain-interface = { path = "../../client/relay-chain-interface" } -cumulus-relay-chain-rpc-interface = { path = "../../client/relay-chain-rpc-interface" } cumulus-test-relay-validation-worker-provider = { path = "../relay-validation-worker-provider" } cumulus-test-runtime = { path = "../runtime" } cumulus-relay-chain-minimal-node = { path = "../../client/relay-chain-minimal-node" } From 2c651cd35638289f66f4f45d45063471cc087a6a Mon Sep 17 00:00:00 2001 From: Sebastian Kunert Date: Fri, 10 Mar 2023 12:28:10 +0100 Subject: [PATCH 2/2] Clean up polkadot-service deps --- Cargo.lock | 3 +- .../src/blockchain_rpc_client.rs | 47 +++++-------------- .../src/collator_overseer.rs | 18 +++---- client/relay-chain-minimal-node/src/lib.rs | 8 ++-- .../relay-chain-minimal-node/src/network.rs | 2 +- client/relay-chain-rpc-interface/Cargo.toml | 4 +- client/relay-chain-rpc-interface/src/lib.rs | 3 +- .../src/reconnecting_ws_client.rs | 2 +- .../src/rpc_client.rs | 33 +++++++------ 9 files changed, 50 insertions(+), 70 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d5d085ec57b..c096428e94d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2301,9 +2301,10 @@ dependencies = [ "jsonrpsee", "lru 0.9.0", "parity-scale-codec", - "polkadot-service", + "polkadot-overseer", "sc-client-api", "sc-rpc-api", + "sc-service", "serde", "serde_json", "sp-api", diff --git a/client/relay-chain-minimal-node/src/blockchain_rpc_client.rs b/client/relay-chain-minimal-node/src/blockchain_rpc_client.rs index 5bce139b0a5..7c4674a4e2c 100644 --- a/client/relay-chain-minimal-node/src/blockchain_rpc_client.rs +++ b/client/relay-chain-minimal-node/src/blockchain_rpc_client.rs @@ -19,13 +19,12 @@ use std::pin::Pin; use cumulus_relay_chain_interface::{RelayChainError, RelayChainResult}; use cumulus_relay_chain_rpc_interface::RelayChainRpcClient; use futures::{Future, Stream, StreamExt}; -use polkadot_core_primitives::{Block, Hash, Header}; +use polkadot_core_primitives::{Block, BlockNumber, Hash, Header}; use polkadot_overseer::RuntimeApiSubsystemClient; -use polkadot_service::{AuxStore, HeaderBackend}; use sc_authority_discovery::AuthorityDiscovery; - use sp_api::{ApiError, RuntimeApiInfo}; -use sp_blockchain::Info; +use sp_blockchain::{HeaderBackend, Info}; +use sp_runtime::traits::{Block as BlockT, Header as HeaderT, NumberFor}; #[derive(Clone)] pub struct BlockChainRpcClient { @@ -46,34 +45,12 @@ impl BlockChainRpcClient { pub async fn block_get_hash( &self, - number: Option, + number: Option, ) -> Result, RelayChainError> { self.rpc_client.chain_get_block_hash(number).await } } -// Implementation required by Availability-Distribution subsystem -// but never called in our case. -impl AuxStore for BlockChainRpcClient { - fn insert_aux< - 'a, - 'b: 'a, - 'c: 'a, - I: IntoIterator, - D: IntoIterator, - >( - &self, - _insert: I, - _delete: D, - ) -> sp_blockchain::Result<()> { - unimplemented!("Not supported on the RPC collator") - } - - fn get_aux(&self, _key: &[u8]) -> sp_blockchain::Result>> { - unimplemented!("Not supported on the RPC collator") - } -} - #[async_trait::async_trait] impl RuntimeApiSubsystemClient for BlockChainRpcClient { async fn validators( @@ -359,8 +336,8 @@ fn block_local(fut: impl Future) -> T { impl HeaderBackend for BlockChainRpcClient { fn header( &self, - hash: ::Hash, - ) -> sp_blockchain::Result::Header>> { + hash: ::Hash, + ) -> sp_blockchain::Result::Header>> { Ok(block_local(self.rpc_client.chain_get_header(Some(hash)))?) } @@ -389,7 +366,7 @@ impl HeaderBackend for BlockChainRpcClient { fn status( &self, - hash: ::Hash, + hash: ::Hash, ) -> sp_blockchain::Result { if self.header(hash)?.is_some() { Ok(sc_client_api::blockchain::BlockStatus::InChain) @@ -400,10 +377,8 @@ impl HeaderBackend for BlockChainRpcClient { fn number( &self, - hash: ::Hash, - ) -> sp_blockchain::Result< - Option<<::Header as polkadot_service::HeaderT>::Number>, - > { + hash: ::Hash, + ) -> sp_blockchain::Result::Header as HeaderT>::Number>> { let result = block_local(self.rpc_client.chain_get_header(Some(hash)))? .map(|maybe_header| maybe_header.number); Ok(result) @@ -411,8 +386,8 @@ impl HeaderBackend for BlockChainRpcClient { fn hash( &self, - number: polkadot_service::NumberFor, - ) -> sp_blockchain::Result::Hash>> { + number: NumberFor, + ) -> sp_blockchain::Result::Hash>> { Ok(block_local(self.rpc_client.chain_get_block_hash(number.into()))?) } } diff --git a/client/relay-chain-minimal-node/src/collator_overseer.rs b/client/relay-chain-minimal-node/src/collator_overseer.rs index 0fe185fca97..dce68e3b1f6 100644 --- a/client/relay-chain-minimal-node/src/collator_overseer.rs +++ b/client/relay-chain-minimal-node/src/collator_overseer.rs @@ -14,8 +14,10 @@ // You should have received a copy of the GNU General Public License // along with Polkadot. If not, see . -use cumulus_relay_chain_interface::RelayChainError; +use futures::{select, StreamExt}; use lru::LruCache; +use std::sync::Arc; + use polkadot_node_network_protocol::{ peer_set::PeerSetProtocolNames, request_response::{ @@ -25,8 +27,8 @@ use polkadot_node_network_protocol::{ }; use polkadot_node_subsystem_util::metrics::{prometheus::Registry, Metrics}; use polkadot_overseer::{ - BlockInfo, DummySubsystem, MetricsTrait, Overseer, OverseerHandle, OverseerMetrics, SpawnGlue, - KNOWN_LEAVES_CACHE_SIZE, + BlockInfo, DummySubsystem, Handle, MetricsTrait, Overseer, OverseerHandle, OverseerMetrics, + SpawnGlue, KNOWN_LEAVES_CACHE_SIZE, }; use polkadot_primitives::CollatorPair; use polkadot_service::{ @@ -37,18 +39,16 @@ use polkadot_service::{ }, Error, OverseerConnector, }; + use sc_authority_discovery::Service as AuthorityDiscoveryService; use sc_network::NetworkStateInfo; - -use std::sync::Arc; +use sc_service::TaskManager; +use sp_runtime::traits::Block as BlockT; use cumulus_primitives_core::relay_chain::{Block, Hash as PHash}; - -use polkadot_service::{Handle, TaskManager}; +use cumulus_relay_chain_interface::RelayChainError; use crate::BlockChainRpcClient; -use futures::{select, StreamExt}; -use sp_runtime::traits::Block as BlockT; /// Arguments passed for overseer construction. pub(crate) struct CollatorOverseerGenArgs<'a> { diff --git a/client/relay-chain-minimal-node/src/lib.rs b/client/relay-chain-minimal-node/src/lib.rs index 893ac02824a..08db3753a6b 100644 --- a/client/relay-chain-minimal-node/src/lib.rs +++ b/client/relay-chain-minimal-node/src/lib.rs @@ -30,13 +30,11 @@ use polkadot_primitives::CollatorPair; use sc_authority_discovery::Service as AuthorityDiscoveryService; use sc_network::{Event, NetworkService}; use sc_network_common::service::NetworkEventStream; -use std::sync::Arc; - -use polkadot_service::{Configuration, TaskManager}; +use sc_service::{Configuration, TaskManager}; +use sp_runtime::{app_crypto::Pair, traits::Block as BlockT}; use futures::StreamExt; - -use sp_runtime::{app_crypto::Pair, traits::Block as BlockT}; +use std::sync::Arc; mod collator_overseer; diff --git a/client/relay-chain-minimal-node/src/network.rs b/client/relay-chain-minimal-node/src/network.rs index 55b29ba4a11..bda05daf7b7 100644 --- a/client/relay-chain-minimal-node/src/network.rs +++ b/client/relay-chain-minimal-node/src/network.rs @@ -15,7 +15,7 @@ // along with Cumulus. If not, see . use polkadot_core_primitives::{Block, Hash}; -use polkadot_service::{BlockT, NumberFor}; +use sp_runtime::traits::{Block as BlockT, NumberFor}; use sc_network::NetworkService; diff --git a/client/relay-chain-rpc-interface/Cargo.toml b/client/relay-chain-rpc-interface/Cargo.toml index 70afef3c7a7..4d045973919 100644 --- a/client/relay-chain-rpc-interface/Cargo.toml +++ b/client/relay-chain-rpc-interface/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" [dependencies] -polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "master" } +polkadot-overseer = { git = "https://github.com/paritytech/polkadot", branch = "master" } cumulus-primitives-core = { path = "../../primitives/core" } cumulus-relay-chain-interface = { path = "../relay-chain-interface" } @@ -19,6 +19,8 @@ sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = " sp-storage = { git = "https://github.com/paritytech/substrate", branch = "master" } sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" } sc-rpc-api = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-service = { git = "https://github.com/paritytech/substrate", branch = "master" } + tokio = { version = "1.25.0", features = ["sync"] } futures = "0.3.26" diff --git a/client/relay-chain-rpc-interface/src/lib.rs b/client/relay-chain-rpc-interface/src/lib.rs index 748a2b26e68..475d5d905b6 100644 --- a/client/relay-chain-rpc-interface/src/lib.rs +++ b/client/relay-chain-rpc-interface/src/lib.rs @@ -25,7 +25,8 @@ use cumulus_primitives_core::{ }; use cumulus_relay_chain_interface::{RelayChainError, RelayChainInterface, RelayChainResult}; use futures::{FutureExt, Stream, StreamExt}; -use polkadot_service::Handle; +use polkadot_overseer::Handle; + use sc_client_api::StorageProof; use sp_core::sp_std::collections::btree_map::BTreeMap; use sp_state_machine::StorageValue; diff --git a/client/relay-chain-rpc-interface/src/reconnecting_ws_client.rs b/client/relay-chain-rpc-interface/src/reconnecting_ws_client.rs index 3414dd652c6..9184ab74651 100644 --- a/client/relay-chain-rpc-interface/src/reconnecting_ws_client.rs +++ b/client/relay-chain-rpc-interface/src/reconnecting_ws_client.rs @@ -37,7 +37,7 @@ use jsonrpsee::{ ws_client::WsClientBuilder, }; use lru::LruCache; -use polkadot_service::TaskManager; +use sc_service::TaskManager; use std::{num::NonZeroUsize, sync::Arc}; use tokio::sync::mpsc::{ channel as tokio_channel, Receiver as TokioReceiver, Sender as TokioSender, diff --git a/client/relay-chain-rpc-interface/src/rpc_client.rs b/client/relay-chain-rpc-interface/src/rpc_client.rs index 0d3b2c8492e..6a7dc0bb5ae 100644 --- a/client/relay-chain-rpc-interface/src/rpc_client.rs +++ b/client/relay-chain-rpc-interface/src/rpc_client.rs @@ -14,10 +14,23 @@ // You should have received a copy of the GNU General Public License // along with Cumulus. If not, see . -use crate::reconnecting_ws_client::ReconnectingWsClient; +use futures::channel::mpsc::Receiver; +use jsonrpsee::{core::params::ArrayParams, rpc_params}; +use parity_scale_codec::{Decode, Encode}; +use serde::de::DeserializeOwned; +pub use url::Url; + +use sc_client_api::StorageData; +use sc_rpc_api::{state::ReadProof, system::Health}; +use sc_service::TaskManager; +use sp_api::RuntimeVersion; +use sp_consensus_babe::Epoch; +use sp_core::sp_std::collections::btree_map::BTreeMap; +use sp_storage::StorageKey; + use cumulus_primitives_core::{ relay_chain::{ - vstaging::ExecutorParams, CandidateCommitments, CandidateEvent, CandidateHash, + vstaging::ExecutorParams, BlockNumber, CandidateCommitments, CandidateEvent, CandidateHash, CommittedCandidateReceipt, CoreState, DisputeState, GroupRotationInfo, Hash as RelayHash, Header as RelayHeader, InboundHrmpMessage, OccupiedCoreAssumption, PvfCheckStatement, ScrapedOnChainVotes, SessionIndex, SessionInfo, ValidationCode, ValidationCodeHash, @@ -26,18 +39,8 @@ use cumulus_primitives_core::{ InboundDownwardMessage, ParaId, PersistedValidationData, }; use cumulus_relay_chain_interface::{RelayChainError, RelayChainResult}; -use futures::channel::mpsc::Receiver; -use jsonrpsee::{core::params::ArrayParams, rpc_params}; -use parity_scale_codec::{Decode, Encode}; -use polkadot_service::{BlockNumber, TaskManager}; -use sc_client_api::StorageData; -use sc_rpc_api::{state::ReadProof, system::Health}; -use serde::de::DeserializeOwned; -use sp_api::RuntimeVersion; -use sp_consensus_babe::Epoch; -use sp_core::sp_std::collections::btree_map::BTreeMap; -use sp_storage::StorageKey; -pub use url::Url; + +use crate::reconnecting_ws_client::ReconnectingWsClient; const LOG_TARGET: &str = "relay-chain-rpc-client"; @@ -261,7 +264,7 @@ impl RelayChainRpcClient { /// Get hash of n-th block. pub async fn chain_get_block_hash( &self, - block_number: Option, + block_number: Option, ) -> Result, RelayChainError> { let params = rpc_params![block_number]; self.request("chain_getBlockHash", params).await