From d40e178f8d0469b0cf0fc4d027a23c5e7581961f Mon Sep 17 00:00:00 2001 From: Kris Nuttycombe Date: Tue, 28 May 2024 19:11:09 -0600 Subject: [PATCH] shardtree: Do not unify pruned nodes with empty nodes. --- shardtree/src/prunable.rs | 2 -- 1 file changed, 2 deletions(-) diff --git a/shardtree/src/prunable.rs b/shardtree/src/prunable.rs index c7a5acb..5085e31 100644 --- a/shardtree/src/prunable.rs +++ b/shardtree/src/prunable.rs @@ -315,8 +315,6 @@ impl PrunableTree { pub(crate) fn unite(level: Level, ann: Option>, left: Self, right: Self) -> Self { match (left, right) { (Tree(Node::Nil), Tree(Node::Nil)) => Tree(Node::Nil), - (Tree(Node::Nil | Node::Pruned), Tree(Node::Pruned)) => Tree(Node::Pruned), - (Tree(Node::Pruned), Tree(Node::Nil)) => Tree(Node::Pruned), (Tree(Node::Leaf { value: lv }), Tree(Node::Leaf { value: rv })) // we can prune right-hand leaves that are not marked or reference leaves; if a // leaf is a checkpoint then that information will be propagated to the replacement