Skip to content

Commit

Permalink
Merge branch 'bitcoindevkit:master' into test/chain-basic-cases
Browse files Browse the repository at this point in the history
  • Loading branch information
pluveto authored Nov 25, 2024
2 parents 8bda75d + 721eb54 commit 7ad264a
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 2 deletions.
1 change: 1 addition & 0 deletions .github/workflows/cont_integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ jobs:
cargo update -p tokio-util --precise "0.7.11"
cargo update -p indexmap --precise "2.5.0"
cargo update -p security-framework-sys --precise "2.11.1"
cargo update -p [email protected] --precise "0.23.17"
- name: Build
run: cargo build --workspace --exclude 'example_*' ${{ matrix.features }}
- name: Test
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ cargo update -p tokio --precise "1.38.1"
cargo update -p tokio-util --precise "0.7.11"
cargo update -p indexmap --precise "2.5.0"
cargo update -p security-framework-sys --precise "2.11.1"
cargo update -p [email protected] --precise "0.23.17"
```

## License
Expand Down
2 changes: 1 addition & 1 deletion crates/chain/src/local_chain.rs
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ impl LocalChain {
pub fn apply_update(&mut self, update: CheckPoint) -> Result<ChangeSet, CannotConnectError> {
let (new_tip, changeset) = merge_chains(self.tip.clone(), update)?;
self.tip = new_tip;
self._check_changeset_is_applied(&changeset);
debug_assert!(self._check_changeset_is_applied(&changeset));
Ok(changeset)
}

Expand Down
2 changes: 1 addition & 1 deletion crates/core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ readme = "README.md"
[dependencies]
bitcoin = { version = "0.32", default-features = false }
serde = { version = "1", optional = true, features = ["derive", "rc"] }
hashbrown = { version = "0.9.1", optional = true }
hashbrown = { version = "0.14.5", optional = true, default-features = false, features = ["ahash", "inline-more"] }

[features]
default = ["std"]
Expand Down

0 comments on commit 7ad264a

Please sign in to comment.