aboutsummaryrefslogtreecommitdiffstats
path: root/miner/miner.go
diff options
context:
space:
mode:
Diffstat (limited to 'miner/miner.go')
-rw-r--r--miner/miner.go9
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) {