Skip to content

Commit 179684a

Browse files
committed
Merge branch 'main' into ceyhun/bridge_backend_support
2 parents b29cf19 + c9c0eee commit 179684a

File tree

4 files changed

+3
-4
lines changed

4 files changed

+3
-4
lines changed

Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ jsonrpsee = { version = "0.24.2", features = ["http-client", "ws-client"] }
2323

2424
# Citrea dependencies
2525
bitcoin-da = { git = "https://github.com/chainwayxyz/citrea", rev = "82bf52d", features = ["native"] }
26-
citrea-primitives = { git = "https://github.com/chainwayxyz/citrea", rev = "82bf52d" }
2726
citrea-sequencer = { git = "https://github.com/chainwayxyz/citrea", rev = "82bf52d" }
2827
sov-ledger-rpc = { git = "https://github.com/chainwayxyz/citrea", rev = "82bf52d", features = ["client"] }
2928
sov-rollup-interface = { git = "https://github.com/chainwayxyz/citrea", rev = "82bf52d" }

src/config/bitcoin.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ impl Default for BitcoinConfig {
2929
.into_path(),
3030
extra_args: Vec::new(),
3131
network: Network::Regtest,
32-
docker_image: Some("bitcoin/bitcoin:latest".to_string()),
32+
docker_image: Some("bitcoin/bitcoin:27.1".to_string()),
3333
env: Vec::new(),
3434
idx: 0,
3535
}

src/config/docker.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ impl From<&BitcoinConfig> for DockerConfig {
3434
image: v
3535
.docker_image
3636
.clone()
37-
.unwrap_or_else(|| "bitcoin/bitcoin:latest".to_string()),
37+
.unwrap_or_else(|| "bitcoin/bitcoin:27.1".to_string()),
3838
cmd: args,
3939
log_path: v.data_dir.join("regtest").join("debug.log"),
4040
volume: VolumeConfig {

src/test_case.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ impl<T: TestCase> TestCaseRunner<T> {
8282

8383
let f = framework
8484
.as_mut()
85-
.expect("Framework not correctly initialized");
85+
.with_context(|| format!("Framework not correctly initialized, result {result:?}"))?;
8686

8787
if let Err(_) | Ok(Err(_)) = result {
8888
if let Err(e) = f.dump_log() {

0 commit comments

Comments
 (0)