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/node.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/node.go')
| -rw-r--r-- | trie/node.go | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/trie/node.go b/trie/node.go index a1f68480f..0d8a7cff9 100644 --- a/trie/node.go +++ b/trie/node.go @@ -6,7 +6,7 @@ var indices = []string{"0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "a", "b type Node interface { Value() Node - Copy() Node // All nodes, for now, return them self + Copy(*Trie) Node // All nodes, for now, return them self Dirty() bool fstring(string) string Hash() interface{} @@ -18,7 +18,11 @@ func (self *ValueNode) String() string { return self.fstring("") } func (self *FullNode) String() string { return self.fstring("") } func (self *ShortNode) String() string { return self.fstring("") } func (self *ValueNode) fstring(ind string) string { return fmt.Sprintf("%x ", self.data) } -func (self *HashNode) fstring(ind string) string { return fmt.Sprintf("%x ", self.key) } + +//func (self *HashNode) fstring(ind string) string { return fmt.Sprintf("< %x > ", self.key) } +func (self *HashNode) fstring(ind string) string { + return fmt.Sprintf("%v", self.trie.trans(self)) +} // Full node func (self *FullNode) fstring(ind string) string { |