diff options
author | obscuren <geffobscura@gmail.com> | 2014-06-27 01:53:08 +0800 |
---|---|---|
committer | obscuren <geffobscura@gmail.com> | 2014-06-27 01:53:08 +0800 |
commit | a98e6a262a21ff08c28495bab5180a1c15826d40 (patch) | |
tree | f57ecbea40ca0354bb050d70a10851669412a581 /ethchain/dagger.go | |
parent | 21e389bec5c6ce287273f5a1dd7ed5eee496616a (diff) | |
parent | 491925b71ef3431d2acd8cd0c639d90c9ae0cb2d (diff) | |
download | go-tangerine-a98e6a262a21ff08c28495bab5180a1c15826d40.tar go-tangerine-a98e6a262a21ff08c28495bab5180a1c15826d40.tar.gz go-tangerine-a98e6a262a21ff08c28495bab5180a1c15826d40.tar.bz2 go-tangerine-a98e6a262a21ff08c28495bab5180a1c15826d40.tar.lz go-tangerine-a98e6a262a21ff08c28495bab5180a1c15826d40.tar.xz go-tangerine-a98e6a262a21ff08c28495bab5180a1c15826d40.tar.zst go-tangerine-a98e6a262a21ff08c28495bab5180a1c15826d40.zip |
Merge branch 'develop' into release/0.5.15
Diffstat (limited to 'ethchain/dagger.go')
-rw-r--r-- | ethchain/dagger.go | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/ethchain/dagger.go b/ethchain/dagger.go index 565e1e447..08c4826db 100644 --- a/ethchain/dagger.go +++ b/ethchain/dagger.go @@ -1,15 +1,17 @@ package ethchain import ( + "github.com/ethereum/eth-go/ethlog" "github.com/ethereum/eth-go/ethutil" "github.com/obscuren/sha3" "hash" - "log" "math/big" "math/rand" "time" ) +var powlogger = ethlog.NewLogger("POW") + type PoW interface { Search(block *Block, reactChan chan ethutil.React) []byte Verify(hash []byte, diff *big.Int, nonce []byte) bool @@ -29,14 +31,13 @@ func (pow *EasyPow) Search(block *Block, reactChan chan ethutil.React) []byte { for { select { case <-reactChan: - //ethutil.Config.Log.Infoln("[POW] Received reactor event; breaking out.") return nil default: i++ if i%1234567 == 0 { elapsed := time.Now().UnixNano() - start hashes := ((float64(1e9) / float64(elapsed)) * float64(i)) / 1000 - ethutil.Config.Log.Infoln("[POW] Hashing @", int64(hashes), "khash") + powlogger.Infoln("Hashing @", int64(hashes), "khash") } sha := ethutil.Sha3Bin(big.NewInt(r.Int63()).Bytes()) @@ -81,7 +82,7 @@ func (dag *Dagger) Find(obj *big.Int, resChan chan int64) { rnd := r.Int63() res := dag.Eval(big.NewInt(rnd)) - log.Printf("rnd %v\nres %v\nobj %v\n", rnd, res, obj) + powlogger.Infof("rnd %v\nres %v\nobj %v\n", rnd, res, obj) if res.Cmp(obj) < 0 { // Post back result on the channel resChan <- rnd |