chore: More cleanups

Author: clabby

Diff for: Cargo.lock

@@ -7,9 +7,13 @@ version = "0.1.0"
 authors = ["clabby"]
 
 [workspace.dependencies]
-# types
+# ETH types
 alloy-primitives = "0.7.7"
 
+# kona
+kona-preimage = { git = "https://github.com/ethereum-optimism/kona" }
+kona-common = { git = "https://github.com/ethereum-optimism/kona" }
+
 # ser
 serde = { version = "1.0.204", features = ["derive"] }
 serde_json = "1.0.120"
@@ -19,6 +23,7 @@ tokio = { version = "1.38.0", features = ["full"] }
 
 # misc
 anyhow = "1.0.86"
+tracing = "0.1.40"
 
 [profile.release]
 opt-level = 3

Diff for: Cargo.toml

@@ -13,22 +13,18 @@ anyhow.workspace = true
 serde.workspace = true
 serde_json.workspace = true
 tokio.workspace = true
+kona-preimage.workspace = true
+kona-common.workspace = true
+tracing.workspace = true
 
 # local
 cannon-fpvm = { path = "../fpvm" }
 
-# misc
-kona-preimage = { git = "https://github.com/ethereum-optimism/kona" }
-kona-common = { git = "https://github.com/ethereum-optimism/kona" }
-
+# misc external
 tempfile = "3.10"
 async-trait = "0.1.81"
 flate2 = "1.0.28"
 command-fds = "0.2.3"
-tracing = { version = "0.1.40", optional = true }
 
 [dev-dependencies]
 proptest = "1.4.0"
-
-[features]
-tracing = ["dep:tracing"]

Diff for: crates/cannon/Cargo.toml

@@ -4,16 +4,14 @@ use crate::{gz::compress_bytes, types::Proof};
 use anyhow::{anyhow, Result};
 use cannon_fpvm::{state_hash, InstrumentedState};
 use kona_preimage::{HintRouter, PreimageFetcher};
+use std::time::Instant;
 use std::{
     fs::File,
     io::{BufWriter, Write},
     process::Child,
 };
 use tokio::{runtime::Runtime, task::JoinHandle};
 
-#[cfg(feature = "tracing")]
-use std::time::Instant;
-
 /// The [Kernel] struct contains the configuration for a Cannon kernel as well as
 /// the [PreimageOracle] and [InstrumentedState] instances that form it.
 #[allow(dead_code)]
@@ -93,7 +91,6 @@ where
             let proof_fmt = self.proof_format.unwrap_or("%d.json.gz".to_string());
             let snapshot_fmt = self.snapshot_format.unwrap_or("%d.json.gz".to_string());
 
