substrate-test-runtime migrated to "pure" frame runtime (#13737)

* substrate-test-runtime migrated to pure-frame based * test block builder: helpers added * simple renaming * basic_authorship test adjusted * block_building storage_proof test adjusted * babe: tests: should_panic expected added * babe: tests adjusted ConsensusLog::NextEpochData is now added by pallet_babe as pallet_babe::SameAuthoritiesForever trigger is used in runtime config. * beefy: tests adjusted test-substrate-runtime is now using frame::executive to finalize the block. during finalization the digests stored during block execution are checked against header digests: https://github.com/paritytech/substrate/blob/91bb2d29ca905599098a5b35eaf24867c4fbd60a/frame/executive/src/lib.rs#L585-L591 It makes impossible to directly manipulate header's digets, w/o depositing logs into system pallet storage `Digest<T: Config>`. Instead of this dedicated extrinsic allowing to store logs items (MmrRoot / AuthoritiesChange) is used. * grandpa: tests adjusted test-substrate-runtime is now using frame::executive to finalize the block. during finalization the digest logs stored during block execution are checked against header digest logs: https://github.com/paritytech/substrate/blob/91bb2d29ca905599098a5b35eaf24867c4fbd60a/frame/executive/src/lib.rs#L585-L591 It makes impossible to directly manipulate header's digets, w/o depositing logs into system pallet storage `Digest<T: Config>`. Instead of this dedicated extrinsic allowing to store logs items (ScheduledChange / ForcedChange and DigestItem::Other) is used. * network:bitswap: test adjusted The size of unchecked extrinsic was increased. The pattern used in test will be placed at the end of scale-encoded buffer. * runtime apis versions adjusted * storage keys used in runtime adjusted * wasm vs native tests removed * rpc tests: adjusted Transfer transaction processing was slightly improved, test was adjusted. * tests: sizes adjusted Runtime extrinsic size was increased. Size of data read during block execution was also increased due to usage of new pallets in runtime. Sizes were adjusted in tests. * cargo.lock update cargo update -p substrate-test-runtime -p substrate-test-runtime-client * warnings fixed * builders cleanup: includes / std * extrinsic validation cleanup * txpool: benches performance fixed * fmt * spelling * Apply suggestions from code review Co-authored-by: Davide Galassi <davxy@datawok.net> * Apply code review suggestions * Apply code review suggestions * get rid of 1063 const * renaming: UncheckedExtrinsic -> Extrinsic * test-utils-runtime: further step to pure-frame * basic-authorship: tests OK * CheckSubstrateCall added + tests fixes * test::Transfer call removed * priority / propagate / no sudo+root-testing * fixing warnings + format * cleanup: build2/nonce + format * final tests fixes all tests are passing * logs/comments removal * should_not_accept_old_signatures test removed * make txpool benches work again * Cargo.lock reset * format * sudo hack removed * txpool benches fix+cleanup * .gitignore reverted * rebase fixing + unsigned cleanup * Cargo.toml/Cargo.lock cleanup * force-debug feature removed * mmr tests fixed * make cargo-clippy happy * network sync test uses unsigned extrinsic * cleanup * ".git/.scripts/commands/fmt/fmt.sh" * push_storage_change signed call remove * GenesisConfig cleanup * fix * fix * GenesisConfig simplified * storage_keys_works: reworked * storage_keys_works: expected keys in vec * storage keys list moved to substrate-test-runtime * substrate-test: some sanity tests + GenesisConfigBuilder rework * Apply suggestions from code review Co-authored-by: Bastian Köcher <git@kchr.de> * Apply suggestions from code review * Review suggestions * fix * fix * beefy: generate_blocks_and_sync block_num sync with actaul value * Apply suggestions from code review Co-authored-by: Davide Galassi <davxy@datawok.net> * Update test-utils/runtime/src/genesismap.rs Co-authored-by: Davide Galassi <davxy@datawok.net> * cargo update -p sc-rpc -p sc-transaction-pool * Review suggestions * fix * doc added * slot_duration adjusted for Babe::slot_duration * small doc fixes * array_bytes::hex used instead of hex * tiny -> medium name fix * Apply suggestions from code review Co-authored-by: Sebastian Kunert <skunert49@gmail.com> * TransferData::try_from_unchecked_extrinsic -> try_from * Update Cargo.lock --------- Co-authored-by: parity-processbot <> Co-authored-by: Davide Galassi <davxy@datawok.net> Co-authored-by: Bastian Köcher <git@kchr.de> Co-authored-by: Sebastian Kunert <skunert49@gmail.com>
2026-07-17 07:45:41 +00:00 · 2023-05-04 18:20:22 +02:00
parent 3a90728de0
commit 6a295e7c28
34 changed files with 1943 additions and 2356 deletions
@@ -71,15 +71,12 @@ const SLOT_DURATION_MS: u64 = 1000;
 struct DummyFactory {
 	client: Arc<TestClient>,
 	epoch_changes: SharedEpochChanges<TestBlock, Epoch>,
-	config: BabeConfiguration,
 	mutator: Mutator,
 }

 struct DummyProposer {
 	factory: DummyFactory,
 	parent_hash: Hash,
-	parent_number: u64,
-	parent_slot: Slot,
 }

 impl Environment<TestBlock> for DummyFactory {
@@ -88,15 +85,9 @@ impl Environment<TestBlock> for DummyFactory {
 	type Error = Error;

 	fn init(&mut self, parent_header: &<TestBlock as BlockT>::Header) -> Self::CreateProposer {
-		let parent_slot = crate::find_pre_digest::<TestBlock>(parent_header)
-			.expect("parent header has a pre-digest")
-			.slot();
-
 		future::ready(Ok(DummyProposer {
 			factory: self.clone(),
 			parent_hash: parent_header.hash(),
-			parent_number: *parent_header.number(),
-			parent_slot,
 		}))
 	}
 }
@@ -123,39 +114,6 @@ impl DummyProposer {
 			Err(e) => return future::ready(Err(e)),
 		};

-		let this_slot = crate::find_pre_digest::<TestBlock>(block.header())
-			.expect("baked block has valid pre-digest")
-			.slot();
-
-		// figure out if we should add a consensus digest, since the test runtime
-		// doesn't.
-		let epoch_changes = self.factory.epoch_changes.shared_data();
-		let epoch = epoch_changes
-			.epoch_data_for_child_of(
-				descendent_query(&*self.factory.client),
-				&self.parent_hash,
-				self.parent_number,
-				this_slot,
-				|slot| Epoch::genesis(&self.factory.config, slot),
-			)
-			.expect("client has data to find epoch")
-			.expect("can compute epoch for baked block");
-
-		let first_in_epoch = self.parent_slot < epoch.start_slot;
-		if first_in_epoch {
-			// push a `Consensus` digest signalling next change.
-			// we just reuse the same randomness and authorities as the prior
-			// epoch. this will break when we add light client support, since
-			// that will re-check the randomness logic off-chain.
-			let digest_data = ConsensusLog::NextEpochData(NextEpochDescriptor {
-				authorities: epoch.authorities.clone(),
-				randomness: epoch.randomness,
-			})
-			.encode();
-			let digest = DigestItem::Consensus(BABE_ENGINE_ID, digest_data);
-			block.header.digest_mut().push(digest)
-		}
-
 		// mutate the block header according to the mutator.
 		(self.factory.mutator)(&mut block.header, Stage::PreSeal);

@@ -351,7 +309,7 @@ impl TestNetFactory for BabeTestNet {
 }

 #[tokio::test]
-#[should_panic]
+#[should_panic(expected = "No BABE pre-runtime digest found")]
 async fn rejects_empty_block() {
 	sp_tracing::try_init_simple();
 	let mut net = BabeTestNet::new(3);
@@ -398,7 +356,6 @@ async fn run_one_test(mutator: impl Fn(&mut TestHeader, Stage) + Send + Sync + '

 		let environ = DummyFactory {
 			client: client.clone(),
-			config: data.link.config.clone(),
 			epoch_changes: data.link.epoch_changes.clone(),
 			mutator: mutator.clone(),
 		};
@@ -483,7 +440,7 @@ async fn authoring_blocks() {
 }

 #[tokio::test]
-#[should_panic]
+#[should_panic(expected = "valid babe headers must contain a predigest")]
 async fn rejects_missing_inherent_digest() {
 	run_one_test(|header: &mut TestHeader, stage| {
 		let v = std::mem::take(&mut header.digest_mut().logs);
@@ -496,7 +453,7 @@ async fn rejects_missing_inherent_digest() {
 }

 #[tokio::test]
-#[should_panic]
+#[should_panic(expected = "has a bad seal")]
 async fn rejects_missing_seals() {
 	run_one_test(|header: &mut TestHeader, stage| {
 		let v = std::mem::take(&mut header.digest_mut().logs);
@@ -509,7 +466,7 @@ async fn rejects_missing_seals() {
 }

 #[tokio::test]
-#[should_panic]
+#[should_panic(expected = "Expected epoch change to happen")]
 async fn rejects_missing_consensus_digests() {
 	run_one_test(|header: &mut TestHeader, stage| {
 		let v = std::mem::take(&mut header.digest_mut().logs);
@@ -770,7 +727,6 @@ async fn importing_block_one_sets_genesis_epoch() {

 	let mut proposer_factory = DummyFactory {
 		client: client.clone(),
-		config: data.link.config.clone(),
 		epoch_changes: data.link.epoch_changes.clone(),
 		mutator: Arc::new(|_, _| ()),
 	};
@@ -814,7 +770,6 @@ async fn revert_prunes_epoch_changes_and_removes_weights() {

 	let mut proposer_factory = DummyFactory {
 		client: client.clone(),
-		config: data.link.config.clone(),
 		epoch_changes: data.link.epoch_changes.clone(),
 		mutator: Arc::new(|_, _| ()),
 	};
@@ -902,7 +857,6 @@ async fn revert_not_allowed_for_finalized() {

 	let mut proposer_factory = DummyFactory {
 		client: client.clone(),
-		config: data.link.config.clone(),
 		epoch_changes: data.link.epoch_changes.clone(),
 		mutator: Arc::new(|_, _| ()),
 	};
@@ -943,7 +897,6 @@ async fn importing_epoch_change_block_prunes_tree() {

 	let mut proposer_factory = DummyFactory {
 		client: client.clone(),
-		config: data.link.config.clone(),
 		epoch_changes: data.link.epoch_changes.clone(),
 		mutator: Arc::new(|_, _| ()),
 	};
@@ -1030,7 +983,7 @@ async fn importing_epoch_change_block_prunes_tree() {
 }

 #[tokio::test]
-#[should_panic]
+#[should_panic(expected = "Slot number must increase: parent slot: 999, this slot: 999")]
 async fn verify_slots_are_strictly_increasing() {
 	let mut net = BabeTestNet::new(1);

@@ -1042,7 +995,6 @@ async fn verify_slots_are_strictly_increasing() {

 	let mut proposer_factory = DummyFactory {
 		client: client.clone(),
-		config: data.link.config.clone(),
 		epoch_changes: data.link.epoch_changes.clone(),
 		mutator: Arc::new(|_, _| ()),
 	};
@@ -1082,7 +1034,6 @@ async fn obsolete_blocks_aux_data_cleanup() {

 	let mut proposer_factory = DummyFactory {
 		client: client.clone(),
-		config: data.link.config.clone(),
 		epoch_changes: data.link.epoch_changes.clone(),
 		mutator: Arc::new(|_, _| ()),
 	};
@@ -1168,7 +1119,6 @@ async fn allows_skipping_epochs() {

 	let mut proposer_factory = DummyFactory {
 		client: client.clone(),
-		config: data.link.config.clone(),
 		epoch_changes: data.link.epoch_changes.clone(),
 		mutator: Arc::new(|_, _| ()),
 	};
@@ -1298,7 +1248,6 @@ async fn allows_skipping_epochs_on_some_forks() {

 	let mut proposer_factory = DummyFactory {
 		client: client.clone(),
-		config: data.link.config.clone(),
 		epoch_changes: data.link.epoch_changes.clone(),
 		mutator: Arc::new(|_, _| ()),
 	};
@@ -66,7 +66,7 @@ use sp_runtime::{
 	BuildStorage, DigestItem, EncodedJustification, Justifications, Storage,
 };
 use std::{marker::PhantomData, sync::Arc, task::Poll};
-use substrate_test_runtime_client::{runtime::Header, ClientExt};
+use substrate_test_runtime_client::{BlockBuilderExt, ClientExt};
 use tokio::time::Duration;

 const GENESIS_HASH: H256 = H256::zero();
@@ -165,20 +165,22 @@ impl BeefyTestNet {
 		// push genesis to make indexing human readable (index equals to block number)
 		all_hashes.push(self.peer(0).client().info().genesis_hash);

-		let built_hashes = self.peer(0).generate_blocks(count, BlockOrigin::File, |builder| {
-			let mut block = builder.build().unwrap().block;
-
+		let mut block_num: NumberFor<Block> = self.peer(0).client().info().best_number;
+		let built_hashes = self.peer(0).generate_blocks(count, BlockOrigin::File, |mut builder| {
+			block_num = block_num.saturating_add(1).try_into().unwrap();
 			if include_mmr_digest {
-				let block_num = *block.header.number();
 				let num_byte = block_num.to_le_bytes().into_iter().next().unwrap();
 				let mmr_root = MmrRootHash::repeat_byte(num_byte);
-				add_mmr_digest(&mut block.header, mmr_root);
+				add_mmr_digest(&mut builder, mmr_root);
 			}

-			if *block.header.number() % session_length == 0 {
-				add_auth_change_digest(&mut block.header, validator_set.clone());
+			if block_num % session_length == 0 {
+				add_auth_change_digest(&mut builder, validator_set.clone());
 			}

+			let block = builder.build().unwrap().block;
+			assert_eq!(block.header.number, block_num);
+
 			block
 		});
 		all_hashes.extend(built_hashes);
@@ -325,18 +327,22 @@ sp_api::mock_impl_runtime_apis! {
 	}
 }

-fn add_mmr_digest(header: &mut Header, mmr_hash: MmrRootHash) {
-	header.digest_mut().push(DigestItem::Consensus(
-		BEEFY_ENGINE_ID,
-		ConsensusLog::<AuthorityId>::MmrRoot(mmr_hash).encode(),
-	));
+fn add_mmr_digest(builder: &mut impl BlockBuilderExt, mmr_hash: MmrRootHash) {
+	builder
+		.push_deposit_log_digest_item(DigestItem::Consensus(
+			BEEFY_ENGINE_ID,
+			ConsensusLog::<AuthorityId>::MmrRoot(mmr_hash).encode(),
+		))
+		.unwrap();
 }

-fn add_auth_change_digest(header: &mut Header, new_auth_set: BeefyValidatorSet) {
-	header.digest_mut().push(DigestItem::Consensus(
-		BEEFY_ENGINE_ID,
-		ConsensusLog::<AuthorityId>::AuthoritiesChange(new_auth_set).encode(),
-	));
+fn add_auth_change_digest(builder: &mut impl BlockBuilderExt, new_auth_set: BeefyValidatorSet) {
+	builder
+		.push_deposit_log_digest_item(DigestItem::Consensus(
+			BEEFY_ENGINE_ID,
+			ConsensusLog::<AuthorityId>::AuthoritiesChange(new_auth_set).encode(),
+		))
+		.unwrap();
 }

 pub(crate) fn make_beefy_ids(keys: &[BeefyKeyring]) -> Vec<AuthorityId> {
@@ -48,7 +48,7 @@ use sp_runtime::{
 	Justifications,
 };
 use std::{collections::HashSet, pin::Pin};
-use substrate_test_runtime_client::runtime::BlockNumber;
+use substrate_test_runtime_client::{runtime::BlockNumber, BlockBuilderExt};
 use tokio::runtime::Handle;

 use authorities::AuthoritySet;
@@ -399,22 +399,27 @@ async fn run_to_completion(
 	run_to_completion_with(blocks, net, peers, |_| None).await
 }

-fn add_scheduled_change(block: &mut Block, change: ScheduledChange<BlockNumber>) {
-	block.header.digest_mut().push(DigestItem::Consensus(
-		GRANDPA_ENGINE_ID,
-		sp_consensus_grandpa::ConsensusLog::ScheduledChange(change).encode(),
-	));
+fn add_scheduled_change(builder: &mut impl BlockBuilderExt, change: ScheduledChange<BlockNumber>) {
+	builder
+		.push_deposit_log_digest_item(DigestItem::Consensus(
+			GRANDPA_ENGINE_ID,
+			sp_consensus_grandpa::ConsensusLog::ScheduledChange(change).encode(),
+		))
+		.unwrap();
 }

 fn add_forced_change(
-	block: &mut Block,
+	builder: &mut impl BlockBuilderExt,
 	median_last_finalized: BlockNumber,
 	change: ScheduledChange<BlockNumber>,
 ) {
-	block.header.digest_mut().push(DigestItem::Consensus(
-		GRANDPA_ENGINE_ID,
-		sp_consensus_grandpa::ConsensusLog::ForcedChange(median_last_finalized, change).encode(),
-	));
+	builder
+		.push_deposit_log_digest_item(DigestItem::Consensus(
+			GRANDPA_ENGINE_ID,
+			sp_consensus_grandpa::ConsensusLog::ForcedChange(median_last_finalized, change)
+				.encode(),
+		))
+		.unwrap();
 }

 #[tokio::test]
@@ -605,28 +610,24 @@ async fn transition_3_voters_twice_1_full_observer() {
 					},
 					14 => {
 						// generate transition at block 15, applied at 20.
-						net.lock().peer(0).generate_blocks(1, BlockOrigin::File, |builder| {
-							let mut block = builder.build().unwrap().block;
+						net.lock().peer(0).generate_blocks(1, BlockOrigin::File, |mut builder| {
 							add_scheduled_change(
-								&mut block,
+								&mut builder,
 								ScheduledChange { next_authorities: make_ids(peers_b), delay: 4 },
 							);
-
-							block
+							builder.build().unwrap().block
 						});
 						net.lock().peer(0).push_blocks(5, false);
 					},
 					20 => {
 						// at block 21 we do another transition, but this time instant.
 						// add more until we have 30.
-						net.lock().peer(0).generate_blocks(1, BlockOrigin::File, |builder| {
-							let mut block = builder.build().unwrap().block;
+						net.lock().peer(0).generate_blocks(1, BlockOrigin::File, |mut builder| {
 							add_scheduled_change(
-								&mut block,
+								&mut builder,
 								ScheduledChange { next_authorities: make_ids(&peers_c), delay: 0 },
 							);
-
-							block
+							builder.build().unwrap().block
 						});
 						net.lock().peer(0).push_blocks(9, false);
 					},
@@ -708,13 +709,12 @@ async fn sync_justifications_on_change_blocks() {
 	// at block 21 we do add a transition which is instant
 	let hashof21 = net
 		.peer(0)
-		.generate_blocks(1, BlockOrigin::File, |builder| {
-			let mut block = builder.build().unwrap().block;
+		.generate_blocks(1, BlockOrigin::File, |mut builder| {
 			add_scheduled_change(
-				&mut block,
+				&mut builder,
 				ScheduledChange { next_authorities: make_ids(peers_b), delay: 0 },
 			);
-			block
+			builder.build().unwrap().block
 		})
 		.pop()
 		.unwrap();
@@ -778,26 +778,24 @@ async fn finalizes_multiple_pending_changes_in_order() {
 	net.peer(0).push_blocks(20, false);

 	// at block 21 we do add a transition which is instant
-	net.peer(0).generate_blocks(1, BlockOrigin::File, |builder| {
-		let mut block = builder.build().unwrap().block;
+	net.peer(0).generate_blocks(1, BlockOrigin::File, |mut builder| {
 		add_scheduled_change(
-			&mut block,
+			&mut builder,
 			ScheduledChange { next_authorities: make_ids(peers_b), delay: 0 },
 		);
-		block
+		builder.build().unwrap().block
 	});

 	// add more blocks on top of it (until we have 25)
 	net.peer(0).push_blocks(4, false);

 	// at block 26 we add another which is enacted at block 30
-	net.peer(0).generate_blocks(1, BlockOrigin::File, |builder| {
-		let mut block = builder.build().unwrap().block;
+	net.peer(0).generate_blocks(1, BlockOrigin::File, |mut builder| {
 		add_scheduled_change(
-			&mut block,
+			&mut builder,
 			ScheduledChange { next_authorities: make_ids(peers_c), delay: 4 },
 		);
-		block
+		builder.build().unwrap().block
 	});

 	// add more blocks on top of it (until we have 30)
@@ -833,23 +831,21 @@ async fn force_change_to_new_set() {
 	let voters_future = initialize_grandpa(&mut net, peers_a);
 	let net = Arc::new(Mutex::new(net));

-	net.lock().peer(0).generate_blocks(1, BlockOrigin::File, |builder| {
-		let mut block = builder.build().unwrap().block;
-
+	net.lock().peer(0).generate_blocks(1, BlockOrigin::File, |mut builder| {
 		// add a forced transition at block 12.
 		add_forced_change(
-			&mut block,
+			&mut builder,
 			0,
 			ScheduledChange { next_authorities: voters.clone(), delay: 10 },
 		);

 		// add a normal transition too to ensure that forced changes take priority.
 		add_scheduled_change(
-			&mut block,
+			&mut builder,
 			ScheduledChange { next_authorities: make_ids(genesis_authorities), delay: 5 },
 		);

-		block
+		builder.build().unwrap().block
 	});

 	net.lock().peer(0).push_blocks(25, false);
@@ -885,14 +881,15 @@ async fn allows_reimporting_change_blocks() {
 	let (mut block_import, ..) = net.make_block_import(client.clone());

 	let full_client = client.as_client();
-	let builder = full_client
+	let mut builder = full_client
 		.new_block_at(full_client.chain_info().genesis_hash, Default::default(), false)
 		.unwrap();
-	let mut block = builder.build().unwrap().block;
+
 	add_scheduled_change(
-		&mut block,
+		&mut builder,
 		ScheduledChange { next_authorities: make_ids(peers_b), delay: 0 },
 	);
+	let block = builder.build().unwrap().block;

 	let block = || {
 		let block = block.clone();
@@ -929,16 +926,17 @@ async fn test_bad_justification() {
 	let (mut block_import, ..) = net.make_block_import(client.clone());

 	let full_client = client.as_client();
-	let builder = full_client
+	let mut builder = full_client
 		.new_block_at(full_client.chain_info().genesis_hash, Default::default(), false)
 		.unwrap();
-	let mut block = builder.build().unwrap().block;

 	add_scheduled_change(
-		&mut block,
+		&mut builder,
 		ScheduledChange { next_authorities: make_ids(peers_b), delay: 0 },
 	);

+	let block = builder.build().unwrap().block;
+
 	let block = || {
 		let block = block.clone();
 		let mut import = BlockImportParams::new(BlockOrigin::File, block.header);
@@ -1629,6 +1627,7 @@ async fn grandpa_environment_passes_actual_best_block_to_voting_rules() {

 #[tokio::test]
 async fn grandpa_environment_checks_if_best_block_is_descendent_of_finality_target() {
+	sp_tracing::try_init_simple();
 	use finality_grandpa::voter::Environment;

 	let peers = &[Ed25519Keyring::Alice];
@@ -1662,10 +1661,9 @@ async fn grandpa_environment_checks_if_best_block_is_descendent_of_finality_targ
 		BlockId::Number(4),
 		6,
 		BlockOrigin::File,
-		|builder| {
-			let mut block = builder.build().unwrap().block;
-			block.header.digest_mut().push(DigestItem::Other(vec![1]));
-			block
+		|mut builder| {
+			builder.push_deposit_log_digest_item(DigestItem::Other(vec![1])).unwrap();
+			builder.build().unwrap().block
 		},
 		false,
 		false,
@@ -1999,13 +1997,12 @@ async fn revert_prunes_authority_changes() {

 	type TestBlockBuilder<'a> =
 		BlockBuilder<'a, Block, PeersFullClient, substrate_test_runtime_client::Backend>;
-	let edit_block = |builder: TestBlockBuilder| {
-		let mut block = builder.build().unwrap().block;
+	let edit_block = |mut builder: TestBlockBuilder| {
 		add_scheduled_change(
-			&mut block,
+			&mut builder,
 			ScheduledChange { next_authorities: make_ids(peers), delay: 0 },
 		);
-		block
+		builder.build().unwrap().block
 	};

 	let api = TestApi::new(make_ids(peers));
@@ -2047,10 +2044,9 @@ async fn revert_prunes_authority_changes() {
 			BlockId::Number(23),
 			3,
 			BlockOrigin::File,
-			|builder| {
-				let mut block = builder.build().unwrap().block;
-				block.header.digest_mut().push(DigestItem::Other(vec![1]));
-				block
+			|mut builder| {
+				builder.push_deposit_log_digest_item(DigestItem::Other(vec![1])).unwrap();
+				builder.build().unwrap().block
 			},
 			false,
 			false,
@@ -2079,10 +2075,9 @@ async fn revert_prunes_authority_changes() {
 			BlockId::Number(25),
 			3,
 			BlockOrigin::File,
-			|builder| {
-				let mut block = builder.build().unwrap().block;
-				block.header.digest_mut().push(DigestItem::Other(vec![2]));
-				block
+			|mut builder| {
+				builder.push_deposit_log_digest_item(DigestItem::Other(vec![2])).unwrap();
+				builder.build().unwrap().block
 			},
 			false,
 			false,
@@ -326,11 +326,10 @@ mod tests {
 	use sp_consensus::BlockOrigin;
 	use sp_consensus_grandpa::GRANDPA_ENGINE_ID;
 	use sp_keyring::Ed25519Keyring;
-	use sp_runtime::traits::Header as _;
 	use std::sync::Arc;
 	use substrate_test_runtime_client::{
-		ClientBlockImportExt, ClientExt, DefaultTestClientBuilderExt, TestClientBuilder,
-		TestClientBuilderExt,
+		BlockBuilderExt, ClientBlockImportExt, ClientExt, DefaultTestClientBuilderExt,
+		TestClientBuilder, TestClientBuilderExt,
 	};

 	#[test]
@@ -348,8 +347,7 @@ mod tests {
 		let mut authority_set_changes = Vec::new();

 		for n in 1..=100 {
-			let mut block = client.new_block(Default::default()).unwrap().build().unwrap().block;
-
+			let mut builder = client.new_block(Default::default()).unwrap();
 			let mut new_authorities = None;

 			// we will trigger an authority set change every 10 blocks
@@ -376,9 +374,11 @@ mod tests {
 					.encode(),
 				);

-				block.header.digest_mut().logs.push(digest);
+				builder.push_deposit_log_digest_item(digest).unwrap();
 			}

+			let block = builder.build().unwrap().block;
+
 			futures::executor::block_on(client.import(BlockOrigin::Own, block)).unwrap();

 			if let Some(new_authorities) = new_authorities {