Skip to content
This repository has been archived by the owner on Nov 15, 2023. It is now read-only.

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

Merged
merged 11 commits into from
Feb 2, 2023
Merged

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

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
57d36ca
Update beefy-merkle-tree dep to merkle-tree
DaviRain-Su Jan 10, 2023
360921e
update merkle-tree to binary-merkle-tree
DaviRain-Su Jan 10, 2023
d04c5a9
Merge branch 'master' of github.com:paritytech/polkadot into relate-1…
acatangiu Feb 2, 2023
4c4db71
update substrate refs
acatangiu Feb 2, 2023
105af1e
cargo update -p sp-io
ggwpez Feb 2, 2023
c193f87
Fix bench
ggwpez Feb 2, 2023
5dea522
Fix
ggwpez Feb 2, 2023
6b194f7
Propagate features
ggwpez Feb 2, 2023
03de41b
Use master Cargo.lock
ggwpez Feb 2, 2023
1ada749
Merge remote-tracking branch 'origin/master' into relate-13076
ggwpez Feb 2, 2023
a214716
cargo update -p sp-io
ggwpez Feb 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion runtime/rococo/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
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-merkle-tree = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
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 }
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 }
Expand Down
4 changes: 2 additions & 2 deletions runtime/rococo/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1282,7 +1282,7 @@ impl BeefyDataProvider<H256> for ParasProvider {
.filter_map(|id| Paras::para_head(&id).map(|head| (id.into(), head.0)))
.collect();
para_heads.sort();
beefy_merkle_tree::merkle_root::<<Runtime as pallet_mmr::Config>::Hashing, _>(
merkle_tree::merkle_root::<<Runtime as pallet_mmr::Config>::Hashing, _>(
para_heads.into_iter().map(|pair| pair.encode()),
)
.into()
Expand Down Expand Up @@ -1918,7 +1918,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> {
MmrLeaf::authority_set_proof()
}
Expand Down