Qortal/pirate-librustzcash
3
0
Fork 0
mirror of https://github.com/Qortal/pirate-librustzcash.git synced 2025-02-01 08:12:14 +00:00
Code Issues Projects Releases Wiki Activity

Use iterators in construct_mmr_tree

Browse Source
This commit is contained in:
Jack Grigg 2019-12-05 11:06:26 +00:00
parent 9ea0427678
commit fb8c73c950
No known key found for this signature in database
GPG Key ID: 9E8255172BBF9898
1 changed files with 10 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
librustzcash/src/rustzcash.rs
View File

@ -1199,31 +1199,17 @@ fn construct_mmr_tree(
)
};
let mut peaks = Vec::new();
for i in 0..p_len {
peaks.push((
indices[i],
match MMREntry::from_bytes(cbranch, &nodes[i][..]) {
Ok(entry) => entry,
_ => {
return Err("Invalid encoding");
} // error
let mut peaks: Vec<_> = indices
.iter()
.zip(nodes.iter())
.map(
|(index, node)| match MMREntry::from_bytes(cbranch, &node[..]) {
Ok(entry) => Ok((*index, entry)),
Err(_) => Err("Invalid encoding"),
},
));
}
let mut extra = Vec::new();
for i in p_len..(p_len + e_len) {
extra.push((
indices[i],
match MMREntry::from_bytes(cbranch, &nodes[i][..]) {
Ok(entry) => entry,
_ => {
return Err("Invalid encoding");
} // error
},
));
}
)
.collect::<Result<_, _>>()?;
let extra = peaks.split_off(p_len);
Ok(MMRTree::new(t_len, peaks, extra))
}