backend: revert mark_finalized

client/api/src/backend.rs

@@ -195,7 +195,7 @@ pub trait BlockImportOperation<Block: BlockT> {
 	fn mark_finalized(
 		&mut self,
 		id: BlockId<Block>,
-		justifications: Option<Justifications>,
+		justification: Option<Justification>,
 	) -> sp_blockchain::Result<()>;
 
 	/// Mark a block as new head. If both block import and set head are specified, set head

client/api/src/in_mem.rs

@@ -605,8 +605,9 @@ impl<Block: BlockT> backend::BlockImportOperation<Block> for BlockImportOperatio
 	fn mark_finalized(
 		&mut self,
 		block: BlockId<Block>,
-		justifications: Option<Justifications>,
+		justification: Option<Justification>,
 	) -> sp_blockchain::Result<()> {
+		let justifications = justification.map(Justifications::from);
 		self.finalized_blocks.push((block, justifications));
 		Ok(())
 	}

client/db/src/lib.rs

@@ -812,8 +812,9 @@ impl<Block: BlockT> sc_client_api::backend::BlockImportOperation<Block> for Bloc
 	fn mark_finalized(
 		&mut self,
 		block: BlockId<Block>,
-		justifications: Option<Justifications>,
+		justification: Option<Justification>,
 	) -> ClientResult<()> {
+		let justifications = justification.map(Justifications::from);
 		self.finalized_blocks.push((block, justifications));
 		Ok(())
 	}

client/light/src/backend.rs

@@ -364,7 +364,7 @@ impl<S, Block> BlockImportOperation<Block> for ImportOperation<Block, S>
 	fn mark_finalized(
 		&mut self,
 		block: BlockId<Block>,
-		_justification: Option<Justifications>,
+		_justifications: Option<Justification>,
 	) -> ClientResult<()> {
 		self.finalized_blocks.push(block);
 		Ok(())

client/network/test/src/sync.rs

@@ -255,7 +255,7 @@ fn sync_justifications() {
 	assert_eq!(net.peer(1).client().justifications(&BlockId::Number(10)).unwrap(), None);
 
 	// we finalize block #10, #15 and #20 for peer 0 with a justification
-	let just = Justifications::from((ID, Vec::new()));
+	let just = (ID, Vec::new());
 	net.peer(0).client().finalize_block(BlockId::Number(10), Some(just.clone()), true).unwrap();
 	net.peer(0).client().finalize_block(BlockId::Number(15), Some(just.clone()), true).unwrap();
 	net.peer(0).client().finalize_block(BlockId::Number(20), Some(just.clone()), true).unwrap();
@@ -309,7 +309,7 @@ fn sync_justifications_across_forks() {
 	// for both and finalize the small fork instead.
 	net.block_until_sync();
 
-	let just = Justifications::from((ID, Vec::new()));
+	let just = (ID, Vec::new());
 	net.peer(0).client().finalize_block(BlockId::Hash(f1_best), Some(just), true).unwrap();
 
 	net.peer(1).request_justification(&f1_best, 10);
@@ -719,7 +719,7 @@ fn can_sync_to_peers_with_wrong_common_block() {
 	net.block_until_connected();
 
 	// both peers re-org to the same fork without notifying each other
-	let just = Some(Justifications::from((ID, Vec::new())));
+	let just = Some((ID, Vec::new()));
 	net.peer(0).client().finalize_block(BlockId::Hash(fork_hash), just.clone(), true).unwrap();
 	net.peer(1).client().finalize_block(BlockId::Hash(fork_hash), just, true).unwrap();
 	let final_hash = net.peer(0).push_blocks(1, false);

client/service/src/client/client.rs

@@ -906,7 +906,7 @@ impl<B, E, Block, RA> Client<B, E, Block, RA> where
 		&self,
 		operation: &mut ClientImportOperation<Block, B>,
 		block: Block::Hash,
-		justifications: Option<Justifications>,
+		justification: Option<Justification>,
 		best_block: Block::Hash,
 		notify: bool,
 	) -> sp_blockchain::Result<()> {
@@ -948,7 +948,7 @@ impl<B, E, Block, RA> Client<B, E, Block, RA> where
 		}
 
 		assert_eq!(enacted.last().map(|e| e.hash), Some(block));
-		operation.op.mark_finalized(BlockId::Hash(block), justifications)?;
+		operation.op.mark_finalized(BlockId::Hash(block), justification)?;
 
 		if notify {
 			// sometimes when syncing, tons of blocks can be finalized at once.
@@ -1816,11 +1816,10 @@ impl<B, E, Block, RA> Finalizer<Block, B> for Client<B, E, Block, RA> where
 	) -> sp_blockchain::Result<()> {
 		let last_best = self.backend.blockchain().info().best_hash;
 		let to_finalize_hash = self.backend.blockchain().expect_block_hash_from_id(&id)?;
-		let justifications = justification.map(Justifications::from);
 		self.apply_finality_with_block_hash(
 			operation,
 			to_finalize_hash,
-			justifications,
+			justification,
 			last_best,
 			notify,
 		)