aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--miner/miner.go5
-rw-r--r--tests/block_test.go2
2 files changed, 6 insertions, 1 deletions
diff --git a/miner/miner.go b/miner/miner.go
index 52b9f2a69..d5ea9a146 100644
--- a/miner/miner.go
+++ b/miner/miner.go
@@ -38,6 +38,11 @@ func (self *Miner) Mining() bool {
}
func (m *Miner) SetGasPrice(price *big.Int) {
+ // FIXME block tests set a nil gas price. Quick dirty fix
+ if price == nil {
+ return
+ }
+
m.worker.gasPrice = price
}
diff --git a/tests/block_test.go b/tests/block_test.go
index 79e3335b1..e72f2b548 100644
--- a/tests/block_test.go
+++ b/tests/block_test.go
@@ -103,7 +103,7 @@ func testEthConfig() *eth.Config {
return &eth.Config{
DataDir: common.DefaultDataDir(),
- LogLevel: 5,
+ Verbosity: 5,
Etherbase: "primary",
AccountManager: accounts.NewManager(ks),
NewDB: func(path string) (common.Database, error) { return ethdb.NewMemDatabase() },