From 3c7181d28f1f24aaea2da5cce664ffac52f369df Mon Sep 17 00:00:00 2001 From: obscuren Date: Mon, 2 Feb 2015 19:58:34 -0800 Subject: Fixed a copy issue in the trie which could cause a consensus failure --- trie/node.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'trie/node.go') diff --git a/trie/node.go b/trie/node.go index f28f24771..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 { -- cgit v1.2.3