diff options
| author | Jeffrey Wilcke <jeffrey@ethereum.org> | 2016-02-24 19:57:57 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <jeffrey@ethereum.org> | 2016-02-24 19:57:57 +0800 |
| commit | 483feb0d3f015f103f80dbaf2aca9a130f5d964c (patch) | |
| tree | 8137bf41be9b84bc6797ec55c861332b2efc3ab1 /cmd | |
| parent | 1415669ac31cf8f06d107e06681b95c2b5e1c040 (diff) | |
| parent | 139f6a0f4c1b3358a92bdfb5637878b2c97eba78 (diff) | |
| download | go-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 'cmd')
| -rw-r--r-- | cmd/geth/js_test.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmd/geth/js_test.go b/cmd/geth/js_test.go index 4330b484c..af435e68c 100644 --- a/cmd/geth/js_test.go +++ b/cmd/geth/js_test.go @@ -396,7 +396,7 @@ multiply7 = Multiply7.at(contractaddress); if sol != nil && solcVersion != sol.Version() { modContractInfo := versionRE.ReplaceAll(contractInfo, []byte(`"compilerVersion":"`+sol.Version()+`"`)) fmt.Printf("modified contractinfo:\n%s\n", modContractInfo) - contentHash = `"` + common.ToHex(crypto.Sha3([]byte(modContractInfo))) + `"` + contentHash = `"` + common.ToHex(crypto.Keccak256([]byte(modContractInfo))) + `"` } if checkEvalJSON(t, repl, `filename = "/tmp/info.json"`, `"/tmp/info.json"`) != nil { return |