2019-08-20 08:05:14 -07:00
|
|
|
use std::collections::HashMap;
|
|
|
|
|
|
|
|
use crate::{MMRNode, NodeLink, NodeData};
|
|
|
|
|
2019-08-22 07:36:05 -07:00
|
|
|
/// Represents partially loaded tree.
|
|
|
|
///
|
|
|
|
/// Some kind of "view" into the array representation of the MMR tree.
|
|
|
|
/// With only some of the leaves/nodes pre-loaded / pre-generated.
|
|
|
|
/// Exact amount of the loaded data can be calculated by the constructing party,
|
|
|
|
/// depending on the length of the tree and maximum amount of operations that are going
|
|
|
|
/// to happen after construction.
|
2019-08-20 08:05:14 -07:00
|
|
|
#[derive(Default)]
|
2019-08-20 10:07:50 -07:00
|
|
|
pub struct Tree {
|
2019-08-20 08:05:14 -07:00
|
|
|
stored: HashMap<u32, MMRNode>,
|
|
|
|
|
|
|
|
generated: HashMap<u32, MMRNode>,
|
|
|
|
|
|
|
|
// number of persistent(!) tree entries
|
|
|
|
stored_count: u32,
|
|
|
|
|
|
|
|
// number of virtual nodes generated
|
|
|
|
generated_count: u32,
|
|
|
|
}
|
|
|
|
|
2019-08-22 07:36:05 -07:00
|
|
|
/// Result of appending one or several leaves.
|
2019-08-20 10:07:50 -07:00
|
|
|
pub struct AppendTransaction {
|
2019-08-22 07:36:05 -07:00
|
|
|
/// Plain list of nodes that has to be appended to the end of the array representation
|
|
|
|
/// of the tree as the result of append operation.
|
2019-08-20 10:07:50 -07:00
|
|
|
pub appended: Vec<NodeLink>,
|
2019-08-22 07:36:05 -07:00
|
|
|
|
|
|
|
/// New root as a result of the operation (can be generated one).
|
2019-08-20 10:07:50 -07:00
|
|
|
pub new_root: NodeLink,
|
|
|
|
}
|
|
|
|
|
2019-08-22 07:36:05 -07:00
|
|
|
/// Result of truncating one or severl leaves.
|
2019-08-22 04:36:57 -07:00
|
|
|
pub struct DeleteTransaction {
|
2019-08-22 07:36:05 -07:00
|
|
|
/// Number of leaves that should be dropped from the end of the list.
|
2019-08-22 04:36:57 -07:00
|
|
|
pub truncated: u32,
|
2019-08-22 07:36:05 -07:00
|
|
|
/// New root as the result of the operation (can be generated one).
|
2019-08-22 04:36:57 -07:00
|
|
|
pub new_root: NodeLink,
|
|
|
|
}
|
|
|
|
|
2019-08-20 08:05:14 -07:00
|
|
|
impl Tree {
|
|
|
|
fn resolve_link(&self, link: NodeLink) -> IndexedNode {
|
|
|
|
match link {
|
|
|
|
NodeLink::Generated(index) => {
|
|
|
|
// TODO: maybe graceful error?
|
|
|
|
let node = self.generated.get(&index).expect("caller should ensure id generated");
|
|
|
|
IndexedNode {
|
|
|
|
node,
|
|
|
|
link,
|
|
|
|
}
|
|
|
|
},
|
|
|
|
NodeLink::Stored(index) => {
|
|
|
|
// TODO: maybe graceful error?
|
|
|
|
let node = self.stored.get(&index).expect("caller should ensure id stored");
|
|
|
|
IndexedNode {
|
|
|
|
node,
|
|
|
|
link,
|
|
|
|
}
|
|
|
|
},
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
fn push(&mut self, data: MMRNode) -> NodeLink {
|
|
|
|
let idx = self.stored_count;
|
|
|
|
self.stored_count = self.stored_count + 1;
|
|
|
|
self.stored.insert(idx, data);
|
|
|
|
NodeLink::Stored(idx)
|
|
|
|
}
|
|
|
|
|
|
|
|
fn push_generated(&mut self, data: MMRNode) -> NodeLink {
|
|
|
|
let idx = self.generated_count;
|
|
|
|
self.generated_count = self.generated_count + 1;
|
|
|
|
self.generated.insert(idx, data);
|
|
|
|
NodeLink::Generated(idx)
|
|
|
|
}
|
|
|
|
|
2019-08-22 10:35:56 -07:00
|
|
|
/// Populate tree with plain list of the leaves/nodes. Mostly for tests,
|
2019-08-22 07:36:05 -07:00
|
|
|
/// since this `Tree` structure is for partially loaded tree.
|
2019-08-20 08:05:14 -07:00
|
|
|
pub fn populate(loaded: Vec<MMRNode>) -> Self {
|
|
|
|
let mut result = Tree::default();
|
|
|
|
result.stored_count = loaded.len() as u32;
|
|
|
|
for (idx, item) in loaded.into_iter().enumerate() {
|
|
|
|
result.stored.insert(idx as u32, item);
|
|
|
|
}
|
|
|
|
|
|
|
|
result
|
|
|
|
}
|
|
|
|
|
2019-08-22 10:35:56 -07:00
|
|
|
pub fn new(
|
|
|
|
length: u32,
|
|
|
|
stored: Vec<(u32, MMRNode)>,
|
|
|
|
generated: Vec<MMRNode>,
|
|
|
|
) -> Self {
|
|
|
|
let mut result = Tree::default();
|
|
|
|
result.stored_count = length;
|
|
|
|
|
|
|
|
for (idx, node) in stored.into_iter() {
|
|
|
|
result.stored.insert(idx, node);
|
|
|
|
}
|
|
|
|
|
|
|
|
result.generated_count = generated.len() as u32;
|
|
|
|
|
|
|
|
for (idx, node) in generated.into_iter().enumerate() {
|
|
|
|
result.generated.insert(idx as u32, node);
|
|
|
|
}
|
|
|
|
|
|
|
|
result
|
|
|
|
}
|
|
|
|
|
2019-09-02 08:18:33 -07:00
|
|
|
fn get_peaks(&self, root: NodeLink, target: &mut Vec<NodeLink>) {
|
2019-09-02 05:28:51 -07:00
|
|
|
|
2019-08-29 09:34:27 -07:00
|
|
|
let (left_child_link, right_child_link) = {
|
|
|
|
let root = self.resolve_link(root);
|
2019-09-02 05:28:51 -07:00
|
|
|
if root.node.complete() {
|
2019-09-02 08:18:33 -07:00
|
|
|
target.push(root.link);
|
|
|
|
return;
|
2019-09-02 05:28:51 -07:00
|
|
|
}
|
2019-08-29 09:34:27 -07:00
|
|
|
(
|
|
|
|
root.node.left.expect("It would stop before when root is leaf"),
|
|
|
|
root.node.right.expect("It would stop before when root is leaf"),
|
|
|
|
)
|
|
|
|
};
|
|
|
|
|
2019-09-02 08:18:33 -07:00
|
|
|
self.get_peaks(left_child_link, target);
|
|
|
|
self.get_peaks(right_child_link, target);
|
2019-08-29 09:34:27 -07:00
|
|
|
}
|
|
|
|
|
2019-08-22 07:36:05 -07:00
|
|
|
/// Append one leaf to the tree.
|
2019-08-22 04:36:57 -07:00
|
|
|
pub fn append_leaf(&mut self, root: NodeLink, new_leaf: NodeData) -> AppendTransaction {
|
2019-09-02 05:28:51 -07:00
|
|
|
let new_leaf_link = self.push(new_leaf.into());
|
|
|
|
let mut appended = Vec::new();
|
|
|
|
appended.push(new_leaf_link);
|
|
|
|
|
2019-09-02 08:18:33 -07:00
|
|
|
let mut peaks = Vec::new();
|
|
|
|
self.get_peaks(root, &mut peaks);
|
2019-09-02 05:28:51 -07:00
|
|
|
|
|
|
|
let mut merge_stack = Vec::new();
|
|
|
|
merge_stack.push(new_leaf_link);
|
|
|
|
|
|
|
|
while let Some(next_peak) = peaks.pop() {
|
2019-09-02 08:05:20 -07:00
|
|
|
let next_merge = merge_stack.pop().expect("there should be at least one, initial or re-pushed");
|
2019-09-02 05:28:51 -07:00
|
|
|
|
|
|
|
if let Some(stored) = {
|
|
|
|
let peak = self.resolve_link(next_peak);
|
|
|
|
let m = self.resolve_link(next_merge);
|
|
|
|
if peak.node.leaf_count() == m.node.leaf_count() {
|
|
|
|
Some(combine_nodes(peak, m))
|
|
|
|
} else { None }
|
|
|
|
} {
|
|
|
|
let link = self.push(stored);
|
|
|
|
merge_stack.push(link);
|
|
|
|
appended.push(link);
|
|
|
|
continue;
|
2019-09-02 05:11:23 -07:00
|
|
|
}
|
2019-09-02 05:28:51 -07:00
|
|
|
merge_stack.push(next_merge);
|
|
|
|
merge_stack.push(next_peak);
|
|
|
|
}
|
2019-08-20 10:07:50 -07:00
|
|
|
|
2019-09-02 08:05:20 -07:00
|
|
|
let mut new_root = merge_stack.pop().expect("Loop above cannot reduce the merge_stack");
|
2019-09-02 05:28:51 -07:00
|
|
|
while let Some(next_child) = merge_stack.pop() {
|
|
|
|
new_root = self.push_generated(
|
|
|
|
combine_nodes(
|
|
|
|
self.resolve_link(new_root),
|
|
|
|
self.resolve_link(next_child),
|
2019-09-02 05:11:23 -07:00
|
|
|
)
|
2019-09-02 05:28:51 -07:00
|
|
|
)
|
|
|
|
}
|
2019-08-20 10:07:50 -07:00
|
|
|
|
|
|
|
AppendTransaction {
|
|
|
|
new_root,
|
|
|
|
appended,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-08-23 06:25:34 -07:00
|
|
|
#[cfg(test)]
|
|
|
|
fn for_children<F: FnMut(NodeLink, NodeLink)>(&mut self, node: NodeLink, mut f: F) {
|
|
|
|
let (left, right) = {
|
|
|
|
let link = self.resolve_link(node);
|
|
|
|
(
|
|
|
|
link.node.left.expect("test use only (l)"),
|
|
|
|
link.node.right.expect("test use only (r)"),
|
|
|
|
)
|
|
|
|
};
|
|
|
|
f(left, right)
|
|
|
|
}
|
|
|
|
|
2019-08-22 04:36:57 -07:00
|
|
|
fn pop(&mut self) {
|
|
|
|
self.stored.remove(&(self.stored_count-1));
|
|
|
|
self.stored_count = self.stored_count - 1;
|
|
|
|
}
|
|
|
|
|
2019-08-22 07:36:05 -07:00
|
|
|
/// Truncate one leaf from the end of the tree.
|
2019-08-22 04:36:57 -07:00
|
|
|
pub fn truncate_leaf(&mut self, root: NodeLink) -> DeleteTransaction {
|
|
|
|
let root = {
|
2019-08-22 07:36:05 -07:00
|
|
|
let (leaves, root_left_child) = {
|
|
|
|
let n = self.resolve_link(root);
|
|
|
|
(
|
2019-09-02 08:05:20 -07:00
|
|
|
n.node.leaf_count(),
|
2019-08-22 07:36:05 -07:00
|
|
|
n.node.left.expect("Root should have left child while deleting")
|
|
|
|
)
|
|
|
|
};
|
2019-08-22 04:36:57 -07:00
|
|
|
if leaves & 1 != 0 {
|
2019-08-22 07:36:05 -07:00
|
|
|
self.pop();
|
2019-08-22 04:36:57 -07:00
|
|
|
return DeleteTransaction {
|
|
|
|
truncated: 1,
|
2019-08-22 07:36:05 -07:00
|
|
|
new_root: root_left_child,
|
2019-08-22 04:36:57 -07:00
|
|
|
}
|
|
|
|
} else {
|
2019-08-22 07:36:05 -07:00
|
|
|
self.resolve_link(root)
|
2019-08-22 04:36:57 -07:00
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
let mut peaks = vec![root.node.left.expect("Root should have left child")];
|
|
|
|
let mut subtree_root_link = root.node.right.expect("Root should have right child");
|
|
|
|
let mut truncated = 1;
|
|
|
|
|
|
|
|
loop {
|
|
|
|
let left_link = self.resolve_link(subtree_root_link).node.left;
|
|
|
|
if let Some(left_link) = left_link {
|
|
|
|
peaks.push(left_link);
|
|
|
|
subtree_root_link = self
|
|
|
|
.resolve_link(subtree_root_link).node.right
|
|
|
|
.expect("If left exists, right should exist as well");
|
|
|
|
truncated += 1;
|
|
|
|
} else {
|
2019-09-02 08:05:20 -07:00
|
|
|
if root.node.complete() { truncated += 1; }
|
2019-08-22 04:36:57 -07:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-09-02 08:05:20 -07:00
|
|
|
let mut new_root = peaks.drain(0..1).nth(0).expect("At lest 2 elements in peaks");
|
|
|
|
|
|
|
|
for next_peak in peaks.into_iter() {
|
|
|
|
new_root = self.push_generated(
|
2019-08-22 04:36:57 -07:00
|
|
|
combine_nodes(
|
2019-09-02 08:05:20 -07:00
|
|
|
self.resolve_link(new_root),
|
2019-08-22 04:36:57 -07:00
|
|
|
self.resolve_link(next_peak)
|
|
|
|
)
|
2019-09-02 08:05:20 -07:00
|
|
|
);
|
|
|
|
}
|
2019-08-22 04:36:57 -07:00
|
|
|
|
|
|
|
for _ in 0..truncated { self.pop(); }
|
|
|
|
|
|
|
|
DeleteTransaction {
|
|
|
|
new_root,
|
|
|
|
truncated,
|
|
|
|
}
|
|
|
|
}
|
2019-08-22 05:49:43 -07:00
|
|
|
|
2019-08-22 07:36:05 -07:00
|
|
|
/// Length of array representation of the tree.
|
2019-08-22 05:49:43 -07:00
|
|
|
pub fn len(&self) -> u32 {
|
|
|
|
self.stored_count
|
|
|
|
}
|
2019-08-20 08:05:14 -07:00
|
|
|
}
|
|
|
|
|
2019-08-20 10:07:50 -07:00
|
|
|
|
2019-08-20 08:05:14 -07:00
|
|
|
struct IndexedNode<'a> {
|
|
|
|
node: &'a MMRNode,
|
|
|
|
link: NodeLink,
|
|
|
|
}
|
|
|
|
|
|
|
|
fn combine_data(left: &NodeData, right: &NodeData) -> NodeData {
|
|
|
|
NodeData {
|
|
|
|
// TODO: hash children
|
|
|
|
subtree_commitment: [0u8; 32],
|
|
|
|
start_time: left.start_time,
|
|
|
|
end_time: right.end_time,
|
|
|
|
start_target: left.start_target,
|
|
|
|
end_target: right.end_target,
|
|
|
|
start_sapling_root: left.start_sapling_root,
|
|
|
|
end_sapling_root: right.end_sapling_root,
|
|
|
|
|
|
|
|
// TODO: sum work?
|
|
|
|
subtree_total_work: 0,
|
|
|
|
start_height: left.start_height,
|
|
|
|
end_height: right.end_height,
|
|
|
|
shielded_tx: left.shielded_tx + right.shielded_tx,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
fn combine_nodes<'a>(left: IndexedNode<'a>, right: IndexedNode<'a>) -> MMRNode {
|
|
|
|
MMRNode {
|
|
|
|
left: Some(left.link),
|
|
|
|
right: Some(right.link),
|
|
|
|
data: combine_data(&left.node.data, &right.node.data),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#[cfg(test)]
|
|
|
|
mod tests {
|
|
|
|
|
2019-08-20 10:07:50 -07:00
|
|
|
use super::{MMRNode, NodeData, Tree, NodeLink};
|
2019-08-23 06:25:34 -07:00
|
|
|
use quickcheck::TestResult;
|
2019-08-20 08:05:14 -07:00
|
|
|
|
|
|
|
fn leaf(height: u32) -> NodeData {
|
|
|
|
NodeData {
|
|
|
|
subtree_commitment: [0u8; 32],
|
|
|
|
start_time: 0,
|
|
|
|
end_time: 0,
|
|
|
|
start_target: 0,
|
|
|
|
end_target: 0,
|
|
|
|
start_sapling_root: [0u8; 32],
|
|
|
|
end_sapling_root: [0u8; 32],
|
|
|
|
subtree_total_work: 0,
|
|
|
|
start_height: height,
|
|
|
|
end_height: height,
|
|
|
|
shielded_tx: 7,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
fn node(start_height: u32, end_height: u32) -> NodeData {
|
|
|
|
NodeData {
|
|
|
|
subtree_commitment: [0u8; 32],
|
|
|
|
start_time: 0,
|
|
|
|
end_time: 0,
|
|
|
|
start_target: 0,
|
|
|
|
end_target: 0,
|
|
|
|
start_sapling_root: [0u8; 32],
|
|
|
|
end_sapling_root: [0u8; 32],
|
|
|
|
subtree_total_work: 0,
|
|
|
|
start_height: start_height,
|
|
|
|
end_height: end_height,
|
|
|
|
shielded_tx: 7,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-08-23 06:25:34 -07:00
|
|
|
fn initial() -> (NodeLink, Tree) {
|
2019-08-20 08:05:14 -07:00
|
|
|
let node1: MMRNode = leaf(1).into();
|
|
|
|
let node2: MMRNode = leaf(2).into();
|
|
|
|
|
|
|
|
let node3 = MMRNode {
|
|
|
|
data: node(1, 2),
|
|
|
|
left: Some(NodeLink::Stored(0)),
|
|
|
|
right: Some(NodeLink::Stored(1)),
|
|
|
|
};
|
|
|
|
|
2019-08-23 06:25:34 -07:00
|
|
|
(NodeLink::Stored(2), Tree::populate(vec![node1, node2, node3]))
|
2019-08-20 08:05:14 -07:00
|
|
|
}
|
|
|
|
|
2019-08-22 04:36:57 -07:00
|
|
|
// returns tree with specified number of leafs and it's root
|
|
|
|
fn generated(length: u32) -> (Tree, NodeLink) {
|
2019-08-23 06:25:34 -07:00
|
|
|
assert!(length >= 3);
|
|
|
|
let (mut root, mut tree) = initial();
|
2019-08-22 04:36:57 -07:00
|
|
|
for i in 2..length {
|
|
|
|
root = tree.append_leaf(root, leaf(i+1).into()).new_root;
|
|
|
|
}
|
|
|
|
|
|
|
|
(tree, root)
|
|
|
|
}
|
|
|
|
|
2019-08-20 08:05:14 -07:00
|
|
|
#[test]
|
|
|
|
fn discrete_append() {
|
2019-08-23 06:25:34 -07:00
|
|
|
let (root, mut tree) = initial();
|
|
|
|
|
|
|
|
// ** APPEND 3 **
|
|
|
|
let append_tx = tree.append_leaf(root, leaf(3));
|
2019-08-20 08:05:14 -07:00
|
|
|
let new_root_link = append_tx.new_root;
|
|
|
|
let new_root = tree.resolve_link(new_root_link).node;
|
|
|
|
|
|
|
|
// initial tree: (2)
|
|
|
|
// / \
|
|
|
|
// (0) (1)
|
|
|
|
//
|
|
|
|
// new tree:
|
|
|
|
// (4g)
|
|
|
|
// / \
|
|
|
|
// (2) \
|
|
|
|
// / \ \
|
|
|
|
// (0) (1) (3)
|
|
|
|
//
|
|
|
|
// so only (3) is added as real leaf
|
|
|
|
// while new root, (4g) is generated one
|
|
|
|
assert_eq!(new_root.data.end_height, 3);
|
|
|
|
assert_eq!(append_tx.appended.len(), 1);
|
|
|
|
|
2019-08-23 06:25:34 -07:00
|
|
|
// ** APPEND 4 **
|
2019-08-22 04:36:57 -07:00
|
|
|
let append_tx = tree.append_leaf(new_root_link, leaf(4));
|
2019-08-20 08:05:14 -07:00
|
|
|
let new_root_link = append_tx.new_root;
|
|
|
|
let new_root = tree.resolve_link(new_root_link).node;
|
|
|
|
|
|
|
|
// intermediate tree:
|
|
|
|
// (4g)
|
|
|
|
// / \
|
|
|
|
// (2) \
|
|
|
|
// / \ \
|
|
|
|
// (0) (1) (3)
|
|
|
|
//
|
|
|
|
// new tree:
|
|
|
|
// ( 6 )
|
|
|
|
// / \
|
|
|
|
// (2) (5)
|
|
|
|
// / \ / \
|
|
|
|
// (0) (1) (3) (4)
|
|
|
|
//
|
|
|
|
// so (4), (5), (6) are added as real leaves
|
|
|
|
// and new root, (6) is stored one
|
|
|
|
assert_eq!(new_root.data.end_height, 4);
|
|
|
|
assert_eq!(append_tx.appended.len(), 3);
|
2019-08-23 06:25:34 -07:00
|
|
|
assert_matches!(new_root_link, NodeLink::Stored(6));
|
|
|
|
|
|
|
|
// ** APPEND 5 **
|
2019-08-20 08:05:14 -07:00
|
|
|
|
2019-08-22 04:36:57 -07:00
|
|
|
let append_tx = tree.append_leaf(new_root_link, leaf(5));
|
2019-08-20 08:05:14 -07:00
|
|
|
let new_root_link = append_tx.new_root;
|
|
|
|
let new_root = tree.resolve_link(new_root_link).node;
|
|
|
|
|
|
|
|
// intermediate tree:
|
|
|
|
// ( 6 )
|
|
|
|
// / \
|
|
|
|
// (2) (5)
|
|
|
|
// / \ / \
|
|
|
|
// (0) (1) (3) (4)
|
|
|
|
//
|
|
|
|
// new tree:
|
|
|
|
// ( 8g )
|
|
|
|
// / \
|
|
|
|
// ( 6 ) \
|
|
|
|
// / \ \
|
|
|
|
// (2) (5) \
|
|
|
|
// / \ / \ \
|
|
|
|
// (0) (1) (3) (4) (7)
|
|
|
|
//
|
|
|
|
// so (7) is added as real leaf
|
|
|
|
// and new root, (8g) is generated one
|
|
|
|
assert_eq!(new_root.data.end_height, 5);
|
|
|
|
assert_eq!(append_tx.appended.len(), 1);
|
2019-08-23 06:25:34 -07:00
|
|
|
assert_matches!(new_root_link, NodeLink::Generated(_));
|
|
|
|
tree.for_children(new_root_link, |l, r| {
|
|
|
|
assert_matches!(l, NodeLink::Stored(6));
|
|
|
|
assert_matches!(r, NodeLink::Stored(7));
|
|
|
|
});
|
|
|
|
|
|
|
|
// *** APPEND #6 ***
|
|
|
|
let append_tx = tree.append_leaf(new_root_link, leaf(6));
|
|
|
|
let new_root_link = append_tx.new_root;
|
|
|
|
let new_root = tree.resolve_link(new_root_link).node;
|
|
|
|
|
|
|
|
// intermediate tree:
|
|
|
|
// ( 8g )
|
|
|
|
// / \
|
|
|
|
// ( 6 ) \
|
|
|
|
// / \ \
|
|
|
|
// (2) (5) \
|
|
|
|
// / \ / \ \
|
|
|
|
// (0) (1) (3) (4) (7)
|
|
|
|
//
|
|
|
|
// new tree:
|
|
|
|
// (---8g---)
|
|
|
|
// / \
|
|
|
|
// ( 6 ) \
|
|
|
|
// / \ \
|
|
|
|
// (2) (5) (9)
|
|
|
|
// / \ / \ / \
|
|
|
|
// (0) (1) (3) (4) (7) (8)
|
|
|
|
//
|
|
|
|
// so (7) is added as real leaf
|
|
|
|
// and new root, (8g) is generated one
|
|
|
|
assert_eq!(new_root.data.end_height, 6);
|
|
|
|
assert_eq!(append_tx.appended.len(), 2);
|
|
|
|
assert_matches!(new_root_link, NodeLink::Generated(_));
|
|
|
|
tree.for_children(new_root_link, |l, r| {
|
|
|
|
assert_matches!(l, NodeLink::Stored(6));
|
|
|
|
assert_matches!(r, NodeLink::Stored(9));
|
|
|
|
});
|
|
|
|
|
|
|
|
// *** APPEND #7 ***
|
|
|
|
|
|
|
|
let append_tx = tree.append_leaf(new_root_link, leaf(7));
|
|
|
|
let new_root_link = append_tx.new_root;
|
|
|
|
let new_root = tree.resolve_link(new_root_link).node;
|
|
|
|
|
|
|
|
// intermediate tree:
|
|
|
|
// (---8g---)
|
|
|
|
// / \
|
|
|
|
// ( 6 ) \
|
|
|
|
// / \ \
|
|
|
|
// (2) (5) (9)
|
|
|
|
// / \ / \ / \
|
|
|
|
// (0) (1) (3) (4) (7) (8)
|
|
|
|
//
|
|
|
|
// new tree:
|
|
|
|
// (---12g--)
|
|
|
|
// / \
|
|
|
|
// (---11g---) \
|
|
|
|
// / \ \
|
|
|
|
// ( 6 ) \ \
|
|
|
|
// / \ \ \
|
|
|
|
// (2) (5) (9) \
|
|
|
|
// / \ / \ / \ \
|
|
|
|
// (0) (1) (3) (4) (7) (8) (10)
|
|
|
|
//
|
|
|
|
// so (7) is added as real leaf
|
|
|
|
// and new root, (8g) is generated one
|
|
|
|
assert_eq!(new_root.data.end_height, 7);
|
|
|
|
assert_eq!(append_tx.appended.len(), 1);
|
|
|
|
assert_matches!(new_root_link, NodeLink::Generated(_));
|
|
|
|
tree.for_children(new_root_link, |l, r| {
|
|
|
|
assert_matches!(l, NodeLink::Generated(_));
|
|
|
|
assert_matches!(r, NodeLink::Stored(10));
|
|
|
|
});
|
2019-08-20 08:05:14 -07:00
|
|
|
}
|
|
|
|
|
2019-08-22 04:36:57 -07:00
|
|
|
#[test]
|
|
|
|
fn truncate_simple() {
|
|
|
|
let (mut tree, root) = generated(9);
|
|
|
|
let delete_tx = tree.truncate_leaf(root);
|
|
|
|
|
2019-08-22 05:59:18 -07:00
|
|
|
// initial tree:
|
|
|
|
//
|
|
|
|
// (-------16g------)
|
|
|
|
// / \
|
|
|
|
// (--------14-------) \
|
|
|
|
// / \ \
|
|
|
|
// ( 6 ) ( 13 ) \
|
|
|
|
// / \ / \ \
|
|
|
|
// (2) (5) (9) (12) \
|
|
|
|
// / \ / \ / \ / \ \
|
|
|
|
// (0) (1) (3) (4) (7) (8) (10) (11) (15)
|
|
|
|
//
|
|
|
|
// new tree:
|
|
|
|
// (--------14-------)
|
|
|
|
// / \
|
|
|
|
// ( 6 ) ( 13 )
|
|
|
|
// / \ / \
|
|
|
|
// (2) (5) (9) (12)
|
|
|
|
// / \ / \ / \ / \
|
|
|
|
// (0) (1) (3) (4) (7) (8) (10) (11)
|
|
|
|
//
|
|
|
|
// so (15) is truncated
|
|
|
|
// and new root, (14) is a stored one now
|
|
|
|
|
2019-08-22 07:43:03 -07:00
|
|
|
assert_matches!(delete_tx.new_root, NodeLink::Stored(14));
|
2019-08-22 05:59:18 -07:00
|
|
|
assert_eq!(tree.len(), 15);
|
2019-08-22 04:36:57 -07:00
|
|
|
}
|
2019-08-22 05:47:49 -07:00
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn truncate_generated() {
|
|
|
|
let (mut tree, root) = generated(10);
|
|
|
|
let delete_tx = tree.truncate_leaf(root);
|
|
|
|
|
2019-08-22 05:59:18 -07:00
|
|
|
// initial tree:
|
|
|
|
//
|
|
|
|
// (--------18g--------)
|
|
|
|
// / \
|
|
|
|
// (--------14-------) \
|
|
|
|
// / \ \
|
|
|
|
// ( 6 ) ( 13 ) \
|
|
|
|
// / \ / \ \
|
|
|
|
// (2) (5) (9) (12) (17)
|
|
|
|
// / \ / \ / \ / \ / \
|
|
|
|
// (0) (1) (3) (4) (7) (8) (10) (11) (15) (16)
|
|
|
|
//
|
|
|
|
// new tree:
|
|
|
|
// (-------16g------)
|
|
|
|
// / \
|
|
|
|
// (--------14-------) \
|
|
|
|
// / \ \
|
|
|
|
// ( 6 ) ( 13 ) \
|
|
|
|
// / \ / \ \
|
|
|
|
// (2) (5) (9) (12) \
|
|
|
|
// / \ / \ / \ / \ \
|
|
|
|
// (0) (1) (3) (4) (7) (8) (10) (11) (15)
|
|
|
|
|
|
|
|
// new root is generated
|
2019-08-22 07:43:03 -07:00
|
|
|
|
|
|
|
assert_matches!(delete_tx.new_root, NodeLink::Generated(_));
|
2019-08-22 05:47:49 -07:00
|
|
|
|
2019-08-22 05:59:18 -07:00
|
|
|
// left is 14 and right is 15
|
2019-08-22 05:47:49 -07:00
|
|
|
let (left_root_child, right_root_child) = {
|
|
|
|
let root = tree.resolve_link(delete_tx.new_root);
|
|
|
|
|
|
|
|
(
|
|
|
|
root.node.left.expect("there should be left child for root"),
|
|
|
|
root.node.right.expect("there should be right child for root"),
|
|
|
|
)
|
|
|
|
};
|
2019-08-22 07:43:03 -07:00
|
|
|
|
|
|
|
assert_matches!(
|
|
|
|
(left_root_child, right_root_child),
|
|
|
|
(NodeLink::Stored(14), NodeLink::Stored(15))
|
|
|
|
);
|
|
|
|
|
2019-08-22 07:36:05 -07:00
|
|
|
// two stored nodes should leave us (leaf 16 and no longer needed node 17)
|
2019-08-22 05:49:43 -07:00
|
|
|
assert_eq!(delete_tx.truncated, 2);
|
|
|
|
assert_eq!(tree.len(), 16);
|
2019-08-22 05:47:49 -07:00
|
|
|
}
|
2019-08-23 06:25:34 -07:00
|
|
|
|
2019-09-02 08:05:20 -07:00
|
|
|
#[test]
|
|
|
|
fn tree_len() {
|
|
|
|
let (mut root, mut tree) = initial();
|
|
|
|
|
|
|
|
assert_eq!(tree.len(), 3);
|
|
|
|
|
|
|
|
for i in 0..2 {
|
|
|
|
root = tree.append_leaf(root, leaf(i+3)).new_root;
|
|
|
|
}
|
|
|
|
assert_eq!(tree.len(), 7);
|
|
|
|
|
2019-09-02 08:18:33 -07:00
|
|
|
tree.truncate_leaf(root);
|
2019-09-02 08:05:20 -07:00
|
|
|
|
|
|
|
assert_eq!(tree.len(), 4);
|
|
|
|
}
|
|
|
|
|
2019-09-02 08:26:51 -07:00
|
|
|
#[test]
|
|
|
|
fn tree_len_long() {
|
|
|
|
let (mut root, mut tree) = initial();
|
|
|
|
|
|
|
|
assert_eq!(tree.len(), 3);
|
|
|
|
|
|
|
|
for i in 0..4094 {
|
|
|
|
root = tree.append_leaf(root, leaf(i+3)).new_root;
|
|
|
|
}
|
|
|
|
assert_eq!(tree.len(), 8191); // 4096*2-1 (full tree)
|
|
|
|
|
|
|
|
for _ in 0..2049 {
|
|
|
|
root = tree.truncate_leaf(root).new_root;
|
|
|
|
}
|
|
|
|
|
|
|
|
assert_eq!(tree.len(), 4083); // 4095 - log2(4096)
|
|
|
|
}
|
|
|
|
|
2019-08-23 06:25:34 -07:00
|
|
|
|
|
|
|
quickcheck! {
|
|
|
|
fn there_and_back(number: u32) -> TestResult {
|
2019-09-02 05:28:51 -07:00
|
|
|
if number > 1024*1024 {
|
2019-08-23 06:25:34 -07:00
|
|
|
TestResult::discard()
|
|
|
|
} else {
|
|
|
|
let (mut root, mut tree) = initial();
|
|
|
|
for i in 0..number {
|
|
|
|
root = tree.append_leaf(root, leaf(i+3)).new_root;
|
|
|
|
}
|
2019-09-02 05:28:51 -07:00
|
|
|
for _ in 0..number {
|
2019-08-23 06:25:34 -07:00
|
|
|
root = tree.truncate_leaf(root).new_root;
|
|
|
|
}
|
|
|
|
|
|
|
|
TestResult::from_bool(if let NodeLink::Stored(2) = root { true } else { false })
|
|
|
|
}
|
|
|
|
}
|
2019-09-02 05:11:23 -07:00
|
|
|
|
|
|
|
fn leaf_count(number: u32) -> TestResult {
|
2019-09-02 05:28:51 -07:00
|
|
|
if number > 1024 * 1024 || number < 3 {
|
2019-09-02 05:11:23 -07:00
|
|
|
TestResult::discard()
|
|
|
|
} else {
|
|
|
|
let (mut root, mut tree) = initial();
|
2019-09-02 05:28:51 -07:00
|
|
|
for i in 1..(number-1) {
|
|
|
|
root = tree.append_leaf(root, leaf(i+2)).new_root;
|
2019-09-02 05:11:23 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
TestResult::from_bool(tree.resolve_link(root).node.leaf_count() == number)
|
|
|
|
}
|
|
|
|
}
|
2019-09-02 08:05:20 -07:00
|
|
|
|
|
|
|
fn parity(number: u32) -> TestResult {
|
|
|
|
if number > 2048 * 2048 || number < 3 {
|
|
|
|
TestResult::discard()
|
|
|
|
} else {
|
|
|
|
let (mut root, mut tree) = initial();
|
|
|
|
for i in 1..(number-1) {
|
|
|
|
root = tree.append_leaf(root, leaf(i+2)).new_root;
|
|
|
|
}
|
|
|
|
|
|
|
|
TestResult::from_bool(
|
|
|
|
if number & number - 1 == 0 {
|
|
|
|
if let NodeLink::Stored(_) = root { true }
|
|
|
|
else { false }
|
|
|
|
} else {
|
|
|
|
if let NodeLink::Generated(_) = root { true }
|
|
|
|
else { false }
|
|
|
|
}
|
|
|
|
)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
fn parity_with_truncate(add: u32, delete: u32) -> TestResult {
|
|
|
|
// First we add `add` number of leaves, then delete `delete` number of leaves
|
|
|
|
// What is left should be consistent with generated-stored structure
|
|
|
|
if add > 2048 * 2048 || add < delete {
|
|
|
|
TestResult::discard()
|
|
|
|
} else {
|
|
|
|
let (mut root, mut tree) = initial();
|
|
|
|
for i in 0..add {
|
|
|
|
root = tree.append_leaf(root, leaf(i+3)).new_root;
|
|
|
|
}
|
|
|
|
for _ in 0..delete {
|
|
|
|
root = tree.truncate_leaf(root).new_root;
|
|
|
|
}
|
|
|
|
|
|
|
|
let total = add - delete + 2;
|
|
|
|
|
|
|
|
TestResult::from_bool(
|
|
|
|
if total & total - 1 == 0 {
|
|
|
|
if let NodeLink::Stored(_) = root { true }
|
|
|
|
else { false }
|
|
|
|
} else {
|
|
|
|
if let NodeLink::Generated(_) = root { true }
|
|
|
|
else { false }
|
|
|
|
}
|
|
|
|
)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
fn stored_length(add: u32, delete: u32) -> TestResult {
|
|
|
|
if add > 2048 * 2048 || add < delete {
|
|
|
|
TestResult::discard()
|
|
|
|
} else {
|
|
|
|
let (mut root, mut tree) = initial();
|
|
|
|
for i in 0..add {
|
|
|
|
root = tree.append_leaf(root, leaf(i+3)).new_root;
|
|
|
|
}
|
|
|
|
for _ in 0..delete {
|
|
|
|
root = tree.truncate_leaf(root).new_root;
|
|
|
|
}
|
|
|
|
|
|
|
|
let total = add - delete + 2;
|
|
|
|
|
|
|
|
TestResult::from_bool(total * total > tree.len())
|
|
|
|
}
|
|
|
|
}
|
2019-08-23 06:25:34 -07:00
|
|
|
}
|
2019-08-20 08:05:14 -07:00
|
|
|
}
|