Resolve to CITREA_E2E_TEST_BINARY instead of which

Author: jfldde

Cargo.toml

@@ -11,16 +11,15 @@ bitcoin = { version = "0.32.2", features = ["serde", "rand"] }
 bitcoincore-rpc = { version = "0.18.0" }
 bollard = { version = "0.17.1" }
 futures = "0.3"
-hex = { version = "0.4.3", default-features = false, features = ["serde"] }
-jsonrpsee = { version = "0.24.2", features = ["http-client", "ws-client"] }
 log = "0.4"
 rand = "0.8"
 serde = { version = "1.0.192", default-features = false, features = ["alloc", "derive"] }
 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"
+jsonrpsee = { version = "0.24.2", features = ["http-client", "ws-client"] }
+hex = { version = "0.4.3", default-features = false, features = ["serde"] }
 
 # Citrea dependencies
 sov-ledger-rpc = { git = "https://github.com/chainwayxyz/citrea", rev = "82bf52d", default-features = false, features = ["client"] }

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,8 +7,8 @@ use std::{
     path::{Path, PathBuf},
 };
 
+use anyhow::anyhow;
 use rand::{distributions::Alphanumeric, thread_rng, Rng};
-use which::which;
 
 use super::Result;
 
@@ -26,9 +26,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 {