diff options
| author | zelig <viktor.tron@gmail.com> | 2015-03-16 23:50:29 +0800 |
|---|---|---|
| committer | zelig <viktor.tron@gmail.com> | 2015-03-16 23:50:29 +0800 |
| commit | b3e133dd159749a625c4b0245af293607ba12c8c (patch) | |
| tree | 9ba8e8c4afe9168f5bc83219d402efb00387d616 /Godeps | |
| parent | 8139d444f8d8163251d1c96ef8034d186825ce32 (diff) | |
| parent | 73af0302bed5076260ac935e452064aee423934d (diff) | |
| download | dexon-b3e133dd159749a625c4b0245af293607ba12c8c.tar dexon-b3e133dd159749a625c4b0245af293607ba12c8c.tar.gz dexon-b3e133dd159749a625c4b0245af293607ba12c8c.tar.bz2 dexon-b3e133dd159749a625c4b0245af293607ba12c8c.tar.lz dexon-b3e133dd159749a625c4b0245af293607ba12c8c.tar.xz dexon-b3e133dd159749a625c4b0245af293607ba12c8c.tar.zst dexon-b3e133dd159749a625c4b0245af293607ba12c8c.zip | |
Merge branch 'frontier/js' into frontier/nodeadmin.js
Diffstat (limited to 'Godeps')
| -rw-r--r-- | Godeps/_workspace/src/github.com/ethereum/ethash/ethash.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Godeps/_workspace/src/github.com/ethereum/ethash/ethash.go b/Godeps/_workspace/src/github.com/ethereum/ethash/ethash.go index 1f615058d..7328bc922 100644 --- a/Godeps/_workspace/src/github.com/ethereum/ethash/ethash.go +++ b/Godeps/_workspace/src/github.com/ethereum/ethash/ethash.go @@ -32,7 +32,7 @@ import ( "unsafe" "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethutil" + "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/logger" "github.com/ethereum/go-ethereum/pow" ) @@ -337,7 +337,7 @@ func (pow *Ethash) Search(block pow.Block, stop <-chan struct{}) (uint64, []byte pow.HashRate = int64(hashes) C.ethash_full(&ret, pow.dag.dag, pow.dag.paramsAndCache.params, cMiningHash, C.uint64_t(nonce)) - result := ethutil.Bytes2Big(C.GoBytes(unsafe.Pointer(&ret.result[0]), C.int(32))) + result := common.Bytes2Big(C.GoBytes(unsafe.Pointer(&ret.result[0]), C.int(32))) // TODO: disagrees with the spec https://github.com/ethereum/wiki/wiki/Ethash#mining if result.Cmp(target) <= 0 { @@ -402,7 +402,7 @@ func (pow *Ethash) verify(hash []byte, mixDigest []byte, difficulty *big.Int, bl C.ethash_light(ret, pAc.cache, pAc.params, chash, cnonce) - result := ethutil.Bytes2Big(C.GoBytes(unsafe.Pointer(&ret.result[0]), C.int(32))) + result := common.Bytes2Big(C.GoBytes(unsafe.Pointer(&ret.result[0]), C.int(32))) return result.Cmp(target) <= 0 } |