From ddf63d3c068f1af50a2ef3ccde2e1551e4bef6b9 Mon Sep 17 00:00:00 2001 From: Felix Lange Date: Thu, 20 Oct 2016 00:49:58 +0200 Subject: [PATCH] trie: simplify insert, delete --- trie/trie.go | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/trie/trie.go b/trie/trie.go index 6c0abde8c0..61ca911f23 100644 --- a/trie/trie.go +++ b/trie/trie.go @@ -290,11 +290,7 @@ func (t *Trie) insert(n node, prefix, key []byte, value node) (bool, node, error if err != nil { return false, nil, err } - dirty, nn, err := t.insert(rn, prefix, key, value) - if !dirty || err != nil { - return false, rn, err - } - return true, nn, nil + return t.insert(rn, prefix, key, value) default: panic(fmt.Sprintf("%T: invalid node: %v", n, n)) @@ -421,11 +417,7 @@ func (t *Trie) delete(n node, prefix, key []byte) (bool, node, error) { if err != nil { return false, nil, err } - dirty, nn, err := t.delete(rn, prefix, key) - if !dirty || err != nil { - return false, rn, err - } - return true, nn, nil + return t.delete(rn, prefix, key) default: panic(fmt.Sprintf("%T: invalid node: %v (%v)", n, n, key))