diff options
| author | Péter Szilágyi <peterke@gmail.com> | 2017-01-07 01:30:44 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-07 01:30:44 +0800 |
| commit | ac93a6ff6cd1200ab0fb67a5bd0c02cb70646632 (patch) | |
| tree | 2b06aa1b360f1488264058d04e399e84b898f0d8 /miner | |
| parent | 444fc892b0a860218dab3e421d92c33408b9eb6d (diff) | |
| parent | 13e3b2f433c48fe81423c1a13e9a5194ece61b01 (diff) | |
| download | dexon-ac93a6ff6cd1200ab0fb67a5bd0c02cb70646632.tar.gz dexon-ac93a6ff6cd1200ab0fb67a5bd0c02cb70646632.tar.zst dexon-ac93a6ff6cd1200ab0fb67a5bd0c02cb70646632.zip | |
Merge pull request #3525 from fjl/all-gosimple-cleanup
all: clean up lint issues, remove more dead code
Diffstat (limited to 'miner')
| -rw-r--r-- | miner/worker.go | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/miner/worker.go b/miner/worker.go index adb224c47..56fd4ea66 100644 --- a/miner/worker.go +++ b/miner/worker.go @@ -39,8 +39,6 @@ import ( "gopkg.in/fatih/set.v0" ) -var jsonlogger = logger.NewJsonLogger() - const ( resultQueueSize = 10 miningLogAtDepth = 5 @@ -256,7 +254,7 @@ func (self *worker) update() { self.currentMu.Lock() acc, _ := types.Sender(self.current.signer, ev.Tx) - txs := map[common.Address]types.Transactions{acc: types.Transactions{ev.Tx}} + txs := map[common.Address]types.Transactions{acc: {ev.Tx}} txset := types.NewTransactionsByPriceAndNonce(txs) self.current.commitTransactions(self.mux, txset, self.gasPrice, self.chain) @@ -449,7 +447,7 @@ func (self *worker) commitNewWork() { // Depending whether we support or oppose the fork, override differently if self.config.DAOForkSupport { header.Extra = common.CopyBytes(params.DAOForkBlockExtra) - } else if bytes.Compare(header.Extra, params.DAOForkBlockExtra) == 0 { + } else if bytes.Equal(header.Extra, params.DAOForkBlockExtra) { header.Extra = []byte{} // If miner opposes, don't let it use the reserved extra-data } } |