pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-06-19 05:21:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Substrate companion] Update beefy-merkle-tree dep to merkle-tree (#6528)

Browse Source 
* Update beefy-merkle-tree dep to merkle-tree

* update merkle-tree to binary-merkle-tree

* update substrate refs

---------

Co-authored-by: Adrian Catangiu <adrian@parity.io>
This commit is contained in:
Davirain
2023-02-03 03:33:13 +08:00
committed by GitHub
parent d563a18a3f
commit cf3c838e05
3 changed files with 192 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files
polkadot/Cargo.lock
Generated
+189 -187
View File
File diff suppressed because it is too large Load Diff
polkadot/runtime/rococo/Cargo.toml
+1 -1
View File
@@ -17,7 +17,7 @@ smallvec = "1.8.0"
authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
beefy-primitives = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, package = "sp-beefy" } beefy-primitives = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, package = "sp-beefy" }
beefy-merkle-tree = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } binary-merkle-tree = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
rococo-runtime-constants = { package = "rococo-runtime-constants", path = "./constants", default-features = false } rococo-runtime-constants = { package = "rococo-runtime-constants", path = "./constants", default-features = false }
sp-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } sp-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
polkadot/runtime/rococo/src/lib.rs
+2 -2
View File
@@ -1282,7 +1282,7 @@ impl BeefyDataProvider<H256> for ParasProvider {
.filter_map(|id| Paras::para_head(&id).map(|head| (id.into(), head.0))) .filter_map(|id| Paras::para_head(&id).map(|head| (id.into(), head.0)))
.collect(); .collect();
para_heads.sort(); para_heads.sort();
beefy_merkle_tree::merkle_root::<<Runtime as pallet_mmr::Config>::Hashing, _>( binary_merkle_tree::merkle_root::<<Runtime as pallet_mmr::Config>::Hashing, _>(
para_heads.into_iter().map(|pair| pair.encode()), para_heads.into_iter().map(|pair| pair.encode()),
) )
.into() .into()
@@ -1929,7 +1929,7 @@ sp_api::impl_runtime_apis! {
} }
} }
impl beefy_merkle_tree::BeefyMmrApi<Block, Hash> for RuntimeApi { impl pallet_beefy_mmr::BeefyMmrApi<Block, Hash> for RuntimeApi {
fn authority_set_proof() -> beefy_primitives::mmr::BeefyAuthoritySet<Hash> { fn authority_set_proof() -> beefy_primitives::mmr::BeefyAuthoritySet<Hash> {
MmrLeaf::authority_set_proof() MmrLeaf::authority_set_proof()
} }