Merge pull request #3338 from karalabe/miner-driveby-cleanup

miner: remove dead code, add gas price getter
This commit is contained in:
Péter Szilágyi 2016-11-24 15:35:38 +02:00 committed by GitHub
commit 8e64e4383c

View File

@ -50,8 +50,6 @@ type Miner struct {
worker *worker
MinAcceptedGasPrice *big.Int
threads int
coinbase common.Address
mining int32
@ -107,12 +105,15 @@ out:
}
}
func (m *Miner) GasPrice() *big.Int {
return new(big.Int).Set(m.worker.gasPrice)
}
func (m *Miner) SetGasPrice(price *big.Int) {
// FIXME block tests set a nil gas price. Quick dirty fix
if price == nil {
return
}
m.worker.setGasPrice(price)
}