Skip to content

Commit

Permalink
ckb-merkle-mountain-range -> 0.5.2 (paritytech#2911)
Browse files Browse the repository at this point in the history
  • Loading branch information
serban300 committed Apr 10, 2024
1 parent a05089a commit 53fa542
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion bridges/modules/beefy/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ sp-std = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master"

[dev-dependencies]
sp-consensus-beefy = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master" }
mmr-lib = { package = "ckb-merkle-mountain-range", version = "0.3.2" }
mmr-lib = { package = "ckb-merkle-mountain-range", version = "0.5.2" }
pallet-beefy-mmr = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master" }
pallet-mmr = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master" }
rand = "0.8.5"
Expand Down
4 changes: 2 additions & 2 deletions bridges/modules/beefy/src/mock_chain.rs
Original file line number Diff line number Diff line change
Expand Up @@ -290,10 +290,10 @@ pub struct BridgedMmrHashMerge;
impl mmr_lib::Merge for BridgedMmrHashMerge {
type Item = TestBridgedMmrNode;

fn merge(left: &Self::Item, right: &Self::Item) -> Self::Item {
fn merge(left: &Self::Item, right: &Self::Item) -> mmr_lib::Result<Self::Item> {
let mut concat = left.hash().as_ref().to_vec();
concat.extend_from_slice(right.hash().as_ref());

TestBridgedMmrNode::Hash(TestBridgedMmrHashing::hash(&concat))
Ok(TestBridgedMmrNode::Hash(TestBridgedMmrHashing::hash(&concat)))
}
}

0 comments on commit 53fa542

Please sign in to comment.