Removed naively casting to bytes

9b8a12b4 · obscuren · 12f1aea3 · 9b8a12b4
Commit 9b8a12b4 authored Nov 20, 2014 by obscuren
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 9 deletions

trie.go ptrie/trie.go +7 -9

No files found.
--- a/ptrie/trie.go
+++ b/ptrie/trie.go
@@ -53,15 +53,13 @@ func (self *Trie) Root() []byte { return self.Hash() }
 func (self *Trie) Hash() []byte {
 	var hash []byte
 	if self.root != nil {
-		hash = self.root.Hash().([]byte)
+		//hash = self.root.Hash().([]byte)
-		/*
+		t := self.root.Hash()
-			t := self.root.Hash()
+		if byts, ok := t.([]byte); ok {
-			if byts, ok := t.([]byte); ok {
+			hash = byts
-				hash = byts
+		} else {
-			} else {
+			hash = crypto.Sha3(ethutil.Encode(self.root.RlpData()))
-				hash = crypto.Sha3(ethutil.Encode(self.root.RlpData()))
+		}
-			}
-		*/
 	} else {
 		hash = crypto.Sha3(ethutil.Encode(""))
 	}