Rename RelayChainLocal and RelayChainNetwork

Cargo.toml

@@ -8,8 +8,8 @@ members = [
 	"client/pov-recovery",
 	"client/service",
 	"client/relay-chain-interface",
-	"client/relay-chain-local",
-	"client/relay-chain-network",
+	"client/relay-chain-inprocess-interface",
+	"client/relay-chain-rpc-interface",
 	"pallets/aura-ext",
 	"pallets/collator-selection",
 	"pallets/dmp-queue",

client/network/Cargo.toml

@@ -39,7 +39,7 @@ url = "2.2.2"
 # Cumulus deps
 cumulus-test-service = { path = "../../test/service" }
 cumulus-primitives-core = { path = "../../primitives/core" }
-cumulus-relay-chain-local = { path = "../relay-chain-local" }
+cumulus-relay-chain-inprocess-interface = { path = "../relay-chain-inprocess-interface" }
 
 # Polkadot deps
 polkadot-test-client = { git = "https://github.com/paritytech/polkadot", branch = "master" }

client/network/src/tests.rs

@@ -17,7 +17,7 @@
 use super::*;
 use async_trait::async_trait;
 use cumulus_relay_chain_interface::{RelayChainError, RelayChainResult};
-use cumulus_relay_chain_local::{check_block_in_chain, BlockCheckStatus};
+use cumulus_relay_chain_inprocess_interface::{check_block_in_chain, BlockCheckStatus};
 use cumulus_test_service::runtime::{Block, Hash, Header};
 use futures::{executor::block_on, poll, task::Poll, FutureExt, Stream, StreamExt};
 use parking_lot::Mutex;

client/relay-chain-local/Cargo.toml → client/relay-chain-inprocess-interface/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 authors = ["Parity Technologies <admin@parity.io>"]
-name = "cumulus-relay-chain-local"
+name = "cumulus-relay-chain-inprocess-interface"
 version = "0.1.0"
 edition = "2021"
 

client/relay-chain-local/src/lib.rs → client/relay-chain-inprocess-interface/src/lib.rs

@@ -46,15 +46,15 @@ use sp_state_machine::{Backend as StateBackend, StorageValue};
 const TIMEOUT_IN_SECONDS: u64 = 6;
 
 /// Provides an implementation of the [`RelayChainInterface`] using a local in-process relay chain node.
-pub struct RelayChainLocal<Client> {
+pub struct RelayChainInProcessInterface<Client> {
 	full_client: Arc<Client>,
 	backend: Arc<FullBackend>,
 	sync_oracle: Arc<Mutex<Box<dyn SyncOracle + Send + Sync>>>,
 	overseer_handle: Option<Handle>,
 }
 
-impl<Client> RelayChainLocal<Client> {
-	/// Create a new instance of [`RelayChainLocal`]
+impl<Client> RelayChainInProcessInterface<Client> {
+	/// Create a new instance of [`RelayChainInProcessInterface`]
 	pub fn new(
 		full_client: Arc<Client>,
 		backend: Arc<FullBackend>,
@@ -65,7 +65,7 @@ impl<Client> RelayChainLocal<Client> {
 	}
 }
 
-impl<T> Clone for RelayChainLocal<T> {
+impl<T> Clone for RelayChainInProcessInterface<T> {
 	fn clone(&self) -> Self {
 		Self {
 			full_client: self.full_client.clone(),
@@ -77,7 +77,7 @@ impl<T> Clone for RelayChainLocal<T> {
 }
 
 #[async_trait]
-impl<Client> RelayChainInterface for RelayChainLocal<Client>
+impl<Client> RelayChainInterface for RelayChainInProcessInterface<Client>
 where
 	Client: ProvideRuntimeApi<PBlock>
 		+ BlockchainEvents<PBlock>
@@ -280,25 +280,25 @@ where
 }
 
 /// Builder for a concrete relay chain interface, created from a full node. Builds
-/// a [`RelayChainLocal`] to access relay chain data necessary for parachain operation.
+/// a [`RelayChainInProcessInterface`] to access relay chain data necessary for parachain operation.
 ///
 /// The builder takes a [`polkadot_client::Client`]
 /// that wraps a concrete instance. By using [`polkadot_client::ExecuteWithClient`]
-/// the builder gets access to this concrete instance and instantiates a [`RelayChainLocal`] with it.
-struct RelayChainLocalBuilder {
+/// the builder gets access to this concrete instance and instantiates a [`RelayChainInProcessInterface`] with it.
+struct RelayChainInProcessInterfaceBuilder {
 	polkadot_client: polkadot_client::Client,
 	backend: Arc<FullBackend>,
 	sync_oracle: Arc<Mutex<Box<dyn SyncOracle + Send + Sync>>>,
 	overseer_handle: Option<Handle>,
 }
 
-impl RelayChainLocalBuilder {
+impl RelayChainInProcessInterfaceBuilder {
 	pub fn build(self) -> Arc<dyn RelayChainInterface> {
 		self.polkadot_client.clone().execute_with(self)
 	}
 }
 
-impl ExecuteWithClient for RelayChainLocalBuilder {
+impl ExecuteWithClient for RelayChainInProcessInterfaceBuilder {
 	type Output = Arc<dyn RelayChainInterface>;
 
 	fn execute_with_client<Client, Api, Backend>(self, client: Arc<Client>) -> Self::Output
@@ -312,7 +312,12 @@ impl ExecuteWithClient for RelayChainLocalBuilder {
 			+ Send,
 		Client::Api: ParachainHost<PBlock> + BabeApi<PBlock>,
 	{
-		Arc::new(RelayChainLocal::new(client, self.backend, self.sync_oracle, self.overseer_handle))
+		Arc::new(RelayChainInProcessInterface::new(
+			client,
+			self.backend,
+			self.sync_oracle,
+			self.overseer_handle,
+		))
 	}
 }
 
@@ -344,7 +349,7 @@ fn build_polkadot_full_node(
 }
 
 /// Builds a relay chain interface by constructing a full relay chain node
-pub fn build_relay_chain_local(
+pub fn build_inprocess_relay_chain(
 	polkadot_config: Configuration,
 	telemetry_worker_handle: Option<TelemetryWorkerHandle>,
 	task_manager: &mut TaskManager,
@@ -359,7 +364,7 @@ pub fn build_relay_chain_local(
 
 	let sync_oracle: Box<dyn SyncOracle + Send + Sync> = Box::new(full_node.network.clone());
 	let sync_oracle = Arc::new(Mutex::new(sync_oracle));
-	let relay_chain_interface_builder = RelayChainLocalBuilder {
+	let relay_chain_interface_builder = RelayChainInProcessInterfaceBuilder {
 		polkadot_client: full_node.client.clone(),
 		backend: full_node.backend.clone(),
 		sync_oracle,
@@ -400,7 +405,8 @@ mod tests {
 		}
 	}
 
-	fn build_client_backend_and_block() -> (Arc<Client>, PBlock, RelayChainLocal<Client>) {
+	fn build_client_backend_and_block(
+	) -> (Arc<Client>, PBlock, RelayChainInProcessInterface<Client>) {
 		let builder =
 			TestClientBuilder::new().set_execution_strategy(ExecutionStrategy::NativeWhenPossible);
 		let backend = builder.backend();
@@ -413,7 +419,7 @@ mod tests {
 		(
 			client.clone(),
 			block,
-			RelayChainLocal::new(
+			RelayChainInProcessInterface::new(
 				client,
 				backend.clone(),
 				Arc::new(Mutex::new(dummy_network)),

client/relay-chain-network/Cargo.toml → client/relay-chain-rpc-interface/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 authors = ["Parity Technologies <admin@parity.io>"]
-name = "cumulus-relay-chain-network"
+name = "cumulus-relay-chain-rpc-interface"
 version = "0.1.0"
 edition = "2021"
 

client/relay-chain-network/src/lib.rs → client/relay-chain-rpc-interface/src/lib.rs

@@ -47,7 +47,7 @@ use std::{pin::Pin, sync::Arc};
 
 pub use url::Url;
 
-const LOG_TARGET: &str = "relay-chain-network";
+const LOG_TARGET: &str = "relay-chain-external-interface";
 const TIMEOUT_IN_SECONDS: u64 = 6;
 
 /// Client that maps RPC methods and deserializes results
@@ -278,21 +278,21 @@ impl RelayChainRPCClient {
 	}
 }
 
-/// RelayChainNetwork is used to interact with a full node that is running locally
+/// RelayChainRPCInterface is used to interact with a full node that is running locally
 /// in the same process.
 #[derive(Clone)]
-pub struct RelayChainNetwork {
+pub struct RelayChainRPCInterface {
 	rpc_client: RelayChainRPCClient,
 }
 
-impl RelayChainNetwork {
+impl RelayChainRPCInterface {
 	pub async fn new(url: Url) -> RelayChainResult<Self> {
 		Ok(Self { rpc_client: RelayChainRPCClient::new(url).await? })
 	}
 }
 
 #[async_trait]
-impl RelayChainInterface for RelayChainNetwork {
+impl RelayChainInterface for RelayChainRPCInterface {
 	async fn retrieve_dmq_contents(
 		&self,
 		para_id: ParaId,
@@ -388,7 +388,7 @@ impl RelayChainInterface for RelayChainNetwork {
 	}
 
 	fn overseer_handle(&self) -> RelayChainResult<Option<Handle>> {
-		unimplemented!("Overseer handle is not available on relay-chain-network");
+		unimplemented!("Overseer handle is not available on relay-chain-rpc-interface");
 	}
 
 	async fn get_storage_by_key(

parachain-template/node/Cargo.toml

@@ -92,8 +92,8 @@ cumulus-client-service = { path = "../../client/service" }
 cumulus-primitives-core = { path = "../../primitives/core" }
 cumulus-primitives-parachain-inherent = { path = "../../primitives/parachain-inherent" }
 cumulus-relay-chain-interface = { path = "../../client/relay-chain-interface" }
-cumulus-relay-chain-local = { path = "../../client/relay-chain-local" }
-cumulus-relay-chain-network = { path = "../../client/relay-chain-network" }
+cumulus-relay-chain-inprocess-interface = { path = "../../client/relay-chain-inprocess-interface" }
+cumulus-relay-chain-rpc-interface = { path = "../../client/relay-chain-rpc-interface" }
 
 # Polkadot dependencies
 polkadot-cli = { git = "https://github.com/paritytech/polkadot", branch = "master" }

parachain-template/node/src/service.rs

@@ -17,9 +17,9 @@ use cumulus_client_service::{
 	prepare_node_config, start_collator, start_full_node, StartCollatorParams, StartFullNodeParams,
 };
 use cumulus_primitives_core::ParaId;
+use cumulus_relay_chain_inprocess_interface::build_inprocess_relay_chain;
 use cumulus_relay_chain_interface::{RelayChainError, RelayChainInterface, RelayChainResult};
-use cumulus_relay_chain_local::build_relay_chain_local;
-use cumulus_relay_chain_network::RelayChainNetwork;
+use cumulus_relay_chain_rpc_interface::RelayChainRPCInterface;
 
 // Substrate Imports
 use sc_client_api::ExecutorProvider;
@@ -173,10 +173,13 @@ async fn build_relay_chain_interface(
 ) -> RelayChainResult<(Arc<(dyn RelayChainInterface + 'static)>, Option<CollatorPair>)> {
 	match collator_options.relay_chain_rpc_url {
 		Some(relay_chain_url) =>
-			Ok((Arc::new(RelayChainNetwork::new(relay_chain_url).await?) as Arc<_>, None)),
+			Ok((Arc::new(RelayChainRPCInterface::new(relay_chain_url).await?) as Arc<_>, None)),
 		None => {
-			let relay_chain_local =
-				build_relay_chain_local(polkadot_config, telemetry_worker_handle, task_manager)?;
+			let relay_chain_local = build_inprocess_relay_chain(
+				polkadot_config,
+				telemetry_worker_handle,
+				task_manager,
+			)?;
 			Ok((relay_chain_local.0, Some(relay_chain_local.1)))
 		},
 	}

polkadot-parachains/Cargo.toml

@@ -77,8 +77,9 @@ 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" }
-cumulus-relay-chain-local = { path = "../client/relay-chain-local" }
-cumulus-relay-chain-network = { path = "../client/relay-chain-network" }
+cumulus-relay-chain-inprocess-interface = { path = "../client/relay-chain-inprocess-interface" }
+cumulus-relay-chain-rpc-interface = { path = "../client/relay-chain-rpc-interface" }
+
 
 # Polkadot dependencies
 polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "master" }