Skip to content

Commit 7ad264a

Browse files
authored
Merge branch 'bitcoindevkit:master' into test/chain-basic-cases
2 parents 8bda75d + 721eb54 commit 7ad264a

File tree

4 files changed

+4
-2
lines changed

4 files changed

+4
-2
lines changed

.github/workflows/cont_integration.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ jobs:
5151
cargo update -p tokio-util --precise "0.7.11"
5252
cargo update -p indexmap --precise "2.5.0"
5353
cargo update -p security-framework-sys --precise "2.11.1"
54+
cargo update -p [email protected] --precise "0.23.17"
5455
- name: Build
5556
run: cargo build --workspace --exclude 'example_*' ${{ matrix.features }}
5657
- name: Test

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ cargo update -p tokio --precise "1.38.1"
7878
cargo update -p tokio-util --precise "0.7.11"
7979
cargo update -p indexmap --precise "2.5.0"
8080
cargo update -p security-framework-sys --precise "2.11.1"
81+
cargo update -p [email protected] --precise "0.23.17"
8182
```
8283

8384
## License

crates/chain/src/local_chain.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ impl LocalChain {
174174
pub fn apply_update(&mut self, update: CheckPoint) -> Result<ChangeSet, CannotConnectError> {
175175
let (new_tip, changeset) = merge_chains(self.tip.clone(), update)?;
176176
self.tip = new_tip;
177-
self._check_changeset_is_applied(&changeset);
177+
debug_assert!(self._check_changeset_is_applied(&changeset));
178178
Ok(changeset)
179179
}
180180

crates/core/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ readme = "README.md"
1313
[dependencies]
1414
bitcoin = { version = "0.32", default-features = false }
1515
serde = { version = "1", optional = true, features = ["derive", "rc"] }
16-
hashbrown = { version = "0.9.1", optional = true }
16+
hashbrown = { version = "0.14.5", optional = true, default-features = false, features = ["ahash", "inline-more"] }
1717

1818
[features]
1919
default = ["std"]

0 commit comments

Comments
 (0)