Merge branch 'main' into tracing

Cargo.toml

@@ -19,7 +19,6 @@ serde_json = { version = "1.0", default-features = false }
 tempfile = "3.8"
 tokio = { version = "1.39", features = ["full"] }
 toml = "0.8.0"
-which = "6.0.1"
 tracing = { version = "0.1.40", default-features = false }
 
 # Citrea dependencies

src/config/mod.rs

@@ -16,7 +16,7 @@ pub use test_case::{TestCaseConfig, TestCaseEnv};
 pub use utils::config_to_file;
 
 pub use crate::citrea_config::{
-    batch_prover::BatchProverConfig,
+    batch_prover::{BatchProverConfig, ProverGuestRunConfig},
     bitcoin::BitcoinServiceConfig,
     light_client_prover::LightClientProverConfig,
     rollup::{FullNodeConfig, RollupPublicKeys, RpcConfig, RunnerConfig, StorageConfig},

src/node.rs

@@ -91,7 +91,7 @@ impl<C: Config> Node<C> {
     }
 
     fn spawn(config: &C) -> Result<SpawnOutput> {
-        let citrea = get_citrea_path();
+        let citrea = get_citrea_path()?;
         let dir = config.dir();
 
         let kind = C::node_kind();

src/utils.rs

@@ -7,9 +7,9 @@ use std::{
     path::{Path, PathBuf},
 };
 
+use anyhow::anyhow;
 use rand::{distributions::Alphanumeric, thread_rng, Rng};
 use tracing::debug;
-use which::which;
 
 use super::Result;
 
@@ -27,9 +27,11 @@ pub fn get_workspace_root() -> PathBuf {
         .to_path_buf()
 }
 
-/// Get citrea path from CITREA env or resolves to PATH using which.
-pub fn get_citrea_path() -> PathBuf {
-    std::env::var("CITREA").map_or_else(|_| which("citrea").unwrap(), PathBuf::from)
+/// Get citrea path from CITREA_E2E_TEST_BINARY env
+pub fn get_citrea_path() -> Result<PathBuf> {
+    std::env::var("CITREA_E2E_TEST_BINARY")
+        .map(PathBuf::from)
+        .map_err(|_| anyhow!("CITREA_E2E_TEST_BINARY is not set. Cannot resolve citrea path"))
 }
 
 pub fn get_stdout_path(dir: &Path) -> PathBuf {