diff options
| author | obscuren <geffobscura@gmail.com> | 2015-01-23 21:29:01 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-01-23 21:29:01 +0800 |
| commit | 7a894e37388fccef1fa7945bb20b7cf8f0c1ce3c (patch) | |
| tree | a6d55756ec833b3651e5805726813a7ef5af3399 /pow/ezp/pow.go | |
| parent | 215780ab562b940bfc653c16bf84f812ef062821 (diff) | |
| parent | d792e95c214c8352e6b23b798101e90844eaa7a3 (diff) | |
| download | dexon-7a894e37388fccef1fa7945bb20b7cf8f0c1ce3c.tar dexon-7a894e37388fccef1fa7945bb20b7cf8f0c1ce3c.tar.gz dexon-7a894e37388fccef1fa7945bb20b7cf8f0c1ce3c.tar.bz2 dexon-7a894e37388fccef1fa7945bb20b7cf8f0c1ce3c.tar.lz dexon-7a894e37388fccef1fa7945bb20b7cf8f0c1ce3c.tar.xz dexon-7a894e37388fccef1fa7945bb20b7cf8f0c1ce3c.tar.zst dexon-7a894e37388fccef1fa7945bb20b7cf8f0c1ce3c.zip | |
Merge branch 'develop' into jsonrpc
Diffstat (limited to 'pow/ezp/pow.go')
| -rw-r--r-- | pow/ezp/pow.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pow/ezp/pow.go b/pow/ezp/pow.go index 8c164798a..5abe6950e 100644 --- a/pow/ezp/pow.go +++ b/pow/ezp/pow.go @@ -6,10 +6,10 @@ import ( "time" "github.com/ethereum/go-ethereum/crypto" + "github.com/ethereum/go-ethereum/crypto/sha3" "github.com/ethereum/go-ethereum/ethutil" "github.com/ethereum/go-ethereum/logger" "github.com/ethereum/go-ethereum/pow" - "github.com/obscuren/sha3" ) var powlogger = logger.NewLogger("POW") |