Move network to RelayChainInterface

client/consensus/aura/src/lib.rs

@@ -31,7 +31,7 @@ use cumulus_primitives_core::{
 	PersistedValidationData,
 };
 use futures::lock::Mutex;
-use sc_client_api::{backend::AuxStore, Backend, BlockOf};
+use sc_client_api::{backend::AuxStore, BlockOf};
 use sc_consensus::BlockImport;
 use sc_consensus_slots::{BackoffAuthoringBlocksStrategy, SlotInfo};
 use sc_telemetry::TelemetryHandle;

client/consensus/relay-chain/src/lib.rs

@@ -42,7 +42,7 @@ use cumulus_primitives_core::{
 };
 use cumulus_relay_chain_interface::RelayChainInterface;
 use parking_lot::Mutex;
-use sc_client_api::Backend;
+
 use sc_consensus::{BlockImport, BlockImportParams};
 use sp_consensus::{
 	BlockOrigin, EnableProofRecording, Environment, ProofRecording, Proposal, Proposer,

client/network/Cargo.toml

@@ -26,7 +26,7 @@ codec = { package = "parity-scale-codec", version = "2.3.0", features = [ "deriv
 futures = { version = "0.3.1", features = ["compat"] }
 futures-timer = "3.0.2"
 tracing = "0.1.22"
-parking_lot = "0.10.2"
+parking_lot = "0.11.1"
 derive_more = "0.99.2"
 
 [dev-dependencies]
@@ -35,9 +35,9 @@ tokio = { version = "1.10", features = ["macros"] }
 # Cumulus deps
 cumulus-test-service = { path = "../../test/service" }
 cumulus-primitives-core = { path = "../../primitives/core" }
-
 # Polkadot deps
 polkadot-test-client = { git = "https://github.com/paritytech/polkadot", branch = "master" }
+polkadot-client = { git = "https://github.com/paritytech/polkadot", branch = "master" }
 
 # substrate deps
 sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" }

client/network/src/tests.rs

@@ -40,7 +40,7 @@ use sp_core::H256;
 use sp_keyring::Sr25519Keyring;
 use sp_keystore::{testing::KeyStore, SyncCryptoStore, SyncCryptoStorePtr};
 use sp_runtime::{OpaqueExtrinsic, RuntimeAppPublic};
-use std::collections::BTreeMap;
+use std::{collections::BTreeMap, sync::Mutex as StdMutex};
 
 fn check_error(error: crate::BoxedError, check_error: impl Fn(&BlockAnnounceError) -> bool) {
 	let error = *error
@@ -67,8 +67,12 @@ impl SyncOracle for DummyCollatorNetwork {
 fn make_validator_and_api(
 ) -> (BlockAnnounceValidator<Block, RelayChainDirect<TestApi>>, Arc<TestApi>) {
 	let api = Arc::new(TestApi::new());
-	let relay_chain_interface =
-		RelayChainDirect { polkadot_client: api.clone(), backend: api.relay_backend.clone() };
+	let network: Box<dyn SyncOracle + Sync + Send> = Box::new(DummyCollatorNetwork {});
+	let relay_chain_interface = RelayChainDirect {
+		polkadot_client: api.clone(),
+		backend: api.relay_backend.clone(),
+		network: Arc::new(StdMutex::new(network)),
+	};
 	(
 		BlockAnnounceValidator::new(
 			relay_chain_interface,

client/network/src/wait_on_relay_chain_block.rs

@@ -20,6 +20,7 @@ use cumulus_relay_chain_interface::RelayChainInterface;
 use futures::{future::ready, Future, FutureExt, StreamExt};
 use polkadot_primitives::v1::{Block as PBlock, Hash as PHash};
 use sc_client_api::blockchain::{self, BlockStatus};
+use sp_consensus::SyncOracle;
 use sp_runtime::generic::BlockId;
 use std::time::Duration;
 
@@ -121,9 +122,23 @@ where
 	}
 }
 
+struct DummyNetwork {}
+
+impl SyncOracle for DummyNetwork {
+	fn is_major_syncing(&mut self) -> bool {
+		todo!()
+	}
+
+	fn is_offline(&mut self) -> bool {
+		todo!()
+	}
+}
+
 #[cfg(test)]
 mod tests {
-	use super::*;
+	use std::sync::Mutex;
+
+use super::*;
 
 	use cumulus_relay_chain_interface::RelayChainDirect;
 	use polkadot_test_client::{
@@ -145,11 +160,16 @@ mod tests {
 
 		let block_builder = client.init_polkadot_block_builder();
 		let block = block_builder.build().expect("Finalizes the block").block;
+		let dummy_network: Box<dyn SyncOracle + Sync + Send> = Box::new(DummyNetwork {});
 
 		(
 			client.clone(),
 			block,
-			RelayChainDirect { polkadot_client: client, backend: backend.clone() },
+			RelayChainDirect {
+				polkadot_client: client,
+				backend: backend.clone(),
+				network: Arc::new(Mutex::new(dummy_network)),
+			},
 		)
 	}
 

client/relay-chain-interface/Cargo.toml

@@ -7,6 +7,7 @@ edition = "2021"
 
 [dependencies]
 polkadot-client = { git = "https://github.com/paritytech/polkadot", branch = "master" }
+polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "master" }
 
 cumulus-primitives-core = { path = "../../primitives/core" }
 
@@ -17,6 +18,7 @@ sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "mas
 sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" }
 sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
 sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sc-service = { git = "https://github.com/paritytech/substrate", branch = "master" }
 parking_lot = "0.11.1"
-
+enum_dispatch = "0.3.7"
 tracing = "0.1.25"

client/relay-chain-interface/src/lib.rs

@@ -13,11 +13,12 @@ use cumulus_primitives_core::{
 use parking_lot::RwLock;
 use polkadot_client::{ClientHandle, ExecuteWithClient, FullBackend};
 use sc_client_api::{blockchain::BlockStatus, Backend, BlockchainEvents, HeaderBackend};
-use sc_network::NetworkService;
 use sp_api::{ApiError, BlockT, ProvideRuntimeApi};
+use sp_consensus::SyncOracle;
 use sp_core::sp_std::collections::btree_map::BTreeMap;
+use std::sync::Mutex;
 
-const LOG_TARGET: &str = "cumulus-collator";
+const LOG_TARGET: &str = "relay-chain-interface";
 
 pub trait RelayChainInterface<Block: BlockT> {
 	fn get_state_at(
@@ -83,7 +84,7 @@ pub trait RelayChainInterface<Block: BlockT> {
 pub struct RelayChainDirect<Client> {
 	pub polkadot_client: Arc<Client>,
 	pub backend: Arc<FullBackend>,
-	pub network: Arc<NetworkService<PBlock, PHash>>,
+	pub network: Arc<Mutex<Box<dyn SyncOracle + Send + Sync>>>,
 }
 
 impl<T> Clone for RelayChainDirect<T> {
@@ -218,14 +219,15 @@ where
 	}
 
 	fn is_major_syncing(&self) -> bool {
-		self.network.is_major_syncing()
+		let mut network = self.network.lock().unwrap();
+		network.is_major_syncing()
 	}
 }
 
 pub struct RelayChainDirectBuilder {
 	polkadot_client: polkadot_client::Client,
 	backend: Arc<FullBackend>,
-	network: Arc<NetworkService<PBlock, PHash>>,
+	network: Arc<Mutex<Box<dyn SyncOracle + Send + Sync>>>,
 }
 
 impl RelayChainDirectBuilder {
@@ -427,8 +429,19 @@ where
 pub fn build_relay_chain_direct(
 	client: polkadot_client::Client,
 	backend: Arc<FullBackend>,
-	network: Arc<NetworkService<PBlock, PHash>>,
+	network: Arc<Mutex<Box<dyn SyncOracle + Send + Sync>>>,
 ) -> Arc<(dyn RelayChainInterface<PBlock> + Send + Sync + 'static)> {
 	let relay_chain_builder = RelayChainDirectBuilder { polkadot_client: client, backend, network };
 	relay_chain_builder.build()
 }
+
+pub fn build_relay_chain_direct_from_full(
+	full_node: &polkadot_service::NewFull<polkadot_client::Client>,
+) -> Arc<(dyn RelayChainInterface<PBlock> + Send + Sync + 'static)> {
+	let client = full_node.client.clone();
+	let backend = full_node.backend.clone();
+	let test: Box<dyn SyncOracle + Send + Sync> = Box::new(full_node.network.clone());
+	let network = Arc::new(Mutex::new(test));
+	let relay_chain_builder = RelayChainDirectBuilder { polkadot_client: client, backend, network };
+	relay_chain_builder.build()
+}

parachain-template/node/src/service.rs

@@ -20,7 +20,7 @@ use cumulus_client_service::{
 use cumulus_primitives_core::ParaId;
 
 // Substrate Imports
-use cumulus_relay_chain_interface::build_relay_chain_direct;
+use cumulus_relay_chain_interface::build_relay_chain_direct_from_full;
 use sc_client_api::ExecutorProvider;
 use sc_executor::NativeElseWasmExecutor;
 use sc_network::NetworkService;
@@ -246,11 +246,7 @@ where
 
 	let client = params.client.clone();
 	let backend = params.backend.clone();
-	let relay_chain_interface = build_relay_chain_direct(
-		relay_chain_full_node.client.clone(),
-		relay_chain_full_node.backend.clone(),
-		relay_chain_full_node.network.clone(),
-	);
+	let relay_chain_interface = build_relay_chain_direct_from_full(&relay_chain_full_node);
 
 	let block_announce_validator = build_block_announce_validator(
 		relay_chain_interface,
@@ -433,11 +429,7 @@ pub async fn start_parachain_node(
 				telemetry.clone(),
 			);
 
-			let relay_chain_interface = build_relay_chain_direct(
-				relay_chain_node.client.clone(),
-				relay_chain_node.backend.clone(),
-				relay_chain_node.network.clone(),
-			);
+			let relay_chain_interface = build_relay_chain_direct_from_full(&relay_chain_node);
 
 			let relay_chain_interface2 = relay_chain_interface.clone();
 			Ok(build_aura_consensus::<

polkadot-parachains/src/service.rs

@@ -28,7 +28,7 @@ use cumulus_primitives_core::{
 	relay_chain::v1::{Hash as PHash, PersistedValidationData},
 	ParaId,
 };
-use cumulus_relay_chain_interface::build_relay_chain_direct;
+use cumulus_relay_chain_interface::build_relay_chain_direct_from_full;
 use polkadot_service::NativeExecutionDispatch;
 
 use crate::rpc;
@@ -330,11 +330,7 @@ where
 	let client = params.client.clone();
 	let backend = params.backend.clone();
 
-	let relay_chain_interface = build_relay_chain_direct(
-		relay_chain_full_node.client.clone(),
-		relay_chain_full_node.backend.clone(),
-		relay_chain_full_node.network.clone(),
-	);
+	let relay_chain_interface = build_relay_chain_direct_from_full(&relay_chain_full_node);
 
 	let block_announce_validator = build_block_announce_validator(
 		relay_chain_interface,
@@ -510,11 +506,7 @@ where
 
 	let client = params.client.clone();
 	let backend = params.backend.clone();
-	let relay_chain_interface = build_relay_chain_direct(
-		relay_chain_full_node.client.clone(),
-		relay_chain_full_node.backend.clone(),
-		relay_chain_full_node.network.clone(),
-	);
+	let relay_chain_interface = build_relay_chain_direct_from_full(&relay_chain_full_node);
 
 	let block_announce_validator = build_block_announce_validator(
 		relay_chain_interface,
@@ -712,7 +704,8 @@ pub async fn start_rococo_parachain_node(
 				telemetry.clone(),
 			);
 
-			let relay_chain_direct =  build_relay_chain_direct(relay_chain_node.client.clone(), relay_chain_node.backend.clone(), relay_chain_node.network.clone());
+			// let relay_chain_direct =  build_relay_chain_direct(relay_chain_node.client.clone(), relay_chain_node.backend.clone(), );
+			let relay_chain_direct =  build_relay_chain_direct_from_full(&relay_chain_node);
 			let relay_chain_direct_for_aura_consensus =  relay_chain_direct.clone();
 
 			Ok(build_aura_consensus::<
@@ -831,11 +824,7 @@ pub async fn start_shell_node(
 				telemetry.clone(),
 			);
 
-			let relay_chain_interface = build_relay_chain_direct(
-				relay_chain_node.client.clone(),
-				relay_chain_node.backend.clone(),
-				relay_chain_node.network.clone(),
-			);
+			let relay_chain_interface = build_relay_chain_direct_from_full(&relay_chain_node);
 
 			Ok(cumulus_client_consensus_relay_chain::build_relay_chain_consensus(
 				cumulus_client_consensus_relay_chain::BuildRelayChainConsensusParams {
@@ -1100,11 +1089,7 @@ where
 			let telemetry2 = telemetry.clone();
 			let prometheus_registry2 = prometheus_registry.map(|r| (*r).clone());
 
-			let relay_chain_interface = build_relay_chain_direct(
-				relay_chain_node.client.clone(),
-				relay_chain_node.backend.clone(),
-				relay_chain_node.network.clone(),
-			);
+			let relay_chain_interface = build_relay_chain_direct_from_full(&relay_chain_node);
 
 			let aura_consensus = BuildOnAccess::Uninitialized(Some(Box::new(move || {
 				let slot_duration =
@@ -1182,11 +1167,7 @@ where
 				telemetry.clone(),
 			);
 
-			let relay_chain_interface = build_relay_chain_direct(
-				relay_chain_node.client.clone(),
-				relay_chain_node.backend.clone(),
-				relay_chain_node.network.clone(),
-			);
+			let relay_chain_interface = build_relay_chain_direct_from_full(&relay_chain_node);
 
 			let relay_chain_consensus =
 				cumulus_client_consensus_relay_chain::build_relay_chain_consensus(

test/service/src/lib.rs

@@ -50,7 +50,7 @@ use sp_keyring::Sr25519Keyring;
 use sp_runtime::{codec::Encode, generic, traits::BlakeTwo256};
 use sp_state_machine::BasicExternalities;
 use sp_trie::PrefixedMemoryDB;
-use std::sync::Arc;
+use std::sync::{Arc, Mutex};
 use substrate_test_client::{
 	BlockchainEventsExt, RpcHandlersExt, RpcTransactionError, RpcTransactionOutput,
 };
@@ -218,7 +218,7 @@ where
 	let relay_chain_interface = Arc::new(RelayChainDirect {
 		polkadot_client: relay_chain_full_node.client.clone(),
 		backend: relay_chain_full_node.backend.clone(),
-		network: relay_chain_full_node.network.clone(),
+		network: Arc::new(Mutex::new(Box::new(relay_chain_full_node.network.clone()))),
 	});
 	let block_announce_validator = BlockAnnounceValidator::new(
 		relay_chain_interface,
@@ -281,7 +281,7 @@ where
 				let relay_chain_interface = Arc::new(RelayChainDirect {
 					polkadot_client: relay_chain_full_node.client.clone(),
 					backend: relay_chain_full_node.backend.clone(),
-					network: relay_chain_full_node.network.clone(),
+					network: Arc::new(Mutex::new(Box::new(relay_chain_full_node.network.clone()))),
 				});
 
 				let relay_chain_interface2 = relay_chain_interface.clone();