diff options
| author | zelig <viktor.tron@gmail.com> | 2015-03-16 23:46:29 +0800 |
|---|---|---|
| committer | zelig <viktor.tron@gmail.com> | 2015-03-16 23:46:29 +0800 |
| commit | 5e7702fd050ed5520a03cc2cfc8b1f45a70f35fb (patch) | |
| tree | d5ba6197a8c0c8e36bb92ee9fc8aad717cb2d178 /trie/shortnode.go | |
| parent | 8393dab470c40678caf36ada82e312d29c4cf5c4 (diff) | |
| parent | 22893b7ac925c49168c119f293ea8befc3aff5cc (diff) | |
| download | dexon-5e7702fd050ed5520a03cc2cfc8b1f45a70f35fb.tar dexon-5e7702fd050ed5520a03cc2cfc8b1f45a70f35fb.tar.gz dexon-5e7702fd050ed5520a03cc2cfc8b1f45a70f35fb.tar.bz2 dexon-5e7702fd050ed5520a03cc2cfc8b1f45a70f35fb.tar.lz dexon-5e7702fd050ed5520a03cc2cfc8b1f45a70f35fb.tar.xz dexon-5e7702fd050ed5520a03cc2cfc8b1f45a70f35fb.tar.zst dexon-5e7702fd050ed5520a03cc2cfc8b1f45a70f35fb.zip | |
Merge remote-tracking branch 'upstream/develop' into frontier/js
Conflicts:
cmd/ethereum/js.go
javascript/types.go
Diffstat (limited to 'trie/shortnode.go')
| -rw-r--r-- | trie/shortnode.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/trie/shortnode.go b/trie/shortnode.go index d96492958..edd490b4d 100644 --- a/trie/shortnode.go +++ b/trie/shortnode.go @@ -1,6 +1,6 @@ package trie -import "github.com/ethereum/go-ethereum/ethutil" +import "github.com/ethereum/go-ethereum/common" type ShortNode struct { trie *Trie @@ -19,7 +19,7 @@ func (self *ShortNode) Value() Node { func (self *ShortNode) Dirty() bool { return true } func (self *ShortNode) Copy(t *Trie) Node { node := &ShortNode{t, nil, self.value.Copy(t)} - node.key = ethutil.CopyBytes(self.key) + node.key = common.CopyBytes(self.key) return node } |