Skip to content

Commit

Permalink
Merge branch 'main' into ceyhun/bridge_backend_support
Browse files Browse the repository at this point in the history
  • Loading branch information
ceyhunsen committed Oct 7, 2024
2 parents b29cf19 + c9c0eee commit 179684a
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 4 deletions.
1 change: 0 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand Down
2 changes: 1 addition & 1 deletion src/config/bitcoin.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
}
Expand Down
2 changes: 1 addition & 1 deletion src/config/docker.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion src/test_case.rs
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ impl<T: TestCase> TestCaseRunner<T> {

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() {
Expand Down

0 comments on commit 179684a

Please sign in to comment.