Move WithoutStorageRoot into separate crate

Author: tmpolaczyk

Cargo.lock

@@ -3,6 +3,7 @@ default-members = [
 	"fuzzers/*",
 ]
 members = [
+	"crates/*",
 	"fuzzers/*",
 	"fuzzers/fuzz-dancelight/fuzz",
 	"fuzzers/fuzz-dancelight/fuzz-dancelight-cli",
@@ -18,6 +19,7 @@ repository = "https://github.com/tmpolaczyk/fuzz-tanssi-runtime"
 [workspace.dependencies]
 fuzz-dancelight = { path = "fuzzers/fuzz-dancelight" }
 fuzz-starlight = { path = "fuzzers/fuzz-starlight" }
+externalities-without-storage-root = { path = "crates/externalities-without-storage-root" }
 
 dancelight-runtime = { git = "https://github.com/moondance-labs/tanssi", branch = "master", default-features = false }
 dancelight-runtime-constants = { git = "https://github.com/moondance-labs/tanssi", branch = "master", default-features = false }
@@ -64,6 +66,7 @@ frame-metadata = "16"
 futures = "0.3.1"
 hash-db = { version = "0.16.0", default-features = false }
 hex = "0.4.3"
+hex-literal = "0.4.1"
 include_dir = "0.7.3"
 itertools = "0.10.5"
 lazy_static = "1.4.0"

Cargo.toml

@@ -0,0 +1,14 @@
+[package]
+name = "externalities-without-storage-root"
+authors = { workspace = true }
+edition = "2024"
+license = "GPL-3.0-only"
+version = "0.1.0"
+
+[dependencies]
+sp-externalities = { workspace = true }
+sp-storage = { workspace = true }
+hex-literal = { workspace = true }
+
+[lints]
+workspace = true

crates/externalities-without-storage-root/Cargo.toml

@@ -2,6 +2,7 @@ use sp_externalities::{Error, Extension, ExtensionStore, Externalities, MultiRem
 use sp_storage::{ChildInfo, StateVersion, TrackedStorageKey};
 use std::any::{Any, TypeId};
 
+/// Wrap externalities and return fake storage root based on block number
 pub struct WithoutStorageRoot<T> {
     inner: T,
 }
@@ -109,8 +110,7 @@ impl<T: Externalities> Externalities for WithoutStorageRoot<T> {
         let block_number = self
             .inner
             .storage(
-                &hex::decode("26aa394eea5630e07c48ae0c9558cef702a5c1b19ab7a04f536c519aca4983ac")
-                    .unwrap(),
+                &hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef702a5c1b19ab7a04f536c519aca4983ac")
             )
             .unwrap();
         assert_eq!(block_number.len(), 4);

…z-dancelight/src/without_storage_root.rs …nalities-without-storage-root/src/lib.rsfuzzers/fuzz-dancelight/src/without_storage_root.rs renamed to crates/externalities-without-storage-root/src/lib.rs fuzzers/fuzz-dancelight/src/without_storage_root.rs renamed to crates/externalities-without-storage-root/src/lib.rs

@@ -6,6 +6,7 @@ license = "GPL-3.0-only"
 version = "0.1.0"
 
 [dependencies]
+externalities-without-storage-root = { workspace = true }
 bitvec = { workspace = true }
 cumulus-primitives-core = { workspace = true }
 dancelight-runtime = { workspace = true, features = [ "fast-runtime", "std", "try-runtime" ] }

fuzzers/fuzz-dancelight/Cargo.toml

@@ -14,7 +14,7 @@ use crate::metadata::{
 };
 use crate::simple_backend::SimpleBackend;
 use crate::storage_tracer::{BlockContext, ExtStorageTracer, TracingExt};
-use crate::without_storage_root::WithoutStorageRoot;
+use externalities_without_storage_root::WithoutStorageRoot;
 use dancelight_runtime::{AuthorNoting, EthereumInboundQueueV2, Session, System, TanssiCollatorAssignment, TimestampProvider, UseSnowbridgeV2};
 use frame_support::dispatch::DispatchResultWithPostInfo;
 use frame_support::traits::CallerTrait;
@@ -83,7 +83,6 @@ mod genesis;
 mod metadata;
 mod mutators;
 mod read_snapshot;
-mod without_storage_root;
 // TODO: extract to separate crate to speed up compilation
 mod simple_backend;
 mod storage_tracer;

fuzzers/fuzz-dancelight/src/lib.rs

@@ -1,6 +1,5 @@
 use super::*;
 use crate::genesis::invulnerables_from_seeds;
-use crate::without_storage_root::WithoutStorageRoot;
 
 pub fn read_snapshot(
     chain_spec_json_bytes: &[u8],