diff options
| author | obscuren <geffobscura@gmail.com> | 2015-05-09 18:51:40 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-05-09 18:51:40 +0800 |
| commit | 7eed47fad5ac971895a3853c83a22dff652dac02 (patch) | |
| tree | 744041666e63075c63326d144df0de5e9def9b5c | |
| parent | e3a08875f6435b1674e62bd1d923941ec2092b69 (diff) | |
| download | dexon-7eed47fad5ac971895a3853c83a22dff652dac02.tar dexon-7eed47fad5ac971895a3853c83a22dff652dac02.tar.gz dexon-7eed47fad5ac971895a3853c83a22dff652dac02.tar.bz2 dexon-7eed47fad5ac971895a3853c83a22dff652dac02.tar.lz dexon-7eed47fad5ac971895a3853c83a22dff652dac02.tar.xz dexon-7eed47fad5ac971895a3853c83a22dff652dac02.tar.zst dexon-7eed47fad5ac971895a3853c83a22dff652dac02.zip | |
miner, tests: fixed block test
| -rw-r--r-- | miner/miner.go | 5 | ||||
| -rw-r--r-- | tests/block_test.go | 2 |
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 ð.Config{ DataDir: common.DefaultDataDir(), - LogLevel: 5, + Verbosity: 5, Etherbase: "primary", AccountManager: accounts.NewManager(ks), NewDB: func(path string) (common.Database, error) { return ethdb.NewMemDatabase() }, |