diff options
| author | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-08-14 19:12:33 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-08-14 19:12:33 +0800 |
| commit | 29181003d4f50611a9082805509eed425c81db1a (patch) | |
| tree | f075a8bdcd24a61fc5eaf15e2f4faf430d5d33f3 /trie | |
| parent | 28b14d3e6d43cb27019e21d0a93a80e7bee1de8c (diff) | |
| parent | b8ca0a830e89d4d7c4314c13bcbc2629992f43d9 (diff) | |
| download | dexon-29181003d4f50611a9082805509eed425c81db1a.tar dexon-29181003d4f50611a9082805509eed425c81db1a.tar.gz dexon-29181003d4f50611a9082805509eed425c81db1a.tar.bz2 dexon-29181003d4f50611a9082805509eed425c81db1a.tar.lz dexon-29181003d4f50611a9082805509eed425c81db1a.tar.xz dexon-29181003d4f50611a9082805509eed425c81db1a.tar.zst dexon-29181003d4f50611a9082805509eed425c81db1a.zip | |
Merge pull request #1655 from obscuren/db-merge-fix
eth, trie: removed key prefixing from state entries & merge db fix
Diffstat (limited to 'trie')
| -rw-r--r-- | trie/cache.go | 4 | ||||
| -rw-r--r-- | trie/trie.go | 2 |
2 files changed, 0 insertions, 6 deletions
diff --git a/trie/cache.go b/trie/cache.go index 99d8033a6..e475fc861 100644 --- a/trie/cache.go +++ b/trie/cache.go @@ -38,8 +38,6 @@ func NewCache(backend Backend) *Cache { } func (self *Cache) Get(key []byte) []byte { - key = append(StatePre, key...) - data := self.store[string(key)] if data == nil { data, _ = self.backend.Get(key) @@ -49,8 +47,6 @@ func (self *Cache) Get(key []byte) []byte { } func (self *Cache) Put(key []byte, data []byte) { - key = append(StatePre, key...) - self.batch.Put(key, data) self.store[string(key)] = data } diff --git a/trie/trie.go b/trie/trie.go index 2970bc185..abf48a850 100644 --- a/trie/trie.go +++ b/trie/trie.go @@ -27,8 +27,6 @@ import ( "github.com/ethereum/go-ethereum/crypto" ) -var StatePre = []byte("state-") - func ParanoiaCheck(t1 *Trie, backend Backend) (bool, *Trie) { t2 := New(nil, backend) |