diff options
| author | Ethan Buchman <ethan@coinculture.info> | 2015-02-18 08:25:18 +0800 |
|---|---|---|
| committer | Ethan Buchman <ethan@coinculture.info> | 2015-02-18 08:25:18 +0800 |
| commit | 2ba65f4fbaea49c1e0d99959b0331e09b153f931 (patch) | |
| tree | add8cabb05cd7fbf0ba4b4bbaf9460dacfc2082d /trie/shortnode.go | |
| parent | 2da367a2bee84d74d1bb0ea1b42d4c22fae486dd (diff) | |
| parent | 60318c96d03bcaaf731802b1080a3d87cb482124 (diff) | |
| download | dexon-2ba65f4fbaea49c1e0d99959b0331e09b153f931.tar dexon-2ba65f4fbaea49c1e0d99959b0331e09b153f931.tar.gz dexon-2ba65f4fbaea49c1e0d99959b0331e09b153f931.tar.bz2 dexon-2ba65f4fbaea49c1e0d99959b0331e09b153f931.tar.lz dexon-2ba65f4fbaea49c1e0d99959b0331e09b153f931.tar.xz dexon-2ba65f4fbaea49c1e0d99959b0331e09b153f931.tar.zst dexon-2ba65f4fbaea49c1e0d99959b0331e09b153f931.zip | |
Merge branch 'develop' of https://github.com/ethereum/go-ethereum into develop
Diffstat (limited to 'trie/shortnode.go')
| -rw-r--r-- | trie/shortnode.go | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/trie/shortnode.go b/trie/shortnode.go index f132b56d9..d96492958 100644 --- a/trie/shortnode.go +++ b/trie/shortnode.go @@ -1,5 +1,7 @@ package trie +import "github.com/ethereum/go-ethereum/ethutil" + type ShortNode struct { trie *Trie key []byte @@ -15,7 +17,11 @@ func (self *ShortNode) Value() Node { return self.value } func (self *ShortNode) Dirty() bool { return true } -func (self *ShortNode) Copy() Node { return NewShortNode(self.trie, self.key, self.value) } +func (self *ShortNode) Copy(t *Trie) Node { + node := &ShortNode{t, nil, self.value.Copy(t)} + node.key = ethutil.CopyBytes(self.key) + return node +} func (self *ShortNode) RlpData() interface{} { return []interface{}{self.key, self.value.Hash()} |