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/sync_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/sync_test.go')
| -rw-r--r-- | eth/sync_test.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/eth/sync_test.go b/eth/sync_test.go index f3a6718ab..afd90c9b6 100644 --- a/eth/sync_test.go +++ b/eth/sync_test.go @@ -40,8 +40,8 @@ func TestFastSyncDisabling(t *testing.T) { // Sync up the two peers io1, io2 := p2p.MsgPipe() - go pmFull.handle(pmFull.newPeer(63, NetworkId, p2p.NewPeer(discover.NodeID{}, "empty", nil), io2)) - go pmEmpty.handle(pmEmpty.newPeer(63, NetworkId, p2p.NewPeer(discover.NodeID{}, "full", nil), io1)) + go pmFull.handle(pmFull.newPeer(63, p2p.NewPeer(discover.NodeID{}, "empty", nil), io2)) + go pmEmpty.handle(pmEmpty.newPeer(63, p2p.NewPeer(discover.NodeID{}, "full", nil), io1)) time.Sleep(250 * time.Millisecond) pmEmpty.synchronise(pmEmpty.peers.BestPeer()) |