Core/grin
0
0
Fork 0
mirror of https://github.com/mimblewimble/grin.git synced 2025-02-01 17:01:09 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixup MMR position in n_leaves if invalid

Browse source 
Allows the client to not worry about what position is a valid
MMR size. Associated tests.
This commit is contained in:
Ignotus Peverell 2018-02-20 21:47:10 +00:00
parent 755d0b7902
commit 3b51ffd83c
No known key found for this signature in database
GPG key ID: 99CD25F39F8F8211
1 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
core/src/core/pmmr.rs
View file

@ -661,8 +661,12 @@ pub fn peaks(num: u64) -> Vec<u64> {
peaks peaks
} }
/// The number of leaves nodes in a MMR of the provided size. /// The number of leaves nodes in a MMR of the provided size. Uses peaks to
pub fn n_leaves(sz: u64) -> u64 { /// get the positions of all full binary trees and uses the height of these
pub fn n_leaves(mut sz: u64) -> u64 {
while bintree_postorder_height(sz+1) > 0 {
sz += 1;
}
peaks(sz).iter().map(|n| { peaks(sz).iter().map(|n| {
(1 << bintree_postorder_height(*n)) as u64 (1 << bintree_postorder_height(*n)) as u64
}).sum() }).sum()
@ -1176,4 +1180,17 @@ mod test {
assert_eq!(pl.get_shift(17), Some(11)); assert_eq!(pl.get_shift(17), Some(11));
} }
#[test]
fn n_size_check() {
assert_eq!(n_leaves(1), 1);
assert_eq!(n_leaves(2), 2);
assert_eq!(n_leaves(3), 2);
assert_eq!(n_leaves(4), 3);
assert_eq!(n_leaves(5), 4);
assert_eq!(n_leaves(7), 4);
assert_eq!(n_leaves(8), 5);
assert_eq!(n_leaves(9), 6);
assert_eq!(n_leaves(10), 6);
}
} }