Adds test parachain adder collator

Cargo.toml

@@ -34,7 +34,7 @@ members = [
 	"runtime/parachains",
 	"runtime/polkadot",
 	"runtime/kusama",
-	"runtime/rococo-v1",
+	"runtime/rococo",
 	"runtime/westend",
 	"runtime/test-runtime",
 	"statement-table",
@@ -69,6 +69,7 @@ members = [
 	"node/test/service",
 	"parachain/test-parachains",
 	"parachain/test-parachains/adder",
+	"parachain/test-parachains/adder/collator",
 ]
 
 [badges]

node/core/av-store/src/lib.rs

@@ -56,22 +56,37 @@ mod columns {
 
 #[derive(Debug, Error)]
 enum Error {
-	#[error(transparent)]
-	RuntimeAPI(#[from] RuntimeApiError),
 	#[error(transparent)]
 	ChainAPI(#[from] ChainApiError),
 	#[error(transparent)]
 	Erasure(#[from] erasure::Error),
 	#[error(transparent)]
 	Io(#[from] io::Error),
 	#[error(transparent)]
-	Oneshot(#[from] oneshot::Canceled),
+	ChainApiChannelIsClosed(#[from] oneshot::Canceled),
 	#[error(transparent)]
 	Subsystem(#[from] SubsystemError),
 	#[error(transparent)]
 	Time(#[from] SystemTimeError),
 }
 
+/// Class of errors which we should handle more gracefully.
+/// An occurrence of this error should not bring down the subsystem.
+#[derive(Debug, Error)]
+enum NonFatalError {
+	/// A Runtime API error occurred.
+	#[error(transparent)]
+	RuntimeApi(#[from] RuntimeApiError),
+
+	/// The receiver's end of the channel is closed.
+	#[error(transparent)]
+	Oneshot(#[from] oneshot::Canceled),
+
+	/// Overseer channel's buffer is full.
+	#[error(transparent)]
+	OverseerOutOfCapacity(#[from] SubsystemError),
+}
+
 /// A wrapper type for delays.
 #[derive(Debug, Decode, Encode, Eq)]
 enum PruningDelay {
@@ -582,7 +597,13 @@ async fn process_block_activated<Context>(
 where
 	Context: SubsystemContext<Message=AvailabilityStoreMessage>
 {
-	let events = request_candidate_events(ctx, hash).await?;
+	let events = match request_candidate_events(ctx, hash).await {
+		Ok(events) => events,
+		Err(err) => {
+			log::debug!(target: LOG_TARGET, "requesting candidate events failed due to {}", err);
+			return Ok(());
+		}
+	};
 
 	log::trace!(target: LOG_TARGET, "block activated {}", hash);
 	let mut included = HashSet::new();
@@ -626,7 +647,7 @@ where
 async fn request_candidate_events<Context>(
 	ctx: &mut Context,
 	hash: Hash,
-) -> Result<Vec<CandidateEvent>, Error>
+) -> Result<Vec<CandidateEvent>, NonFatalError>
 where
 	Context: SubsystemContext<Message=AvailabilityStoreMessage>
 {
@@ -651,44 +672,49 @@ where
 	Context: SubsystemContext<Message=AvailabilityStoreMessage>
 {
 	use AvailabilityStoreMessage::*;
+
+	fn log_send_error(request: &'static str) {
+		log::debug!(target: LOG_TARGET, "error sending a response to {}", request);
+	}
+
 	match msg {
 		QueryAvailableData(hash, tx) => {
 			tx.send(available_data(&subsystem.inner, &hash).map(|d| d.data))
-				.map_err(|_| oneshot::Canceled)?;
+				.unwrap_or_else(|_| log_send_error("QueryAvailableData"));
 		}
 		QueryDataAvailability(hash, tx) => {
 			tx.send(available_data(&subsystem.inner, &hash).is_some())
-				.map_err(|_| oneshot::Canceled)?;
+				.unwrap_or_else(|_| log_send_error("QueryDataAvailability"));
 		}
 		QueryChunk(hash, id, tx) => {
 			tx.send(get_chunk(subsystem, &hash, id)?)
-				.map_err(|_| oneshot::Canceled)?;
+				.unwrap_or_else(|_| log_send_error("QueryChunk"));
 		}
 		QueryChunkAvailability(hash, id, tx) => {
 			tx.send(get_chunk(subsystem, &hash, id)?.is_some())
-				.map_err(|_| oneshot::Canceled)?;
+				.unwrap_or_else(|_| log_send_error("QueryChunkAvailability"));
 		}
 		StoreChunk { candidate_hash, relay_parent, validator_index, chunk, tx } => {
 			// Current block number is relay_parent block number + 1.
 			let block_number = get_block_number(ctx, relay_parent).await? + 1;
 			match store_chunk(subsystem, &candidate_hash, validator_index, chunk, block_number) {
 				Err(e) => {
-					tx.send(Err(())).map_err(|_| oneshot::Canceled)?;
+					tx.send(Err(())).unwrap_or_else(|_| log_send_error("StoreChunk (Err)"));
 					return Err(e);
 				}
 				Ok(()) => {
-					tx.send(Ok(())).map_err(|_| oneshot::Canceled)?;
+					tx.send(Ok(())).unwrap_or_else(|_| log_send_error("StoreChunk (Ok)"));
 				}
 			}
 		}
 		StoreAvailableData(hash, id, n_validators, av_data, tx) => {
 			match store_available_data(subsystem, &hash, id, n_validators, av_data) {
 				Err(e) => {
-					tx.send(Err(())).map_err(|_| oneshot::Canceled)?;
+					tx.send(Err(())).unwrap_or_else(|_| log_send_error("StoreAvailableData (Err)"));
 					return Err(e);
 				}
 				Ok(()) => {
-					tx.send(Ok(())).map_err(|_| oneshot::Canceled)?;
+					tx.send(Ok(())).unwrap_or_else(|_| log_send_error("StoreAvailableData (Ok)"));
 				}
 			}
 		}

node/network/collator-protocol/src/lib.rs

@@ -101,12 +101,12 @@ impl CollatorProtocolSubsystem {
 		Context: SubsystemContext<Message = CollatorProtocolMessage>,
 	{
 		match self.protocol_side {
-		    ProtocolSide::Validator(metrics) => validator_side::run(
+			ProtocolSide::Validator(metrics) => validator_side::run(
 				ctx,
 				REQUEST_TIMEOUT,
 				metrics,
 			).await,
-		    ProtocolSide::Collator(id, metrics) => collator_side::run(
+			ProtocolSide::Collator(id, metrics) => collator_side::run(
 				ctx,
 				id,
 				metrics,

node/service/Cargo.toml

@@ -73,7 +73,7 @@ polkadot-node-subsystem-util = { path = "../subsystem-util" }
 polkadot-runtime = { path = "../../runtime/polkadot" }
 kusama-runtime = { path = "../../runtime/kusama" }
 westend-runtime = { path = "../../runtime/westend" }
-rococo-runtime = { package = "rococo-v1-runtime", path = "../../runtime/rococo-v1" }
+rococo-runtime = { path = "../../runtime/rococo" }
 
 # Polkadot Subsystems
 polkadot-availability-bitfield-distribution = { path = "../network/bitfield-distribution", optional = true }

node/service/src/chain_spec.rs

@@ -768,6 +768,9 @@ fn rococo_staging_testnet_config_genesis(wasm_binary: &[u8]) -> rococo_runtime::
 			keys: vec![],
 		}),
 		pallet_staking: Some(Default::default()),
+		pallet_sudo: Some(rococo_runtime::SudoConfig {
+			key: endowed_accounts[0].clone(),
+		}),
 	}
 }
 
@@ -1176,7 +1179,7 @@ pub fn westend_testnet_genesis(
 pub fn rococo_testnet_genesis(
 	wasm_binary: &[u8],
 	initial_authorities: Vec<(AccountId, AccountId, BabeId, GrandpaId, ImOnlineId, ValidatorId, AuthorityDiscoveryId)>,
-	_root_key: AccountId,
+	root_key: AccountId,
 	endowed_accounts: Option<Vec<AccountId>>,
 ) -> rococo_runtime::GenesisConfig {
 	let endowed_accounts: Vec<AccountId> = endowed_accounts.unwrap_or_else(testnet_accounts);
@@ -1208,6 +1211,7 @@ pub fn rococo_testnet_genesis(
 			keys: vec![],
 		}),
 		pallet_staking: Some(Default::default()),
+		pallet_sudo: Some(rococo_runtime::SudoConfig { key: root_key }),
 	}
 }
 

node/service/src/lib.rs

@@ -392,6 +392,8 @@ pub fn new_full<RuntimeApi, Executor>(
 
 	let (shared_voter_state, finality_proof_provider) = rpc_setup;
 
+	config.network.notifications_protocols.extend(polkadot_network_bridge::notifications_protocol_info());
+
 	let (network, network_status_sinks, system_rpc_tx, network_starter) =
 		service::build_network(service::BuildNetworkParams {
 			config: &config,

node/subsystem-util/src/lib.rs

@@ -28,7 +28,7 @@
 #![warn(missing_docs)]
 
 use polkadot_node_subsystem::{
-	errors::{ChainApiError, RuntimeApiError},
+	errors::RuntimeApiError,
 	messages::{AllMessages, RuntimeApiMessage, RuntimeApiRequest, RuntimeApiSender},
 	FromOverseer, SpawnedSubsystem, Subsystem, SubsystemContext, SubsystemError, SubsystemResult,
 };
@@ -99,9 +99,6 @@ pub enum Error {
 	/// A subsystem error
 	#[error(transparent)]
 	Subsystem(#[from] SubsystemError),
-	/// An error in the Chain API.
-	#[error(transparent)]
-	ChainApi(#[from] ChainApiError),
 	/// An error in the Runtime API.
 	#[error(transparent)]
 	RuntimeApi(#[from] RuntimeApiError),

parachain/Cargo.toml

@@ -15,10 +15,10 @@ sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master
 sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 sp-wasm-interface = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 polkadot-core-primitives = { path = "../core-primitives", default-features = false }
+derive_more = { version = "0.99.11" }
 
 # all optional crates.
 thiserror = { version = "1.0.21", optional = true }
-derive_more = { version = "0.99.11", optional = true }
 serde = { version = "1.0.102", default-features = false, features = [ "derive" ], optional = true }
 sp-externalities = { git = "https://github.com/paritytech/substrate", branch = "master", optional = true }
 sc-executor = { git = "https://github.com/paritytech/substrate", branch = "master", optional = true }
@@ -36,7 +36,6 @@ wasm-api = []
 std = [
 	"codec/std",
 	"thiserror",
-	"derive_more",
 	"serde/std",
 	"sp-std/std",
 	"sp-runtime/std",

parachain/src/primitives.rs

@@ -34,31 +34,19 @@ use polkadot_core_primitives::Hash;
 pub use polkadot_core_primitives::BlockNumber as RelayChainBlockNumber;
 
 /// Parachain head data included in the chain.
-#[derive(PartialEq, Eq, Clone, PartialOrd, Ord, Encode, Decode, RuntimeDebug)]
+#[derive(PartialEq, Eq, Clone, PartialOrd, Ord, Encode, Decode, RuntimeDebug, derive_more::From)]
 #[cfg_attr(feature = "std", derive(Serialize, Deserialize, Default, Hash))]
 pub struct HeadData(#[cfg_attr(feature = "std", serde(with="bytes"))] pub Vec<u8>);
 
-impl From<Vec<u8>> for HeadData {
-	fn from(head: Vec<u8>) -> Self {
-		HeadData(head)
-	}
-}
-
 /// Parachain validation code.
-#[derive(Default, PartialEq, Eq, Clone, Encode, Decode, RuntimeDebug)]
+#[derive(Default, PartialEq, Eq, Clone, Encode, Decode, RuntimeDebug, derive_more::From)]
 #[cfg_attr(feature = "std", derive(Serialize, Deserialize, Hash))]
 pub struct ValidationCode(#[cfg_attr(feature = "std", serde(with="bytes"))] pub Vec<u8>);
 
-impl From<Vec<u8>> for ValidationCode {
-	fn from(code: Vec<u8>) -> Self {
-		ValidationCode(code)
-	}
-}
-
 /// Parachain block data.
 ///
 /// Contains everything required to validate para-block, may contain block and witness data.
-#[derive(PartialEq, Eq, Clone, Encode, Decode)]
+#[derive(PartialEq, Eq, Clone, Encode, Decode, derive_more::From)]
 #[cfg_attr(feature = "std", derive(Serialize, Deserialize, Debug))]
 pub struct BlockData(#[cfg_attr(feature = "std", serde(with="bytes"))] pub Vec<u8>);
 

parachain/test-parachains/adder/collator/Cargo.toml

@@ -0,0 +1,29 @@
+[package]
+name = "test-parachain-adder-collator"
+version = "0.7.26"
+authors = ["Parity Technologies <admin@parity.io>"]
+description = "Collator for the adder test parachain"
+edition = "2018"
+
+[[bin]]
+name = "adder-collator"
+path = "src/main.rs"
+
+[dependencies]
+codec = { package = "parity-scale-codec", version = "1.3.4", default-features = false, features = ["derive"] }
+futures = "0.3.4"
+log = "0.4.8"
+structopt = "0.3.8"
+
+test-parachain-adder = { path = ".." }
+polkadot-primitives = { path = "../../../../primitives" }
+polkadot-cli = { path = "../../../../cli" }
+polkadot-service = { path = "../../../../node/service" }
+polkadot-node-primitives = { path = "../../../../node/primitives" }
+polkadot-node-subsystem = { path = "../../../../node/subsystem" }
+
+sc-cli = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
+
+[dev-dependencies]
+polkadot-parachain = { path = "../../.." }