Companion for Substrate#14612 (#2923)

* Companion for Substrate#14612

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

* Remove patch

* Cargo.lock

* Fix

* Fix compilation

* Fix Fix

* ...

* :face_palm:

* .................

* update lockfile for {"polkadot", "substrate"}

* ".git/.scripts/commands/fmt/fmt.sh"

---------

Co-authored-by: parity-processbot <>

cumulus/client/consensus/aura/src/collator.rs

@@ -95,8 +95,7 @@ where
 	RClient: RelayChainInterface,
 	CIDP: CreateInherentDataProviders<Block, ()> + 'static,
 	BI: BlockImport<Block> + ParachainBlockImportMarker + Send + Sync + 'static,
-	Proposer: ProposerInterface<Block, Transaction = BI::Transaction>,
-	Proposer::Transaction: Sync,
+	Proposer: ProposerInterface<Block>,
 	CS: CollatorServiceInterface<Block>,
 	P: Pair,
 	P::Public: AppPublic + Member,
@@ -190,7 +189,7 @@ where
 			.await
 			.map_err(|e| Box::new(e))?;
 
-		let sealed_importable = seal::<_, _, P>(
+		let sealed_importable = seal::<_, P>(
 			proposal.block,
 			proposal.storage_changes,
 			&slot_claim.author_pub,
@@ -322,12 +321,12 @@ where
 }
 
 /// Seal a block with a signature in the header.
-pub fn seal<B: BlockT, T, P>(
+pub fn seal<B: BlockT, P>(
 	pre_sealed: B,
-	storage_changes: StorageChanges<T, HashingFor<B>>,
+	storage_changes: StorageChanges<HashingFor<B>>,
 	author_pub: &P::Public,
 	keystore: &KeystorePtr,
-) -> Result<BlockImportParams<B, T>, Box<dyn Error>>
+) -> Result<BlockImportParams<B>, Box<dyn Error>>
 where
 	P: Pair,
 	P::Signature: Codec + TryFrom<Vec<u8>>,

cumulus/client/consensus/aura/src/collators/basic.rs

@@ -84,8 +84,7 @@ pub async fn run<Block, P, BI, CIDP, Client, RClient, SO, Proposer, CS>(
 	CIDP: CreateInherentDataProviders<Block, ()> + 'static,
 	BI: BlockImport<Block> + ParachainBlockImportMarker + Send + Sync + 'static,
 	SO: SyncOracle + Send + Sync + Clone + 'static,
-	Proposer: ProposerInterface<Block, Transaction = BI::Transaction>,
-	Proposer::Transaction: Sync,
+	Proposer: ProposerInterface<Block>,
 	CS: CollatorServiceInterface<Block>,
 	P: Pair,
 	P::Public: AppPublic + Member,

cumulus/client/consensus/aura/src/collators/lookahead.rs

@@ -103,8 +103,7 @@ pub async fn run<Block, P, BI, CIDP, Client, Backend, RClient, SO, Proposer, CS>
 	CIDP: CreateInherentDataProviders<Block, ()> + 'static,
 	BI: BlockImport<Block> + ParachainBlockImportMarker + Send + Sync + 'static,
 	SO: SyncOracle + Send + Sync + Clone + 'static,
-	Proposer: ProposerInterface<Block, Transaction = BI::Transaction>,
-	Proposer::Transaction: Sync,
+	Proposer: ProposerInterface<Block>,
 	CS: CollatorServiceInterface<Block>,
 	P: Pair,
 	P::Public: AppPublic + Member,

cumulus/client/consensus/aura/src/equivocation_import_queue.rs

@@ -89,8 +89,8 @@ where
 {
 	async fn verify(
 		&mut self,
-		mut block_params: BlockImportParams<Block, ()>,
-	) -> Result<BlockImportParams<Block, ()>, String> {
+		mut block_params: BlockImportParams<Block>,
+	) -> Result<BlockImportParams<Block>, String> {
 		// Skip checks that include execution, if being told so, or when importing only state.
 		//
 		// This is done for example when gap syncing and it is expected that the block after the gap
@@ -221,7 +221,7 @@ pub fn fully_verifying_import_queue<P, Client, Block: BlockT, I, CIDP>(
 	spawner: &impl sp_core::traits::SpawnEssentialNamed,
 	registry: Option<&substrate_prometheus_endpoint::Registry>,
 	telemetry: Option<TelemetryHandle>,
-) -> BasicQueue<Block, I::Transaction>
+) -> BasicQueue<Block>
 where
 	P: Pair + 'static,
 	P::Signature: Codec,
@@ -231,7 +231,6 @@ where
 		+ Send
 		+ Sync
 		+ 'static,
-	I::Transaction: Send,
 	Client: ProvideRuntimeApi<Block> + Send + Sync + 'static,
 	<Client as ProvideRuntimeApi<Block>>::Api: BlockBuilderApi<Block> + AuraApi<Block, P::Public>,
 	CIDP: CreateInherentDataProviders<Block, ()> + 'static,

cumulus/client/consensus/aura/src/import_queue.rs

@@ -60,7 +60,7 @@ pub fn import_queue<P, Block, I, C, S, CIDP>(
 		registry,
 		telemetry,
 	}: ImportQueueParams<'_, I, C, CIDP, S>,
-) -> Result<DefaultImportQueue<Block, C>, sp_consensus::Error>
+) -> Result<DefaultImportQueue<Block>, sp_consensus::Error>
 where
 	Block: BlockT,
 	C::Api: BlockBuilderApi<Block> + AuraApi<Block, P::Public> + ApiExt<Block>,
@@ -72,7 +72,7 @@ where
 		+ AuxStore
 		+ UsageProvider<Block>
 		+ HeaderBackend<Block>,
-	I: BlockImport<Block, Error = ConsensusError, Transaction = sp_api::TransactionFor<C, Block>>
+	I: BlockImport<Block, Error = ConsensusError>
 		+ ParachainBlockImportMarker
 		+ Send
 		+ Sync

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

@@ -118,18 +118,13 @@ where
 		Client:
 			ProvideRuntimeApi<B> + BlockOf + AuxStore + HeaderBackend<B> + Send + Sync + 'static,
 		Client::Api: AuraApi<B, P::Public>,
-		BI: BlockImport<B, Transaction = sp_api::TransactionFor<Client, B>>
-			+ ParachainBlockImportMarker
-			+ Send
-			+ Sync
-			+ 'static,
+		BI: BlockImport<B> + ParachainBlockImportMarker + Send + Sync + 'static,
 		SO: SyncOracle + Send + Sync + Clone + 'static,
 		BS: BackoffAuthoringBlocksStrategy<NumberFor<B>> + Send + Sync + 'static,
 		PF: Environment<B, Error = Error> + Send + Sync + 'static,
 		PF::Proposer: Proposer<
 			B,
 			Error = Error,
-			Transaction = sp_api::TransactionFor<Client, B>,
 			ProofRecording = EnableProofRecording,
 			Proof = <EnableProofRecording as ProofRecording>::Proof,
 		>,