feat: move integration tests to test folder

.github/workflows/ci.yml

@@ -35,3 +35,6 @@ jobs:
 
       - name: Check simple-sparse-state (lib only)
         run: cargo check --locked -p simple-sparse-state --lib
+
+      - name: Run integration tests
+        run: cargo test --locked -p integration-tests

Cargo.toml

@@ -1,5 +1,5 @@
 [workspace]
-members = ["crates/mpt", "crates/simple-sparse-state", "crates/simple-trie", "crates/sparsestate"]
+members = ["crates/mpt", "crates/simple-sparse-state", "crates/simple-trie", "crates/sparsestate", "tests"]
 resolver = "2"
 
 [workspace.package]

crates/simple-sparse-state/Cargo.toml

@@ -17,14 +17,8 @@ simple-trie = { path = "../simple-trie" }
 
 [dev-dependencies]
 alloy-consensus = { version = "1.0.42", default-features = false }
-guest-libs.workspace = true
-reth-evm-ethereum.workspace = true
-reth-chainspec.workspace = true
 reth-primitives-traits.workspace = true
-anyhow = "1.0"
-sparsestate = { path = "../sparsestate" }
 
 [lints]
 workspace = true
 
-

crates/simple-sparse-state/src/lib.rs

@@ -201,19 +201,9 @@ impl StatelessTrie for SimpleSparseState {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use alloy_consensus::private::serde_json;
     use alloy_consensus::Header;
     use alloy_primitives::hex;
-    use anyhow;
-    use guest_libs::senders::recover_signers;
-    use reth_chainspec::ChainSpec;
-    use reth_evm_ethereum::EthEvmConfig;
     use reth_primitives_traits::account::Account;
-    use reth_stateless::{
-        stateless_validation_with_trie, validation::stateless_validation, Genesis, StatelessInput,
-    };
-    use sparsestate::SparseState;
-    use std::sync::Arc;
 
     #[test]
     fn test_sparse_state() {
@@ -350,54 +340,4 @@ mod tests {
             trie.0.calculate_state_root(hashed_post_state).unwrap()
         );
     }
-
-    #[test]
-    fn stateless_validation_test() {
-        let input = serde_json::from_reader::<_, StatelessInput>(
-            std::fs::File::open(String::from("./../../test_data/rpc_block_23439901.json")).unwrap(),
-        )
-        .unwrap();
-
-        let genesis = Genesis {
-            config: input.chain_config.clone(),
-            ..Default::default()
-        };
-        let chain_spec: Arc<ChainSpec> = Arc::new(genesis.into());
-        let evm_config = EthEvmConfig::new(chain_spec.clone());
-
-        let public_keys = recover_signers(input.block.body.transactions.iter())
-            .map_err(|err| anyhow::anyhow!("recovering signers: {err}"))
-            .unwrap();
-
-        let r_reth = stateless_validation(
-            input.block.clone(),
-            public_keys.clone(),
-            input.witness.clone(),
-            chain_spec.clone(),
-            evm_config.clone(),
-        )
-        .expect("Stateless validation error");
-
-        let r_zeth = stateless_validation_with_trie::<SparseState, ChainSpec, EthEvmConfig>(
-            input.block.clone(),
-            public_keys.clone(),
-            input.witness.clone(),
-            chain_spec.clone(),
-            evm_config.clone(),
-        )
-        .expect("Stateless validation error");
-
-        let r_simple =
-            stateless_validation_with_trie::<SimpleSparseState, ChainSpec, EthEvmConfig>(
-                input.block.clone(),
-                public_keys.clone(),
-                input.witness.clone(),
-                chain_spec.clone(),
-                evm_config.clone(),
-            )
-            .expect("Stateless validation error");
-
-        assert_eq!(r_reth, r_zeth);
-        assert_eq!(r_zeth, r_simple);
-    }
 }

crates/simple-trie/src/trie/hash.rs

@@ -1,9 +1,9 @@
 //! Hashing element implementation for different node's types of MPT.
 use super::nodes::{BranchNode, DigestNode, LeafNode, TrieNode};
-use crate::trie::rlp::encode_list_header;
 use crate::trie::TrieNode::{Branch, Digest, Leaf};
+use crate::trie::rlp::encode_list_header;
 use alloy_primitives::private::alloy_rlp::Encodable;
