Add children of siblings as well

Author: Manav-Aggarwal

deepsubtree.go

@@ -86,7 +86,7 @@ func GetSiblingExistenceProofsNonExistence(
 	return existenceProofs, nil
 }
 
-// Returns the sibling node of a leaf node with given key
+// Returns the sibling nodes of a node with given key
 func (tree *ImmutableTree) GetSiblingNodes(key []byte) ([]*Node, error) {
 	siblingNodes := make([]*Node, 0)
 	err := tree.recursiveGetSiblingNodes(tree.root, key, &siblingNodes)
@@ -96,6 +96,21 @@ func (tree *ImmutableTree) GetSiblingNodes(key []byte) ([]*Node, error) {
 	return siblingNodes, nil
 }
 
+func (tree *ImmutableTree) getAllChildren(node *Node) ([]*Node, error) {
+	if node.isLeaf() {
+		return nil, nil
+	}
+	leftNode, err := node.getLeftNode(tree)
+	if err != nil {
+		return nil, err
+	}
+	rightNode, err := node.getRightNode(tree)
+	if err != nil {
+		return nil, err
+	}
+	return []*Node{leftNode, rightNode}, nil
+}
+
 // Recursively iterates the tree to return all the siblings node of nodes with given key
 func (tree *ImmutableTree) recursiveGetSiblingNodes(node *Node, key []byte, siblingNodes *[]*Node) error {
 	if node == nil || node.isLeaf() {
@@ -112,11 +127,26 @@ func (tree *ImmutableTree) recursiveGetSiblingNodes(node *Node, key []byte, sibl
 	if bytes.Compare(key, node.key) < 0 {
 		if rightNode != nil {
 			*siblingNodes = append(*siblingNodes, rightNode)
+			siblingChildren, err := tree.getAllChildren(rightNode)
+			if err != nil {
+				return err
+			}
+			if siblingChildren != nil {
+				*siblingNodes = append(*siblingNodes, siblingChildren...)
+
+			}
 		}
 		return tree.recursiveGetSiblingNodes(leftNode, key, siblingNodes)
 	}
 	if rightNode != nil {
 		*siblingNodes = append(*siblingNodes, leftNode)
+		siblingChildren, err := tree.getAllChildren(leftNode)
+		if err != nil {
+			return err
+		}
+		if siblingChildren != nil {
+			*siblingNodes = append(*siblingNodes, siblingChildren...)
+		}
 	}
 	return tree.recursiveGetSiblingNodes(rightNode, key, siblingNodes)
 }

deepsubtree_test.go

@@ -311,6 +311,7 @@ func FuzzBatchAddReverse(f *testing.F) {
 			kString := keyList[int(readByte(r))%len(keys)]
 			return false, []byte(kString)
 		}
+		flag, flag2 := false, false
 		for i := 0; r.Len() != 0; i++ {
 			b, err := r.ReadByte()
 			if err != nil {
@@ -390,19 +391,32 @@ func FuzzBatchAddReverse(f *testing.F) {
 				if keyToDelete == nil {
 					continue
 				}
-				keys.Delete(string(keyToDelete))
+				if string(keyToDelete) == "2712" && i == 6 {
+					flag = true
+				}
+
+				if flag2 {
+					if (string(keyToDelete) == "7M8b" || string(keyToDelete) == "B01002212010879202192B72") && i == 7 {
+						ics23proof := ics23.ExistenceProof{}
+						_ = ics23proof
+					}
+				}
 
-				// TODO: Add more information needed for Delete operation in Deep Subtree
+				ics23proof, err := tree.GetMembershipProof(keyToDelete)
+				require.NoError(err)
 				existenceProofs, err := tree.GetSiblingExistenceProofs(keyToDelete)
 				require.NoError(err)
+				existenceProofs = append(existenceProofs, ics23proof.GetExist())
 				err = dst.AddExistenceProofs(existenceProofs)
 				require.NoError(err)
 				rootHash, err := tree.WorkingHash()
 				require.NoError(err)
 				err = dst.BuildTree(rootHash)
 				require.NoError(err)
 
-				dst.Remove(keyToDelete)
+				_, removed, err := dst.Remove(keyToDelete)
+				require.NoError(err)
+				require.True(removed)
 				rootHash, err = dst.WorkingHash()
 				require.NoError(err)
 				err = dst.BuildTree(rootHash)
@@ -412,12 +426,17 @@ func FuzzBatchAddReverse(f *testing.F) {
 				tree.Remove(keyToDelete)
 				tree.SaveVersion()
 
+				keys.Delete(string(keyToDelete))
+
 				areEqual, err := haveEqualRoots(dst.MutableTree, tree)
 				require.NoError(err)
 				if !areEqual {
 					t.Error("Remove: Unequal roots for Deep subtree and IAVL tree")
 				}
 			}
+			if flag {
+				flag2 = true
+			}
 		}
 		t.Log("Done")
 	})

go.mod

@@ -31,7 +31,7 @@ require (
 	github.com/tecbot/gorocksdb v0.0.0-20191217155057-f0fad39f321c // indirect
 	go.etcd.io/bbolt v1.3.6 // indirect
 	golang.org/x/net v0.0.0-20220617184016-355a448f1bc9 // indirect
-	golang.org/x/sys v0.0.0-20220615213510-4f61da869c0c // indirect
+	golang.org/x/sys v0.2.0 // indirect
 	google.golang.org/protobuf v1.28.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

go.sum

@@ -1302,8 +1302,9 @@ golang.org/x/sys v0.0.0-20220422013727-9388b58f7150/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220502124256-b6088ccd6cba/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220610221304-9f5ed59c137d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220615213510-4f61da869c0c h1:aFV+BgZ4svzjfabn8ERpuB4JI4N6/rdy1iusx77G3oU=
 golang.org/x/sys v0.0.0-20220615213510-4f61da869c0c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.2.0 h1:ljd4t30dBnAvMZaQCevtY0xLLD0A+bRZXbgLMLU1F/A=
+golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=