arnaucube/arbo
1
1
Fork 0
mirror of https://github.com/arnaucube/arbo.git synced 2026-01-09 07:21:28 +01:00
Code Issues Projects Releases Wiki Activity

Small update on errors of UpdateWithTx, GenProofWithTx, ImportDump

Browse Source
This commit is contained in:
arnaucube
2021-08-24 14:51:16 +02:00
parent 5f6c35e435
commit 5b1a40f7f4
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
tree.go
View File

@@ -66,6 +66,9 @@ var (
// ErrSnapshotNotEditable indicates when the tree is a snapshot, thus // ErrSnapshotNotEditable indicates when the tree is a snapshot, thus
// can not be modified // can not be modified
ErrSnapshotNotEditable = fmt.Errorf("snapshot tree can not be edited") ErrSnapshotNotEditable = fmt.Errorf("snapshot tree can not be edited")
// ErrTreeNotEmpty indicates when the tree was expected to be empty and
// it is not
ErrTreeNotEmpty = fmt.Errorf("tree is not empty")
) )
// Tree defines the struct that implements the MerkleTree functionalities // Tree defines the struct that implements the MerkleTree functionalities
@@ -578,7 +581,7 @@ func (t *Tree) UpdateWithTx(wTx db.WriteTx, k, v []byte) error {
} }
oldKey, _ := ReadLeafValue(valueAtBottom) oldKey, _ := ReadLeafValue(valueAtBottom)
if !bytes.Equal(oldKey, k) { if !bytes.Equal(oldKey, k) {
return fmt.Errorf("key %s does not exist", hex.EncodeToString(k)) return ErrKeyNotFound
} }
leafKey, leafValue, err := t.newLeafValue(k, v) leafKey, leafValue, err := t.newLeafValue(k, v)
@@ -640,7 +643,7 @@ func (t *Tree) GenProofWithTx(rTx db.ReadTx, k []byte) ([]byte, []byte, []byte,
leafK, leafV := ReadLeafValue(value) leafK, leafV := ReadLeafValue(value)
if !bytes.Equal(k, leafK) { if !bytes.Equal(k, leafK) {
// key not in tree, proof of non-existence // key not in tree, proof of non-existence
return leafK, leafV, s, false, err return leafK, leafV, s, false, nil
} }
return leafK, leafV, s, true, nil return leafK, leafV, s, true, nil
@@ -993,9 +996,15 @@ func (t *Tree) ImportDump(b []byte) error {
if !t.editable() { if !t.editable() {
return ErrSnapshotNotEditable return ErrSnapshotNotEditable
} }
root, err := t.Root()
if err != nil {
return err
}
if !bytes.Equal(root, t.emptyHash) {
return ErrTreeNotEmpty
}
r := bytes.NewReader(b) r := bytes.NewReader(b)
var err error
var keys, values [][]byte var keys, values [][]byte
for { for {
l := make([]byte, 2) l := make([]byte, 2)