Update Substrate & Polkadot (#330)

cumulus/client/consensus/common/src/lib.rs

@@ -384,7 +384,7 @@ fn import_block_as_new_best<Block, P>(
 impl<T> RelaychainClient for Arc<T>
 where
 	T: sc_client_api::BlockchainEvents<PBlock> + ProvideRuntimeApi<PBlock> + 'static + Send + Sync,
-	<T as ProvideRuntimeApi<PBlock>>::Api: ParachainHost<PBlock, Error = ClientError>,
+	<T as ProvideRuntimeApi<PBlock>>::Api: ParachainHost<PBlock>,
 {
 	type Error = ClientError;
 
@@ -430,6 +430,7 @@ where
 		self.runtime_api()
 			.persisted_validation_data(at, para_id, OccupiedCoreAssumption::TimedOut)
 			.map(|s| s.map(|s| s.parent_head.0))
+			.map_err(Into::into)
 	}
 }
 

cumulus/client/network/src/tests.rs

@@ -360,8 +360,6 @@ impl ProvideRuntimeApi<PBlock> for TestApi {
 
 sp_api::mock_impl_runtime_apis! {
 	impl ParachainHost<PBlock> for RuntimeApi {
-		type Error = sp_blockchain::Error;
-
 		fn validators(&self) -> Vec<ValidatorId> {
 			self.data.validators.clone()
 		}

cumulus/test/service/src/lib.rs

@@ -355,9 +355,7 @@ pub fn node_config(
 	let base_path = BasePath::new_temp_dir()?;
 	let root = base_path.path().to_path_buf();
 	let role = if is_collator {
-		Role::Authority {
-			sentry_nodes: Vec::new(),
-		}
+		Role::Authority
 	} else {
 		Role::Full
 	};