From 7eed47fad5ac971895a3853c83a22dff652dac02 Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Sat, 9 May 2015 12:51:40 +0200
Subject: [PATCH] miner, tests: fixed block test

---
 miner/miner.go      | 5 +++++
 tests/block_test.go | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

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() },