diff options
| author | Jeffrey Wilcke <geffobscura@gmail.com> | 2015-11-24 20:48:47 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <geffobscura@gmail.com> | 2015-11-24 20:48:47 +0800 |
| commit | 5490437942967638bcc6198035315f6811febaa8 (patch) | |
| tree | ec4fbee454bacbf2b80b5a7ff402fb48dd2c10cf /eth/helper_test.go | |
| parent | e5532154a50114d5ffb1ffd850b746cab00cb899 (diff) | |
| parent | b0fb48c389460193d9fc0a5118d79ff6dec48ce0 (diff) | |
| download | go-tangerine-1.3.2.tar go-tangerine-1.3.2.tar.gz go-tangerine-1.3.2.tar.bz2 go-tangerine-1.3.2.tar.lz go-tangerine-1.3.2.tar.xz go-tangerine-1.3.2.tar.zst go-tangerine-1.3.2.zip | |
Merge branch 'develop' into release/1.3.2v1.3.2
Conflicts:
VERSION
cmd/geth/main.go
Diffstat (limited to 'eth/helper_test.go')
| -rw-r--r-- | eth/helper_test.go | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/eth/helper_test.go b/eth/helper_test.go index 16907be8b..bbd1fb818 100644 --- a/eth/helper_test.go +++ b/eth/helper_test.go @@ -35,9 +35,7 @@ func newTestProtocolManager(fastSync bool, blocks int, generator func(int, *core db, _ = ethdb.NewMemDatabase() genesis = core.WriteGenesisBlockForTesting(db, core.GenesisAccount{testBankAddress, testBankFunds}) blockchain, _ = core.NewBlockChain(db, pow, evmux) - blockproc = core.NewBlockProcessor(db, pow, blockchain, evmux) ) - blockchain.SetProcessor(blockproc) chain, _ := core.GenerateChain(genesis, db, blocks, generator) if _, err := blockchain.InsertChain(chain); err != nil { panic(err) @@ -117,7 +115,7 @@ func newTestPeer(name string, version int, pm *ProtocolManager, shake bool) (*te var id discover.NodeID rand.Read(id[:]) - peer := pm.newPeer(version, NetworkId, p2p.NewPeer(id, name, nil), net) + peer := pm.newPeer(version, p2p.NewPeer(id, name, nil), net) // Start the peer on a new thread errc := make(chan error, 1) |