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

Move beefy-merkle-tree to utils/binary-merkle-tree and make it generic #13076

Merged
paritytech-processbot merged 8 commits into from
Feb 2, 2023
Merged

Move beefy-merkle-tree to utils/binary-merkle-tree and make it generic #13076

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8385bed
move BeefyMmrApi to pallet-beefy-mmr
DaviRain-Su Jan 5, 2023
3f12597
fix test_utils use pallet-beefy-mmr BeefyMmrApi
DaviRain-Su Jan 5, 2023
5daf41a
Move beefy-merkle-tree to utils and Rename to Merkle-tree
DaviRain-Su Jan 9, 2023
3f89795
fix fmt and test
DaviRain-Su Jan 9, 2023
aa626dc
Update merkle-tree to binary-merkle-tree and Remove Keccak256 mod fro…
DaviRain-Su Jan 10, 2023
1932e4a
change merkle-tree name to binary-merkle-tree
DaviRain-Su Jan 19, 2023
7af6cdf
mirr fix
DaviRain-Su Jan 28, 2023
9be08e3
Merge branch 'master' into move-beefy-mmr-primitives-runtime-api
DaviRain-Su Jan 28, 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
Prev Previous commit
Next Next commit
fix fmt and test
  • Loading branch information
@DaviRain-Su
DaviRain-Su committed Jan 12, 2023
commit 3f8979525bde957359cf21d73751fa40aaaaa0d0
7 changes: 3 additions & 4 deletions frame/beefy-mmr/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,10 +200,9 @@ impl<T: Config> Pallet<T> {
.map(T::BeefyAuthorityToMerkleLeaf::convert)
.collect::<Vec<_>>();
let len = beefy_addresses.len() as u32;
let root = merkle_tree::merkle_root::<<T as pallet_mmr::Config>::Hashing, _>(
beefy_addresses,
)
.into();
let root =
merkle_tree::merkle_root::<<T as pallet_mmr::Config>::Hashing, _>(beefy_addresses)
.into();
BeefyAuthoritySet { id, len, root }
}
}
Expand Down
2 changes: 1 addition & 1 deletion frame/beefy-mmr/src/mock.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ impl BeefyDataProvider<Vec<u8>> for DummyDataProvider {
fn extra_data() -> Vec<u8> {
let mut col = vec![(15, vec![1, 2, 3]), (5, vec![4, 5, 6])];
col.sort();
beefy_merkle_tree::merkle_root::<<Test as pallet_mmr::Config>::Hashing, _>(
merkle_tree::merkle_root::<<Test as pallet_mmr::Config>::Hashing, _>(
col.into_iter().map(|pair| pair.encode()),
)
.as_ref()
Expand Down