diff options
| author | Taylor Gerring <taylor.gerring@gmail.com> | 2015-02-11 18:40:12 +0800 |
|---|---|---|
| committer | Taylor Gerring <taylor.gerring@gmail.com> | 2015-02-11 18:40:12 +0800 |
| commit | cfddb7f3cd3b8cecb1e59412ce4db5769f6c8007 (patch) | |
| tree | ab28c518bd1b78f6b8ac8b241951ad161cb268a9 /trie/fullnode.go | |
| parent | 21fd31dad8bc6e0291ca405314b516670333c707 (diff) | |
| parent | c6af5f0a275608ea6c797ef826e6090885f24eac (diff) | |
| download | dexon-cfddb7f3cd3b8cecb1e59412ce4db5769f6c8007.tar dexon-cfddb7f3cd3b8cecb1e59412ce4db5769f6c8007.tar.gz dexon-cfddb7f3cd3b8cecb1e59412ce4db5769f6c8007.tar.bz2 dexon-cfddb7f3cd3b8cecb1e59412ce4db5769f6c8007.tar.lz dexon-cfddb7f3cd3b8cecb1e59412ce4db5769f6c8007.tar.xz dexon-cfddb7f3cd3b8cecb1e59412ce4db5769f6c8007.tar.zst dexon-cfddb7f3cd3b8cecb1e59412ce4db5769f6c8007.zip | |
Merge branch 'develop' into jsonrpc
Conflicts:
rpc/ws/server.go
Diffstat (limited to 'trie/fullnode.go')
| -rw-r--r-- | trie/fullnode.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/trie/fullnode.go b/trie/fullnode.go index ebbe7f384..522fdb373 100644 --- a/trie/fullnode.go +++ b/trie/fullnode.go @@ -20,11 +20,11 @@ func (self *FullNode) Branches() []Node { return self.nodes[:16] } -func (self *FullNode) Copy() Node { - nnode := NewFullNode(self.trie) +func (self *FullNode) Copy(t *Trie) Node { + nnode := NewFullNode(t) for i, node := range self.nodes { if node != nil { - nnode.nodes[i] = node + nnode.nodes[i] = node.Copy(t) } } |