diff options
| author | Péter Szilágyi <peterke@gmail.com> | 2016-09-30 21:44:00 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-30 21:44:00 +0800 |
| commit | d8715fba1a366944a069397775fc52a30358eff3 (patch) | |
| tree | bc21aad9b6de1db5f6d4264f2449745078d3a3ed /trie/trie.go | |
| parent | b4cc8cbac4c1756c179e497c53ee83515669fe13 (diff) | |
| parent | c3a77d626831b4ffe37ed4f8640e67e70ad5b220 (diff) | |
| download | dexon-d8715fba1a366944a069397775fc52a30358eff3.tar dexon-d8715fba1a366944a069397775fc52a30358eff3.tar.gz dexon-d8715fba1a366944a069397775fc52a30358eff3.tar.bz2 dexon-d8715fba1a366944a069397775fc52a30358eff3.tar.lz dexon-d8715fba1a366944a069397775fc52a30358eff3.tar.xz dexon-d8715fba1a366944a069397775fc52a30358eff3.tar.zst dexon-d8715fba1a366944a069397775fc52a30358eff3.zip | |
Merge pull request #3062 from fjl/trie-delete-bug
trie: fix delete bug for values contained in fullNode
Diffstat (limited to 'trie/trie.go')
| -rw-r--r-- | trie/trie.go | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/trie/trie.go b/trie/trie.go index 93e189e2e..55598af98 100644 --- a/trie/trie.go +++ b/trie/trie.go @@ -22,7 +22,7 @@ import ( "fmt" "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "github.com/ethereum/go-ethereum/crypto/sha3" "github.com/ethereum/go-ethereum/logger" "github.com/ethereum/go-ethereum/logger/glog" ) @@ -30,11 +30,14 @@ import ( var ( // This is the known root hash of an empty trie. emptyRoot = common.HexToHash("56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421") - // This is the known hash of an empty state trie entry. - emptyState = crypto.Keccak256Hash(nil) + emptyState common.Hash ) +func init() { + sha3.NewKeccak256().Sum(emptyState[:0]) +} + // Database must be implemented by backing stores for the trie. type Database interface { DatabaseWriter @@ -374,6 +377,9 @@ func (t *Trie) delete(n node, prefix, key []byte) (bool, node, error) { // n still contains at least two values and cannot be reduced. return true, n, nil + case valueNode: + return true, nil, nil + case nil: return false, nil, nil |