-use alloy_primitives::{keccak256, B256};
+use alloy_primitives::{B256, keccak256};
 use alloy_trie::nodes::encode_path_leaf;
 
 impl TrieNode {
@@ -170,7 +170,7 @@ fn shorten_encoding(b: Vec<u8>) -> Vec<u8> {
 mod tests {
     use crate::trie::Trie;
     use alloy_primitives::private::alloy_rlp::Encodable;
-    use alloy_primitives::{hex, keccak256, Bytes};
+    use alloy_primitives::{Bytes, hex, keccak256};
     use alloy_trie::{HashBuilder, Nibbles};
     use std::vec;
 

crates/simple-trie/src/trie/reveal.rs

@@ -4,7 +4,7 @@
 use crate::trie::B256Map;
 use crate::trie::TrieNode;
 use crate::trie::TrieNode::{Branch, Digest, Leaf};
-use alloy_primitives::{Bytes, B256};
+use alloy_primitives::{B256, Bytes};
 
 impl TrieNode {
     fn set_cache(&mut self, hash: B256) {

crates/simple-trie/src/trie/trie.rs

@@ -3,8 +3,8 @@ use super::nodes::{DigestNode, LeafNode};
 use crate::trie::Trie;
 use crate::trie::TrieNode::{Digest, Leaf};
 use alloy_primitives::map::{FbBuildHasher, HashMap};
-use alloy_primitives::{Bytes, B256};
-use alloy_trie::{Nibbles, EMPTY_ROOT_HASH};
+use alloy_primitives::{B256, Bytes};
+use alloy_trie::{EMPTY_ROOT_HASH, Nibbles};
 
 /// Added only to make an IDE happy. It is defined in alloy_primitives::map
 pub type B256Map<V> = HashMap<B256, V, FbBuildHasher<32>>;
@@ -93,7 +93,7 @@ impl Trie {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use alloy_primitives::{hex, keccak256, Bytes};
+    use alloy_primitives::{Bytes, hex, keccak256};
     use alloy_trie::{HashBuilder, Nibbles};
     use std::collections::BTreeMap;
 

tests/Cargo.toml

@@ -0,0 +1,17 @@
+[package]
+name = "integration-tests"
+version.workspace = true
+edition.workspace = true
+rust-version.workspace = true
+license.workspace = true
+
+[dev-dependencies]
+simple-sparse-state = { path = "../crates/simple-sparse-state" }
+guest-libs.workspace = true
+reth-evm-ethereum.workspace = true
+reth-chainspec.workspace = true
+reth-stateless.workspace = true
+serde_json = "1.0"
+
+[lints]
+workspace = true

tests/src/lib.rs

@@ -0,0 +1,59 @@
+#![allow(missing_docs)]
+
+#[cfg(test)]
+mod tests {
+    use guest_libs::senders::recover_signers;
+    use reth_chainspec::ChainSpec;
+    use reth_evm_ethereum::EthEvmConfig;
+    use reth_stateless::{
+        stateless_validation_with_trie, validation::stateless_validation, Genesis, StatelessInput,
+    };
+    use simple_sparse_state::SimpleSparseState;
+    use std::{fs::File, path::PathBuf, sync::Arc};
+
+    #[test]
+    fn stateless_validation_test() {
+        let mut input_path = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
+        input_path.push("../test_data/rpc_block_23439901.json");
+        if !input_path.exists() {
+            eprintln!("skipping stateless_validation_test: missing fixture {input_path:?}");
+            return;
+        }
+
+        let input = serde_json::from_reader::<_, StatelessInput>(
+            File::open(input_path).expect("failed to open test input"),
+        )
+        .expect("failed to parse stateless input");
+
+        let genesis = Genesis {
+            config: input.chain_config.clone(),
+            ..Default::default()
+        };
+        let chain_spec: Arc<ChainSpec> = Arc::new(genesis.into());
+        let evm_config = EthEvmConfig::new(chain_spec.clone());
+
+        let public_keys =
+            recover_signers(input.block.body.transactions.iter()).expect("recovering signers");
+
+        let reth_result = stateless_validation(
+            input.block.clone(),
+            public_keys.clone(),
+            input.witness.clone(),
+            chain_spec.clone(),
+            evm_config.clone(),
+        )
+        .expect("reth stateless validation error");
+
+        let simple_result =
+            stateless_validation_with_trie::<SimpleSparseState, ChainSpec, EthEvmConfig>(
+                input.block,
+                public_keys,
+                input.witness,
+                chain_spec,
+                evm_config,
+            )
+            .expect("simple sparse stateless validation error");
+
+        assert_eq!(reth_result, simple_result);
+    }
+}