diff options
| author | Péter Szilágyi <peterke@gmail.com> | 2019-01-04 15:51:12 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-04 15:51:12 +0800 |
| commit | 391d4cb9b53eb9f71862cbb8a6cca332d5a76f94 (patch) | |
| tree | 7697f49be5353066df0968ff8af4169dfda2cdb1 /p2p/discv5 | |
| parent | 3f421aca54bb5216e0f949966481fa4516c52273 (diff) | |
| parent | 8ec344bf604a56e4bd313660448345708c5aeb51 (diff) | |
| download | dexon-391d4cb9b53eb9f71862cbb8a6cca332d5a76f94.tar dexon-391d4cb9b53eb9f71862cbb8a6cca332d5a76f94.tar.gz dexon-391d4cb9b53eb9f71862cbb8a6cca332d5a76f94.tar.bz2 dexon-391d4cb9b53eb9f71862cbb8a6cca332d5a76f94.tar.lz dexon-391d4cb9b53eb9f71862cbb8a6cca332d5a76f94.tar.xz dexon-391d4cb9b53eb9f71862cbb8a6cca332d5a76f94.tar.zst dexon-391d4cb9b53eb9f71862cbb8a6cca332d5a76f94.zip | |
Merge pull request #18390 from realdave/remove-sha3-pkg
vendor, crypto, swarm: switch over to upstream sha3 package
Diffstat (limited to 'p2p/discv5')
| -rw-r--r-- | p2p/discv5/net.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/p2p/discv5/net.go b/p2p/discv5/net.go index 55e596755..de7d8de6a 100644 --- a/p2p/discv5/net.go +++ b/p2p/discv5/net.go @@ -27,10 +27,10 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common/mclock" "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/crypto/sha3" "github.com/ethereum/go-ethereum/log" "github.com/ethereum/go-ethereum/p2p/netutil" "github.com/ethereum/go-ethereum/rlp" + "golang.org/x/crypto/sha3" ) var ( @@ -1234,7 +1234,7 @@ func (net *Network) checkTopicRegister(data *topicRegister) (*pong, error) { } func rlpHash(x interface{}) (h common.Hash) { - hw := sha3.NewKeccak256() + hw := sha3.NewLegacyKeccak256() rlp.Encode(hw, x) hw.Sum(h[:0]) return h |