From a1794382eca707b50501b6b463e4ecc56b88c627 Mon Sep 17 00:00:00 2001 From: jfldde <168934971+jfldde@users.noreply.github.com> Date: Mon, 7 Oct 2024 12:40:47 +0100 Subject: [PATCH 1/3] Remove unused dependency --- Cargo.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 2e11656..e176710 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -23,7 +23,6 @@ jsonrpsee = { version = "0.24.2", features = ["http-client", "ws-client"] } # Citrea dependencies bitcoin-da = { git = "https://github.com/chainwayxyz/citrea", rev = "82bf52d", features = ["native"] } -citrea-primitives = { git = "https://github.com/chainwayxyz/citrea", rev = "82bf52d" } citrea-sequencer = { git = "https://github.com/chainwayxyz/citrea", rev = "82bf52d" } sov-ledger-rpc = { git = "https://github.com/chainwayxyz/citrea", rev = "82bf52d", features = ["client"] } sov-rollup-interface = { git = "https://github.com/chainwayxyz/citrea", rev = "82bf52d" } From 427462840ba2287385ce8d9ea43731a1c23b2e0e Mon Sep 17 00:00:00 2001 From: jfldde <168934971+jfldde@users.noreply.github.com> Date: Mon, 7 Oct 2024 12:41:22 +0100 Subject: [PATCH 2/3] Log result when initialization failure --- src/test_case.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test_case.rs b/src/test_case.rs index 2bd0932..7123c2d 100644 --- a/src/test_case.rs +++ b/src/test_case.rs @@ -81,7 +81,7 @@ impl TestCaseRunner { let f = framework .as_mut() - .expect("Framework not correctly initialized"); + .with_context(|| format!("Framework not correctly initialized, result {result:?}"))?; if let Err(_) | Ok(Err(_)) = result { if let Err(e) = f.dump_log() { From c9c0eee3be8935dd3fc53f971afc23686acde4ee Mon Sep 17 00:00:00 2001 From: jfldde <168934971+jfldde@users.noreply.github.com> Date: Mon, 7 Oct 2024 15:14:26 +0100 Subject: [PATCH 3/3] Pin bitcoin docker image --- src/config/bitcoin.rs | 2 +- src/config/docker.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/config/bitcoin.rs b/src/config/bitcoin.rs index 447bad3..2337d77 100644 --- a/src/config/bitcoin.rs +++ b/src/config/bitcoin.rs @@ -29,7 +29,7 @@ impl Default for BitcoinConfig { .into_path(), extra_args: Vec::new(), network: Network::Regtest, - docker_image: Some("bitcoin/bitcoin:latest".to_string()), + docker_image: Some("bitcoin/bitcoin:27.1".to_string()), env: Vec::new(), idx: 0, } diff --git a/src/config/docker.rs b/src/config/docker.rs index 1e5c0ab..8212703 100644 --- a/src/config/docker.rs +++ b/src/config/docker.rs @@ -34,7 +34,7 @@ impl From<&BitcoinConfig> for DockerConfig { image: v .docker_image .clone() - .unwrap_or_else(|| "bitcoin/bitcoin:latest".to_string()), + .unwrap_or_else(|| "bitcoin/bitcoin:27.1".to_string()), cmd: args, log_path: v.data_dir.join("regtest").join("debug.log"), volume: VolumeConfig {