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/fetcher | |
| parent | aa1e052cb41c39363a9930added46dac5b6db832 (diff) | |
| parent | 993b41216092fa6dc20d3755afe322cd1376b398 (diff) | |
| download | dexon-a4c4125b1155d9276614029163b498a17643f0f2.tar dexon-a4c4125b1155d9276614029163b498a17643f0f2.tar.gz dexon-a4c4125b1155d9276614029163b498a17643f0f2.tar.bz2 dexon-a4c4125b1155d9276614029163b498a17643f0f2.tar.lz dexon-a4c4125b1155d9276614029163b498a17643f0f2.tar.xz dexon-a4c4125b1155d9276614029163b498a17643f0f2.tar.zst dexon-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/fetcher')
| -rw-r--r-- | eth/fetcher/fetcher_test.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/eth/fetcher/fetcher_test.go b/eth/fetcher/fetcher_test.go index 2404c8cfa..6a32be14c 100644 --- a/eth/fetcher/fetcher_test.go +++ b/eth/fetcher/fetcher_test.go @@ -45,7 +45,7 @@ var ( // contains a transaction and every 5th an uncle to allow testing correct block // reassembly. func makeChain(n int, seed byte, parent *types.Block) ([]common.Hash, map[common.Hash]*types.Block) { - blocks, _ := core.GenerateChain(parent, testdb, n, func(i int, block *core.BlockGen) { + blocks, _ := core.GenerateChain(nil, parent, testdb, n, func(i int, block *core.BlockGen) { block.SetCoinbase(common.Address{seed}) // If the block number is multiple of 3, send a bonus transaction to the miner |