mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-05-31 15:41:02 +00:00
ckb-merkle-mountain-range -> 0.5.2 (#2911)
This commit is contained in:
committed by
Bastian Köcher
parent
8f26000e6a
commit
3f1a9279a6
@@ -32,7 +32,7 @@ sp-std = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master"
|
|||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
sp-consensus-beefy = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master" }
|
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-beefy-mmr = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master" }
|
||||||
pallet-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"
|
rand = "0.8.5"
|
||||||
|
|||||||
@@ -290,10 +290,10 @@ pub struct BridgedMmrHashMerge;
|
|||||||
impl mmr_lib::Merge for BridgedMmrHashMerge {
|
impl mmr_lib::Merge for BridgedMmrHashMerge {
|
||||||
type Item = TestBridgedMmrNode;
|
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();
|
let mut concat = left.hash().as_ref().to_vec();
|
||||||
concat.extend_from_slice(right.hash().as_ref());
|
concat.extend_from_slice(right.hash().as_ref());
|
||||||
|
|
||||||
TestBridgedMmrNode::Hash(TestBridgedMmrHashing::hash(&concat))
|
Ok(TestBridgedMmrNode::Hash(TestBridgedMmrHashing::hash(&concat)))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user