ckb-merkle-mountain-range -> 0.5.2 (paritytech#2911)

serban300 · Apr 2, 2024 · 044fe8a · 044fe8a
1 parent aecae6f
commit 044fe8a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/modules/beefy/Cargo.toml b/modules/beefy/Cargo.toml
@@ -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"

diff --git a/modules/beefy/src/mock_chain.rs b/modules/beefy/src/mock_chain.rs
@@ -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)))
 	}
 }