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

karalabe · web-flow · commit 8e64e4383c3b · 2016-11-24T15:35:38.000+02:00
miner: remove dead code, add gas price getter
diff --git a/miner/miner.go b/miner/miner.go
@@ -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)
 }
 

Original file line number	Diff line number	Diff line change
`@@ -50,8 +50,6 @@ type Miner struct {`
`50`	`50`
`51`	`51`	`worker *worker`
`52`	`52`
`53`		`- MinAcceptedGasPrice *big.Int`
`54`		`-`
`55`	`53`	`threads int`
`56`	`54`	`coinbase common.Address`
`57`	`55`	`mining int32`
`@@ -107,12 +105,15 @@ out:`
`107`	`105`	`}`
`108`	`106`	`}`
`109`	`107`
	`108`	`+func (m Miner) GasPrice() big.Int {`
	`109`	`+ return new(big.Int).Set(m.worker.gasPrice)`
	`110`	`+}`
	`111`	`+`
`110`	`112`	`func (m Miner) SetGasPrice(price big.Int) {`
`111`	`113`	`// FIXME block tests set a nil gas price. Quick dirty fix`
`112`	`114`	`if price == nil {`
`113`	`115`	`return`
`114`	`116`	`}`
`115`		`-`
`116`	`117`	`m.worker.setGasPrice(price)`
`117`	`118`	`}`
`118`	`119`