diff options
| author | Péter Szilágyi <peterke@gmail.com> | 2016-03-16 19:12:46 +0800 |
|---|---|---|
| committer | Péter Szilágyi <peterke@gmail.com> | 2016-03-16 19:12:46 +0800 |
| commit | 138e7af96c2316f38f0ba8c7692253a7ad97ffba (patch) | |
| tree | 67ad9e1d6ff43acf35cbc5073738806ea3f871d0 /miner/miner.go | |
| parent | 8b6ae6bf86091483a7514b272bafcf730def0200 (diff) | |
| parent | 0228fb57cd58147ab2c3914520c7805e25a8a1c4 (diff) | |
| download | dexon-138e7af96c2316f38f0ba8c7692253a7ad97ffba.tar dexon-138e7af96c2316f38f0ba8c7692253a7ad97ffba.tar.gz dexon-138e7af96c2316f38f0ba8c7692253a7ad97ffba.tar.bz2 dexon-138e7af96c2316f38f0ba8c7692253a7ad97ffba.tar.lz dexon-138e7af96c2316f38f0ba8c7692253a7ad97ffba.tar.xz dexon-138e7af96c2316f38f0ba8c7692253a7ad97ffba.tar.zst dexon-138e7af96c2316f38f0ba8c7692253a7ad97ffba.zip | |
Merge pull request #2354 from karalabe/miner-atomic-pending
eth, miner: fetch pending block/state in on go (data race)
Diffstat (limited to 'miner/miner.go')
| -rw-r--r-- | miner/miner.go | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/miner/miner.go b/miner/miner.go index 6d4a84f1a..e52cefaab 100644 --- a/miner/miner.go +++ b/miner/miner.go @@ -164,12 +164,9 @@ func (self *Miner) SetExtra(extra []byte) error { return nil } -func (self *Miner) PendingState() *state.StateDB { - return self.worker.pendingState() -} - -func (self *Miner) PendingBlock() *types.Block { - return self.worker.pendingBlock() +// Pending returns the currently pending block and associated state. +func (self *Miner) Pending() (*types.Block, *state.StateDB) { + return self.worker.pending() } func (self *Miner) SetEtherbase(addr common.Address) { |