diff options
| author | obscuren <geffobscura@gmail.com> | 2014-09-25 01:59:14 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2014-09-25 01:59:14 +0800 |
| commit | 544b7fba7f2e826bc7c4eef016082b266d17e5f6 (patch) | |
| tree | 85d7849fdf340a00349979cc481058d44a7c59ef /ethminer/miner.go | |
| parent | b66fcf85dfecb13c3ed2b9f46ad6bb257ce84411 (diff) | |
| parent | cba2f6c2c472d5818541f6eabf3e18196d0c477d (diff) | |
| download | go-tangerine-544b7fba7f2e826bc7c4eef016082b266d17e5f6.tar go-tangerine-544b7fba7f2e826bc7c4eef016082b266d17e5f6.tar.gz go-tangerine-544b7fba7f2e826bc7c4eef016082b266d17e5f6.tar.bz2 go-tangerine-544b7fba7f2e826bc7c4eef016082b266d17e5f6.tar.lz go-tangerine-544b7fba7f2e826bc7c4eef016082b266d17e5f6.tar.xz go-tangerine-544b7fba7f2e826bc7c4eef016082b266d17e5f6.tar.zst go-tangerine-544b7fba7f2e826bc7c4eef016082b266d17e5f6.zip | |
Merge branch 'tmp' into develop
Conflicts:
peer.go
Diffstat (limited to 'ethminer/miner.go')
| -rw-r--r-- | ethminer/miner.go | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/ethminer/miner.go b/ethminer/miner.go index b74f90e0c..299a5204a 100644 --- a/ethminer/miner.go +++ b/ethminer/miner.go @@ -3,7 +3,6 @@ package ethminer import ( "bytes" "sort" - "time" "github.com/ethereum/eth-go/ethchain" "github.com/ethereum/eth-go/ethlog" @@ -136,12 +135,6 @@ func (miner *Miner) listener() { } } default: - // This hack is only temporarily - if len(miner.txs) == 0 { - time.Sleep(2 * time.Second) - continue - } - miner.mineNewBlock() } } |