fix: refactor

trace_decoder/benches/block_processing.rs

@@ -6,6 +6,7 @@
 //! for a total of 24,479,837 gas.
 
 use criterion::{criterion_group, criterion_main, BatchSize, Criterion};
+use trace_decoder::observer::DefaultObserver;
 use trace_decoder::{BlockTrace, OtherBlockData};
 
 #[derive(Clone, Debug, serde::Deserialize)]
@@ -33,7 +34,13 @@ fn criterion_benchmark(c: &mut Criterion) {
                      block_trace,
                      other_data,
                  }| {
-                    trace_decoder::entrypoint(block_trace, other_data, batch_size).unwrap()
+                    trace_decoder::entrypoint(
+                        block_trace,
+                        other_data,
+                        batch_size,
+                        &mut DefaultObserver::new(),
+                    )
+                    .unwrap()
                 },
                 BatchSize::LargeInput,
             )

trace_decoder/src/core.rs

@@ -661,24 +661,3 @@ impl FromIterator<Vec<u8>> for Hash2Code {
         this
     }
 }
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    #[test]
-    fn discuss() {
-        let _ignore_result = middle(
-            StateMpt::default(),
-            BTreeMap::new(),
-            vec![],
-            &mut Hash2Code::new(),
-            U256::zero(),
-            U256::zero(),
-            H256::zero(),
-            vec![],
-            |IntraBlockTries { state, .. }| {
-                let _serialized_state = serde_json::to_string(state.as_hashed_partial_trie());
-            },
-        );
-    }
-}

trace_decoder/tests/consistent-with-header.rs

@@ -10,6 +10,7 @@ use common::{cases, Case};
 use itertools::Itertools;
 use libtest_mimic::{Arguments, Trial};
 use mpt_trie::partial_trie::PartialTrie as _;
+use trace_decoder::observer::DefaultObserver;
 
 fn main() -> anyhow::Result<()> {
     let mut trials = vec![];
@@ -23,8 +24,13 @@ fn main() -> anyhow::Result<()> {
         } in cases()?
         {
             trials.push(Trial::test(format!("{name}@{batch_size}"), move || {
-                let gen_inputs = trace_decoder::entrypoint(trace, other.clone(), batch_size)
-                    .map_err(|e| format!("{e:?}"))?; // get the full cause chain
+                let gen_inputs = trace_decoder::entrypoint(
+                    trace,
+                    other.clone(),
+                    batch_size,
+                    &mut DefaultObserver::new(),
+                )
+                .map_err(|e| format!("{e:?}"))?; // get the full cause chain
                 check!(gen_inputs.len() >= 2);
                 check!(
                     Some(other.checkpoint_state_trie_root)

trace_decoder/tests/simulate-execution.rs

@@ -20,9 +20,11 @@ fn main() -> anyhow::Result<()> {
             other,
         } in cases()?
         {
-            let gen_inputs = trace_decoder::entrypoint(trace, other, batch_size, &mut DefaultObserver::new()).context(
-                format!("error in `trace_decoder` for {name} at batch size {batch_size}"),
-            )?;
+            let gen_inputs =
+                trace_decoder::entrypoint(trace, other, batch_size, &mut DefaultObserver::new())
+                    .context(format!(
+                        "error in `trace_decoder` for {name} at batch size {batch_size}"
+                    ))?;
             for (ix, gi) in gen_inputs.into_iter().enumerate() {
                 trials.push(Trial::test(
                     format!("{name}@{batch_size}/{ix}"),

zero_bin/trie_diff/src/main.rs → zero/src/bin/trie_diff.rs

@@ -6,13 +6,12 @@ use std::sync::Arc;
 use anyhow::Result;
 use clap::{Parser, ValueHint};
 use futures::{future, TryStreamExt};
-use ops::register;
 use paladin::directive::{Directive, IndexedStream};
 use paladin::runtime::Runtime;
-use prover::cli::CliProverConfig;
-use prover::{BlockProverInput, ProverConfig};
 use trace_decoder::observer::TriesObserver;
-use zero_bin_common::{prover_state::persistence::CIRCUIT_VERSION, version};
+use zero::ops::register;
+use zero::prover::{cli::CliProverConfig, BlockProverInput, ProverConfig};
+use zero::{prover_state::persistence::CIRCUIT_VERSION, version};
 
 #[derive(Parser)]
 pub(crate) struct Cli {
@@ -26,7 +25,7 @@ pub(crate) struct Cli {
 
 #[tokio::main]
 async fn main() -> Result<()> {
-    zero_bin_common::tracing::init();
+    zero::tracing::init();
 
     let args: Vec<String> = std::env::args().collect();
     if args.contains(&"--version".to_string()) {
@@ -59,7 +58,7 @@ async fn main() -> Result<()> {
         ..args.prover_config.into()
     });
 
-    let seg_ops = ops::SegmentProofTestOnly {
+    let seg_ops = zero::ops::SegmentProofTestOnly {
         save_inputs_on_error: prover_config.save_inputs_on_error,
     };
 
@@ -77,8 +76,8 @@ async fn main() -> Result<()> {
             &mut observer,
         )?;
 
-        // println!("Collected batch execution tries: {}", observer.data.len());
-        // println!(">>> tries: {:?}", observer.data);
+        println!("Collected batch execution tries: {}", observer.data.len());
+        //println!(">>> tries: {:?}", observer.data);
 
         let simulation = Directive::map(
             IndexedStream::from(