aboutsummaryrefslogtreecommitdiffstats
path: root/trie
diff options
context:
space:
mode:
authorJeffrey Wilcke <jeffrey@ethereum.org>2016-02-24 19:57:57 +0800
committerJeffrey Wilcke <jeffrey@ethereum.org>2016-02-24 19:57:57 +0800
commit483feb0d3f015f103f80dbaf2aca9a130f5d964c (patch)
tree8137bf41be9b84bc6797ec55c861332b2efc3ab1 /trie
parent1415669ac31cf8f06d107e06681b95c2b5e1c040 (diff)
parent139f6a0f4c1b3358a92bdfb5637878b2c97eba78 (diff)
downloadgo-tangerine-483feb0d3f015f103f80dbaf2aca9a130f5d964c.tar
go-tangerine-483feb0d3f015f103f80dbaf2aca9a130f5d964c.tar.gz
go-tangerine-483feb0d3f015f103f80dbaf2aca9a130f5d964c.tar.bz2
go-tangerine-483feb0d3f015f103f80dbaf2aca9a130f5d964c.tar.lz
go-tangerine-483feb0d3f015f103f80dbaf2aca9a130f5d964c.tar.xz
go-tangerine-483feb0d3f015f103f80dbaf2aca9a130f5d964c.tar.zst
go-tangerine-483feb0d3f015f103f80dbaf2aca9a130f5d964c.zip
Merge pull request #2242 from jimenezrick/upstream-crypto
Closes #2241: Use Keccak-256 from golang.org/x/crypto/sha3 and mention explicitly
Diffstat (limited to 'trie')
-rw-r--r--trie/secure_trie_test.go2
-rw-r--r--trie/trie.go2
2 files changed, 2 insertions, 2 deletions
diff --git a/trie/secure_trie_test.go b/trie/secure_trie_test.go
index 13c6cd02e..0be5b3d15 100644
--- a/trie/secure_trie_test.go
+++ b/trie/secure_trie_test.go
@@ -63,7 +63,7 @@ func TestSecureGetKey(t *testing.T) {
key := []byte("foo")
value := []byte("bar")
- seckey := crypto.Sha3(key)
+ seckey := crypto.Keccak256(key)
if !bytes.Equal(trie.Get(key), value) {
t.Errorf("Get did not return bar")
diff --git a/trie/trie.go b/trie/trie.go
index 9dfde4529..cc5dcf2a6 100644
--- a/trie/trie.go
+++ b/trie/trie.go
@@ -40,7 +40,7 @@ var (
emptyRoot = common.HexToHash("56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421")
// This is the known hash of an empty state trie entry.
- emptyState = crypto.Sha3Hash(nil)
+ emptyState = crypto.Keccak256Hash(nil)
)
// ClearGlobalCache clears the global trie cache