aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEgon Elbre <egonelbre@gmail.com>2017-08-07 00:40:34 +0800
committerEgon Elbre <egonelbre@gmail.com>2017-08-07 18:41:22 +0800
commitfaafeef79e1a7af462c5031a91936aae0c9cebf2 (patch)
treeafab7228764ca0718402d838ad906fe9c7178266
parentb159cdd8dd33ba030e7af5aa144de43441e4f543 (diff)
downloaddexon-faafeef79e1a7af462c5031a91936aae0c9cebf2.tar
dexon-faafeef79e1a7af462c5031a91936aae0c9cebf2.tar.gz
dexon-faafeef79e1a7af462c5031a91936aae0c9cebf2.tar.bz2
dexon-faafeef79e1a7af462c5031a91936aae0c9cebf2.tar.lz
dexon-faafeef79e1a7af462c5031a91936aae0c9cebf2.tar.xz
dexon-faafeef79e1a7af462c5031a91936aae0c9cebf2.tar.zst
dexon-faafeef79e1a7af462c5031a91936aae0c9cebf2.zip
miner: fix megacheck warnings
-rw-r--r--miner/remote_agent.go5
-rw-r--r--miner/worker.go13
2 files changed, 5 insertions, 13 deletions
diff --git a/miner/remote_agent.go b/miner/remote_agent.go
index bb223ba1b..aac7ce865 100644
--- a/miner/remote_agent.go
+++ b/miner/remote_agent.go
@@ -169,7 +169,8 @@ func (a *RemoteAgent) SubmitWork(nonce types.BlockNonce, mixDigest, hash common.
// RemoteAgent.Start() constantly recreates these channels, so the loop code cannot
// assume data stability in these member fields.
func (a *RemoteAgent) loop(workCh chan *Work, quitCh chan struct{}) {
- ticker := time.Tick(5 * time.Second)
+ ticker := time.NewTicker(5 * time.Second)
+ defer ticker.Stop()
for {
select {
@@ -179,7 +180,7 @@ func (a *RemoteAgent) loop(workCh chan *Work, quitCh chan struct{}) {
a.mu.Lock()
a.currentWork = work
a.mu.Unlock()
- case <-ticker:
+ case <-ticker.C:
// cleanup
a.mu.Lock()
for hash, work := range a.work {
diff --git a/miner/worker.go b/miner/worker.go
index 411bc4e1b..dab192c24 100644
--- a/miner/worker.go
+++ b/miner/worker.go
@@ -24,7 +24,6 @@ import (
"sync/atomic"
"time"
- "github.com/ethereum/go-ethereum/accounts"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/consensus"
"github.com/ethereum/go-ethereum/consensus/misc"
@@ -109,9 +108,6 @@ type worker struct {
uncleMu sync.Mutex
possibleUncles map[common.Hash]*types.Block
- txQueueMu sync.Mutex
- txQueue map[common.Hash]*types.Transaction
-
unconfirmed *unconfirmedBlocks // set of locally mined blocks pending canonicalness confirmations
// atomic status counters
@@ -133,9 +129,8 @@ func newWorker(config *params.ChainConfig, engine consensus.Engine, coinbase com
proc: eth.BlockChain().Validator(),
possibleUncles: make(map[common.Hash]*types.Block),
coinbase: coinbase,
- txQueue: make(map[common.Hash]*types.Transaction),
agents: make(map[Agent]struct{}),
- unconfirmed: newUnconfirmedBlocks(eth.BlockChain(), 5),
+ unconfirmed: newUnconfirmedBlocks(eth.BlockChain(), miningLogAtDepth),
fullValidation: false,
}
worker.events = worker.mux.Subscribe(core.ChainHeadEvent{}, core.ChainSideEvent{}, core.TxPreEvent{})
@@ -362,11 +357,7 @@ func (self *worker) makeCurrent(parent *types.Block, header *types.Header) error
work.family.Add(ancestor.Hash())
work.ancestors.Add(ancestor.Hash())
}
- wallets := self.eth.AccountManager().Wallets()
- accounts := make([]accounts.Account, 0, len(wallets))
- for _, wallet := range wallets {
- accounts = append(accounts, wallet.Accounts()...)
- }
+
// Keep track of transactions which return errors so they can be removed
work.tcount = 0
self.current = work