diff options
| author | Ricardo Catalinas Jiménez <r@untroubled.be> | 2016-02-22 02:40:27 +0800 |
|---|---|---|
| committer | Ricardo Catalinas Jiménez <r@untroubled.be> | 2016-02-22 06:34:34 +0800 |
| commit | 436fc8d76a4871d67a61dc86c1a635e20594a0e6 (patch) | |
| tree | 5fad9f69b068f43ca606e2887f5522188e7f9ddd /core/types | |
| parent | c20d6e5e4ed8eff6d26cd849f90ca42dd5a7040c (diff) | |
| download | dexon-436fc8d76a4871d67a61dc86c1a635e20594a0e6.tar dexon-436fc8d76a4871d67a61dc86c1a635e20594a0e6.tar.gz dexon-436fc8d76a4871d67a61dc86c1a635e20594a0e6.tar.bz2 dexon-436fc8d76a4871d67a61dc86c1a635e20594a0e6.tar.lz dexon-436fc8d76a4871d67a61dc86c1a635e20594a0e6.tar.xz dexon-436fc8d76a4871d67a61dc86c1a635e20594a0e6.tar.zst dexon-436fc8d76a4871d67a61dc86c1a635e20594a0e6.zip | |
all: Rename crypto.Sha3{,Hash}() to crypto.Keccak256{,Hash}()
As we aren't really using the standarized SHA-3
Diffstat (limited to 'core/types')
| -rw-r--r-- | core/types/bloom9.go | 2 | ||||
| -rw-r--r-- | core/types/bloom9_test.go | 2 | ||||
| -rw-r--r-- | core/types/transaction.go | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/core/types/bloom9.go b/core/types/bloom9.go index 372045ab2..ecf2bffc2 100644 --- a/core/types/bloom9.go +++ b/core/types/bloom9.go @@ -101,7 +101,7 @@ func LogsBloom(logs vm.Logs) *big.Int { } func bloom9(b []byte) *big.Int { - b = crypto.Sha3(b[:]) + b = crypto.Keccak256(b[:]) r := new(big.Int) diff --git a/core/types/bloom9_test.go b/core/types/bloom9_test.go index 5744bec6c..58e8f7073 100644 --- a/core/types/bloom9_test.go +++ b/core/types/bloom9_test.go @@ -73,7 +73,7 @@ func TestBloom9(t *testing.T) { func TestAddress(t *testing.T) { block := &Block{} block.Coinbase = common.Hex2Bytes("22341ae42d6dd7384bc8584e50419ea3ac75b83f") - fmt.Printf("%x\n", crypto.Sha3(block.Coinbase)) + fmt.Printf("%x\n", crypto.Keccak256(block.Coinbase)) bin := CreateBloom(block) fmt.Printf("bin = %x\n", common.LeftPadBytes(bin, 64)) diff --git a/core/types/transaction.go b/core/types/transaction.go index 0c9c1ce18..37715ee53 100644 --- a/core/types/transaction.go +++ b/core/types/transaction.go @@ -202,7 +202,7 @@ func doFrom(tx *Transaction, homestead bool) (common.Address, error) { return common.Address{}, err } var addr common.Address - copy(addr[:], crypto.Sha3(pubkey[1:])[12:]) + copy(addr[:], crypto.Keccak256(pubkey[1:])[12:]) tx.from.Store(addr) return addr, nil } |