More improvements

.github/workflows/rust-checks.yaml

@@ -32,7 +32,7 @@ jobs:
         with:
           version: "3.6.1"
       - name: cargo doc
-        run: RUSTFLAGS="-D warnings" cargo doc
+        run: RUSTFLAGS="-D warnings" cargo doc --locked
 
   lint:
     runs-on: ubuntu-latest

cli/Cargo.toml

@@ -21,14 +21,11 @@ env_logger = { workspace = true }
 parity-scale-codec = { workspace = true, features = ["derive"] }
 tokio = { workspace = true, features = ["full"] }
 
-sc-executor = { workspace = true }
-
 sp-io = { workspace = true }
 sp-runtime = { workspace = true }
 sp-state-machine = { workspace = true }
 sp-storage = { workspace = true }
 
-node-executor = { workspace = true }
 node-primitives = { workspace = true }
 
 try-runtime-core = { workspace = true }

cli/main.rs

@@ -300,7 +300,6 @@
 use std::env;
 
 use clap::Parser;
-use node_executor::ExecutorDispatch;
 use node_primitives::Block;
 use try_runtime_core::commands::TryRuntime;
 
@@ -315,12 +314,8 @@ fn init_env() {
 async fn main() {
     init_env();
 
-    use sc_executor::{sp_wasm_interface::ExtendedHostFunctions, NativeExecutionDispatch};
     let cmd = TryRuntime::parse();
-    cmd.run::<Block, ExtendedHostFunctions<
-        sp_io::SubstrateHostFunctions,
-        <ExecutorDispatch as NativeExecutionDispatch>::ExtendHostFunctions,
-    >>()
-    .await
-    .unwrap();
+    cmd.run::<Block, sp_io::SubstrateHostFunctions>()
+        .await
+        .unwrap();
 }

core/src/lib.rs

@@ -74,6 +74,9 @@ pub(crate) fn build_executor<H: HostFunctions>(shared: &SharedParams) -> WasmExe
         ))
         .with_onchain_heap_alloc_strategy(heap_pages)
         .with_offchain_heap_alloc_strategy(heap_pages)
+        // There is not that much we can do if someone is using unknown host functions.
+        // They would need to fork the `cli` to add their custom host functions.
+        .with_allow_missing_host_functions(true)
         .build()
 }
 

core/src/state.rs

@@ -127,11 +127,7 @@ impl LiveState {
 pub enum State {
     /// Use a state snapshot as the source of runtime state.
     Snap {
-        /// DEPRECATED: use `--path` instead.
-        #[arg(short, long)]
-        snapshot_path: Option<PathBuf>,
-
-        #[clap(short = 'p', long = "path")]
+        #[clap(short = 'p', long = "path", alias = "snapshot-path")]
         path: Option<PathBuf>,
     },
 
@@ -168,22 +164,11 @@ impl State {
         <Block::Hash as FromStr>::Err: Debug,
     {
         let builder = match self {
-            State::Snap {
-                snapshot_path,
-                path,
-            } => {
-                // we allow both `--snapshot-path` and `--path` for now, but `--snapshot-path` is
-                // deprecated.
-                if snapshot_path.is_some() {
-                    log::warn!(
-                        target: LOG_TARGET,
-                        "`--snapshot-path` is deprecated and will be removed some time after Jan 2024. Use `--path` instead."
-                    );
-                }
-                let path = snapshot_path
+            State::Snap { path } => {
+                let path = path
                     .as_ref()
-                    .or(path.as_ref())
                     .ok_or_else(|| "no snapshot path provided".to_string())?;
+
                 Builder::<Block>::new().mode(Mode::Offline(OfflineConfig {
                     state_snapshot: SnapshotConfig::new(path),
                 }))