diff options
| author | Jeffrey Wilcke <jeffrey@ethereum.org> | 2016-10-19 19:35:49 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-19 19:35:49 +0800 |
| commit | 25ac04a444d82f42138fc06e651c1ef9bac935dc (patch) | |
| tree | 4b4925de834f243a05c73e661e77bc60287aeb9d /trie/sync.go | |
| parent | 8e52c2e754cdb343d0eb880a33251e1ba593d327 (diff) | |
| parent | 8d56bf5ceb74a7ed45c986450848a89e2df61189 (diff) | |
| download | dexon-25ac04a444d82f42138fc06e651c1ef9bac935dc.tar dexon-25ac04a444d82f42138fc06e651c1ef9bac935dc.tar.gz dexon-25ac04a444d82f42138fc06e651c1ef9bac935dc.tar.bz2 dexon-25ac04a444d82f42138fc06e651c1ef9bac935dc.tar.lz dexon-25ac04a444d82f42138fc06e651c1ef9bac935dc.tar.xz dexon-25ac04a444d82f42138fc06e651c1ef9bac935dc.tar.zst dexon-25ac04a444d82f42138fc06e651c1ef9bac935dc.zip | |
Merge pull request #3153 from fjl/trie-unload-fix
trie: improve cache unloading mechanism
Diffstat (limited to 'trie/sync.go')
| -rw-r--r-- | trie/sync.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/trie/sync.go b/trie/sync.go index 400dff903..30caf6980 100644 --- a/trie/sync.go +++ b/trie/sync.go @@ -82,7 +82,7 @@ func (s *TrieSync) AddSubTrie(root common.Hash, depth int, parent common.Hash, c } key := root.Bytes() blob, _ := s.database.Get(key) - if local, err := decodeNode(key, blob); local != nil && err == nil { + if local, err := decodeNode(key, blob, 0); local != nil && err == nil { return } // Assemble the new sub-trie sync request @@ -158,7 +158,7 @@ func (s *TrieSync) Process(results []SyncResult) (int, error) { continue } // Decode the node data content and update the request - node, err := decodeNode(item.Hash[:], item.Data) + node, err := decodeNode(item.Hash[:], item.Data, 0) if err != nil { return i, err } @@ -246,7 +246,7 @@ func (s *TrieSync) children(req *request) ([]*request, error) { if node, ok := (*child.node).(hashNode); ok { // Try to resolve the node from the local database blob, _ := s.database.Get(node) - if local, err := decodeNode(node[:], blob); local != nil && err == nil { + if local, err := decodeNode(node[:], blob, 0); local != nil && err == nil { *child.node = local continue } |