Fix try-runtime with create-snapshot (#13223)

* Fix try-runtime with create-snapshot * Apply review suggestions
paritytech · Jan 25, 2023 · d029225 · d029225
1 parent d22e68c
commit d029225
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 7 deletions.
diff --git a/utils/frame/try-runtime/cli/src/commands/create_snapshot.rs b/utils/frame/try-runtime/cli/src/commands/create_snapshot.rs
@@ -71,7 +71,7 @@ where
 
 	let executor = build_executor::<HostFns>(&shared);
 	let _ = State::Live(command.from)
-		.into_ext::<Block, HostFns>(&shared, &executor, Some(path.into()))
+		.into_ext::<Block, HostFns>(&shared, &executor, Some(path.into()), false)
 		.await?;
 
 	Ok(())

diff --git a/utils/frame/try-runtime/cli/src/commands/execute_block.rs b/utils/frame/try-runtime/cli/src/commands/execute_block.rs
@@ -99,7 +99,7 @@ where
 	HostFns: HostFunctions,
 {
 	let executor = build_executor::<HostFns>(&shared);
-	let ext = command.state.into_ext::<Block, HostFns>(&shared, &executor, None).await?;
+	let ext = command.state.into_ext::<Block, HostFns>(&shared, &executor, None, true).await?;
 
 	// get the block number associated with this block.
 	let block_ws_uri = command.block_ws_uri::<Block>();

diff --git a/utils/frame/try-runtime/cli/src/commands/follow_chain.rs b/utils/frame/try-runtime/cli/src/commands/follow_chain.rs
@@ -137,7 +137,7 @@ where
 				pallet: vec![],
 				child_tree: true,
 			});
-			let ext = state.into_ext::<Block, HostFns>(&shared, &executor, None).await?;
+			let ext = state.into_ext::<Block, HostFns>(&shared, &executor, None, true).await?;
 			maybe_state_ext = Some(ext);
 		}
 

diff --git a/utils/frame/try-runtime/cli/src/commands/offchain_worker.rs b/utils/frame/try-runtime/cli/src/commands/offchain_worker.rs
@@ -78,7 +78,7 @@ where
 {
 	let executor = build_executor(&shared);
 	// we first build the externalities with the remote code.
-	let ext = command.state.into_ext::<Block, HostFns>(&shared, &executor, None).await?;
+	let ext = command.state.into_ext::<Block, HostFns>(&shared, &executor, None, true).await?;
 
 	let header_ws_uri = command.header_ws_uri::<Block>();
 

diff --git a/utils/frame/try-runtime/cli/src/commands/on_runtime_upgrade.rs b/utils/frame/try-runtime/cli/src/commands/on_runtime_upgrade.rs
@@ -62,7 +62,7 @@ where
 	HostFns: HostFunctions,
 {
 	let executor = build_executor(&shared);
-	let ext = command.state.into_ext::<Block, HostFns>(&shared, &executor, None).await?;
+	let ext = command.state.into_ext::<Block, HostFns>(&shared, &executor, None, true).await?;
 
 	let (_, encoded_result) = state_machine_call_with_proof::<Block, HostFns>(
 		&ext,

diff --git a/utils/frame/try-runtime/cli/src/lib.rs b/utils/frame/try-runtime/cli/src/lib.rs
@@ -609,6 +609,7 @@ impl State {
 		shared: &SharedParams,
 		executor: &WasmExecutor<HostFns>,
 		state_snapshot: Option<SnapshotConfig>,
+		try_runtime_check: bool,
 	) -> sc_cli::Result<RemoteExternalities<Block>>
 	where
 		Block::Hash: FromStr,
@@ -707,8 +708,10 @@ impl State {
 		}
 
 		// whatever runtime we have in store now must have been compiled with try-runtime feature.
-		if !ensure_try_runtime::<Block, HostFns>(&executor, &mut ext) {
-			return Err("given runtime is NOT compiled with try-runtime feature!".into())
+		if try_runtime_check {
+			if !ensure_try_runtime::<Block, HostFns>(&executor, &mut ext) {
+				return Err("given runtime is NOT compiled with try-runtime feature!".into())
+			}
 		}
 
 		Ok(ext)