diff options
author | Jeffrey Wilcke <jeffrey@ethereum.org> | 2016-07-16 18:08:16 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-07-16 18:08:16 +0800 |
commit | a4c4125b1155d9276614029163b498a17643f0f2 (patch) | |
tree | 328c438483cb7c87333190605ec1ef79cfa162a6 /eth/helper_test.go | |
parent | aa1e052cb41c39363a9930added46dac5b6db832 (diff) | |
parent | 993b41216092fa6dc20d3755afe322cd1376b398 (diff) | |
download | go-tangerine-a4c4125b1155d9276614029163b498a17643f0f2.tar go-tangerine-a4c4125b1155d9276614029163b498a17643f0f2.tar.gz go-tangerine-a4c4125b1155d9276614029163b498a17643f0f2.tar.bz2 go-tangerine-a4c4125b1155d9276614029163b498a17643f0f2.tar.lz go-tangerine-a4c4125b1155d9276614029163b498a17643f0f2.tar.xz go-tangerine-a4c4125b1155d9276614029163b498a17643f0f2.tar.zst go-tangerine-a4c4125b1155d9276614029163b498a17643f0f2.zip |
Merge pull request #2814 from karalabe/dao-hard-finalcombo
cmd, core, eth, miner, params, tests: finalize the DAO fork
Diffstat (limited to 'eth/helper_test.go')
-rw-r--r-- | eth/helper_test.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/eth/helper_test.go b/eth/helper_test.go index dacb1593f..28ff69b17 100644 --- a/eth/helper_test.go +++ b/eth/helper_test.go @@ -56,7 +56,7 @@ func newTestProtocolManager(fastSync bool, blocks int, generator func(int, *core chainConfig = &core.ChainConfig{HomesteadBlock: big.NewInt(0)} // homestead set to 0 because of chain maker blockchain, _ = core.NewBlockChain(db, chainConfig, pow, evmux) ) - chain, _ := core.GenerateChain(genesis, db, blocks, generator) + chain, _ := core.GenerateChain(nil, genesis, db, blocks, generator) if _, err := blockchain.InsertChain(chain); err != nil { panic(err) } |