Polkadot companion for 8114 (#2437)

* Polkadot companion for 8114

https://github.com/paritytech/substrate/pull/8114

* "Update Substrate"

Co-authored-by: parity-processbot <>

node/core/proposer/src/lib.rs

@@ -79,7 +79,7 @@ where
 		+ Send
 		+ Sync,
 	Client::Api:
-		BlockBuilderApi<Block> + ApiExt<Block, Error = sp_blockchain::Error>,
+		BlockBuilderApi<Block> + ApiExt<Block>,
 	Backend:
 		'static + sc_client_api::Backend<Block, State = sp_api::StateBackendFor<Client, Block>>,
 	// Rust bug: https://github.com/rust-lang/rust/issues/24159
@@ -133,7 +133,7 @@ where
 		+ Send
 		+ Sync,
 	Client::Api:
-		BlockBuilderApi<Block> + ApiExt<Block, Error = sp_blockchain::Error>,
+		BlockBuilderApi<Block> + ApiExt<Block>,
 	Backend:
 		'static + sc_client_api::Backend<Block, State = sp_api::StateBackendFor<Client, Block>>,
 	// Rust bug: https://github.com/rust-lang/rust/issues/24159
@@ -179,7 +179,7 @@ where
 		+ Send
 		+ Sync,
 	Client::Api:
-		BlockBuilderApi<Block> + ApiExt<Block, Error = sp_blockchain::Error>,
+		BlockBuilderApi<Block> + ApiExt<Block>,
 	Backend:
 		'static + sc_client_api::Backend<Block, State = sp_api::StateBackendFor<Client, Block>>,
 	// Rust bug: https://github.com/rust-lang/rust/issues/24159

node/core/runtime-api/src/lib.rs

@@ -453,8 +453,6 @@ mod tests {
 
 	sp_api::mock_impl_runtime_apis! {
 		impl ParachainHost<Block> for MockRuntimeApi {
-			type Error = sp_api::ApiError;
-
 			fn validators(&self) -> Vec<ValidatorId> {
 				self.validators.clone()
 			}

node/service/src/client.rs

@@ -30,7 +30,7 @@ use consensus_common::BlockStatus;
 /// A set of APIs that polkadot-like runtimes must implement.
 pub trait RuntimeApiCollection:
 	sp_transaction_pool::runtime_api::TaggedTransactionQueue<Block>
-	+ sp_api::ApiExt<Block, Error = sp_blockchain::Error>
+	+ sp_api::ApiExt<Block>
 	+ babe_primitives::BabeApi<Block>
 	+ grandpa_primitives::GrandpaApi<Block>
 	+ ParachainHost<Block>
@@ -48,7 +48,7 @@ where
 impl<Api> RuntimeApiCollection for Api
 where
 	Api: sp_transaction_pool::runtime_api::TaggedTransactionQueue<Block>
-		+ sp_api::ApiExt<Block, Error = sp_blockchain::Error>
+		+ sp_api::ApiExt<Block>
 		+ babe_primitives::BabeApi<Block>
 		+ grandpa_primitives::GrandpaApi<Block>
 		+ ParachainHost<Block>
@@ -71,7 +71,6 @@ pub trait AbstractClient<Block, Backend>:
 	+ HeaderBackend<Block>
 	+ CallApiAt<
 		Block,
-		Error = sp_blockchain::Error,
 		StateBackend = Backend::State
 	>
 	where
@@ -90,7 +89,6 @@ impl<Block, Backend, Client> AbstractClient<Block, Backend> for Client
 			+ Sized + Send + Sync
 			+ CallApiAt<
 				Block,
-				Error = sp_blockchain::Error,
 				StateBackend = Backend::State
 			>,
 		Client::Api: RuntimeApiCollection<StateBackend = Backend::State>,