feat: expand trace decoder tests

0xPolygonZero · Jul 16, 2024 · e01ad9e · e01ad9e
1 parent 3336055
commit e01ad9e
Show file tree

Hide file tree

Showing 19 changed files with 905 additions and 100 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/trace_decoder/Cargo.toml b/trace_decoder/Cargo.toml
@@ -39,6 +39,10 @@ winnow = { workspace = true }
 criterion = { workspace = true }
 pretty_env_logger = { workspace = true }
 serde_json = { workspace = true }
+prover = { workspace = true }
+serde_path_to_error = { workspace = true }
+alloy-rpc-types-eth = "0.1.4"
+rstest = "0.21.0"
 
 [[bench]]
 name = "block_processing"

diff --git a/trace_decoder/src/type1.rs b/trace_decoder/src/type1.rs
@@ -428,12 +428,13 @@ fn iter_leaves(node: Node) -> Box<dyn Iterator<Item = (Vec<U4>, IterLeaf)>> {
 }
 
 #[test]
-fn test() {
-    for (ix, case) in
-        serde_json::from_str::<Vec<super::Case>>(include_str!("test_cases/zero_jerigon.json"))
-            .unwrap()
-            .into_iter()
-            .enumerate()
+fn test_tries() {
+    for (ix, case) in serde_json::from_str::<Vec<super::Case>>(include_str!(
+        "../tests/data/tries/zero_jerigon.json"
+    ))
+    .unwrap()
+    .into_iter()
+    .enumerate()
     {
         println!("case {}", ix);
         let instructions = crate::wire::parse(&case.bytes).unwrap();
@@ -454,3 +455,6 @@ fn test() {
         }
     }
 }
+
+#[test]
+fn test_witness_processing() {}
diff --git a/trace_decoder/src/type2.rs b/trace_decoder/src/type2.rs
@@ -224,12 +224,13 @@ fn iter_leaves(node: Node) -> Box<dyn Iterator<Item = (BitVec, Either<[u8; 32],
 }
 
 #[test]
-fn test() {
-    for (ix, case) in
-        serde_json::from_str::<Vec<super::Case>>(include_str!("test_cases/hermez_cdk_erigon.json"))
-            .unwrap()
-            .into_iter()
-            .enumerate()
+fn test_tries() {
+    for (ix, case) in serde_json::from_str::<Vec<super::Case>>(include_str!(
+        "../tests/data/tries/hermez_cdk_erigon.json"
+    ))
+    .unwrap()
+    .into_iter()
+    .enumerate()
     {
         println!("case {}", ix);
         let instructions = crate::wire::parse(&case.bytes).unwrap();

diff --git a/trace_decoder/src/test_cases/.gitattributes → trace_decoder/tests/data/.gitattributes b/trace_decoder/src/test_cases/.gitattributes → trace_decoder/tests/data/.gitattributes
diff --git a/...der/src/test_cases/hermez_cdk_erigon.json → ...r/tests/data/tries/hermez_cdk_erigon.json b/...der/src/test_cases/hermez_cdk_erigon.json → ...r/tests/data/tries/hermez_cdk_erigon.json
diff --git a/..._decoder/src/test_cases/zero_jerigon.json → ...ecoder/tests/data/tries/zero_jerigon.json b/..._decoder/src/test_cases/zero_jerigon.json → ...ecoder/tests/data/tries/zero_jerigon.json
diff --git a/trace_decoder/tests/b19807080_trace.json → ...itnesses/zero_jerigon/b19807080_main.json b/trace_decoder/tests/b19807080_trace.json → ...itnesses/zero_jerigon/b19807080_main.json