-            #[cfg(feature = "tracing")]
             let (info_at, start_step, start) = (
                 create_matcher(self.info_at.as_ref())?,
                 self.ins_state.state.step,
@@ -105,10 +102,9 @@ where
             while !self.ins_state.state.exited {
                 let step = self.ins_state.state.step;
 
-                #[cfg(feature = "tracing")]
                 if info_at.matches(step) {
                     let delta = start.elapsed();
-                    crate::traces::info!(
+                    tracing::info!(
                         target: "cannon::kernel",
                         "[ELAPSED: {}.{:03}s] step: {}, pc: {}, instruction: {:08x}, ips: {}, pages: {}, mem: {}",
                         delta.as_secs(),
@@ -123,26 +119,26 @@ where
                 }
 
                 if stop_at.matches(step) {
-                    crate::traces::info!(target: "cannon::kernel", "Stopping at step {}", step);
+                    tracing::info!(target: "cannon::kernel", "Stopping at step {}", step);
                     break;
                 }
 
                 if snapshot_at.matches(step) {
-                    crate::traces::info!(target: "cannon::kernel", "Writing snapshot at step {}", step);
+                    tracing::info!(target: "cannon::kernel", "Writing snapshot at step {}", step);
                     let ser_state = serde_json::to_vec(&self.ins_state.state).unwrap();
                     let snap_path = snapshot_fmt.replace("%d", &format!("{}", step));
                     io_tasks.push(tokio::task::spawn(async move {
                         let gz_state = compress_bytes(&ser_state)?;
                         let mut writer = BufWriter::new(File::create(snap_path)?);
                         writer.write_all(&gz_state)?;
-                        crate::traces::info!(target: "cannon::kernel", "Wrote snapshot at step {} successfully.", step);
+                        tracing::info!(target: "cannon::kernel", "Wrote snapshot at step {} successfully.", step);
 
                         Ok(())
                     }));
                 }
 
                 if proof_at.matches(step) {
-                    crate::traces::info!(target: "cannon::kernel", "Writing proof at step {}", step);
+                    tracing::info!(target: "cannon::kernel", "Writing proof at step {}", step);
 
                     let prestate_hash = state_hash(self.ins_state.state.encode_witness()?);
                     let step_witness = self
@@ -173,7 +169,7 @@ where
                         let mut writer = BufWriter::new(File::create(proof_path)?);
                         writer.write_all(ser_proof.as_bytes())?;
 
-                        crate::traces::info!(target: "cannon::kernel", "Wrote proof at step {} successfully.", step);
+                        tracing::info!(target: "cannon::kernel", "Wrote proof at step {} successfully.", step);
 
                         Ok(())
                     }));
@@ -203,7 +199,7 @@ where
             // Output the final state
             if let Some(output) = &self.output {
                 if !output.is_empty() {
-                    crate::traces::info!(target: "cannon::kernel", "Writing final state to {}", output);
+                    tracing::info!(target: "cannon::kernel", "Writing final state to {}", output);
                     let mut writer = BufWriter::new(File::create(output)?);
 
                     let ser_state = &serde_json::to_vec(&self.ins_state.state)?;
@@ -215,7 +211,7 @@ where
                 println!("{:?}", &self.ins_state.state);
             }
 
-            crate::traces::info!(target: "cannon::kernel", "Kernel exiting...");
+            tracing::info!(target: "cannon::kernel", "Kernel exiting...");
 
             // Wait for all of the i/o tasks to finish.
             for task in io_tasks {

Diff for: crates/cannon/src/kernel.rs

@@ -16,5 +16,3 @@ mod types;
 pub use types::Proof;
 
 mod utils;
-
-mod traces;

Diff for: crates/cannon/src/lib.rs

@@ -37,7 +37,7 @@ impl ProcessPreimageOracle {
     ) -> Result<(Self, Option<Child>)> {
         let cmd_str = cmd.display().to_string();
         let child = (!cmd_str.is_empty()).then(|| {
-            crate::info!(
+            tracing::info!(
                 "Starting preimage server process: {} {:?}",
                 cmd.display(),
                 args
@@ -54,7 +54,7 @@ impl ProcessPreimageOracle {
                     pipe_files.hint_write.as_raw_fd()
                 ];
 
-                crate::traces::info!(target: "cannon::preimage::server", "Starting preimage server process: {:?} with fds {:?}", args, fds);
+                tracing::info!(target: "cannon::preimage::server", "Starting preimage server process: {:?} with fds {:?}", args, fds);
 
                 command
                     .args(args)

Diff for: crates/cannon/src/proc_oracle.rs

@@ -13,9 +13,11 @@ serde.workspace = true
 serde_json.workspace = true
 anyhow.workspace = true
 tokio.workspace = true
+kona-preimage.workspace = true
+kona-common.workspace = true
+tracing.workspace = true
 
 # external
-kona-preimage = { git = "https://github.com/ethereum-optimism/kona" }
 async-trait = "0.1.81"
 alloy-sol-types = "0.7.7"
 once_cell = "1.19.0"
@@ -26,22 +28,19 @@ rustc-hash = "2.0.0"
 xkcp-rs = { git = "https://github.com/DaniPopes/xkcp-rs", rev = "40447a5" }
 keccak256-aarch64-simd = { git = "https://github.com/clabby/keccak256-aarch64", rev = "5c4c8f8", optional = true }
 
-# tracing
-tracing = { version = "0.1.40", optional = true }
-
 # evm
 revm = { version = "12.1.0", optional = true }
 
 [dev-dependencies]
 rand = "0.8.5"
-criterion = { version = "0.5.1", features = ["html_reports"] }
+criterion = { version = "0.5.1", features = ["html_reports", "async_tokio"] }
 pprof = { version = "0.13.0", features = ["criterion", "flamegraph", "frame-pointer"] } 
 proptest = "1.4.0"
 
 [features]
-tracing = ["dep:tracing"]
 evm = ["dep:revm"]
 simd-keccak = ["dep:keccak256-aarch64-simd"]
+test-utils = []
 
 [[bench]]
 name = "memory"