diff options
-rw-r--r-- | cmd/geth/blocktestcmd.go | 6 | ||||
-rw-r--r-- | miner/worker.go | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/cmd/geth/blocktestcmd.go b/cmd/geth/blocktestcmd.go index f4dcb0286..ffea4400e 100644 --- a/cmd/geth/blocktestcmd.go +++ b/cmd/geth/blocktestcmd.go @@ -96,9 +96,9 @@ func runOneBlockTest(ctx *cli.Context, test *tests.BlockTest) (*eth.Ethereum, er if err != nil { return nil, err } - if err := ethereum.Start(); err != nil { - return nil, err - } + // if err := ethereum.Start(); err != nil { + // return nil, err + // } // import the genesis block ethereum.ResetWithGenesisBlock(test.Genesis) diff --git a/miner/worker.go b/miner/worker.go index 1580d4d42..611445529 100644 --- a/miner/worker.go +++ b/miner/worker.go @@ -352,7 +352,7 @@ func (self *worker) isBlockLocallyMined(deepBlockNum uint64) bool { //Does the block at {deepBlockNum} send earnings to my coinbase? var block = self.chain.GetBlockByNumber(deepBlockNum) - return block.Header().Coinbase == self.coinbase + return block != nil && block.Header().Coinbase == self.coinbase } func (self *worker) logLocalMinedBlocks(previous *environment) { |