diff options
| author | Daniel A. Nagy <nagy.da@gmail.com> | 2015-05-08 23:55:53 +0800 |
|---|---|---|
| committer | Daniel A. Nagy <nagy.da@gmail.com> | 2015-05-08 23:55:53 +0800 |
| commit | 62dd9833ec768e2026bccb1cf7a8ef4263b9286d (patch) | |
| tree | 0a091d99afd7f8cf5e3a6d4522c30ceef8559a55 /p2p/handshake_test.go | |
| parent | 3a01e3e39b9ce83ecb7444319407ee8bb00e3bf6 (diff) | |
| parent | c8fc4cebe63073fd77d5f553a4f0cec36a4ccb4b (diff) | |
| download | dexon-62dd9833ec768e2026bccb1cf7a8ef4263b9286d.tar dexon-62dd9833ec768e2026bccb1cf7a8ef4263b9286d.tar.gz dexon-62dd9833ec768e2026bccb1cf7a8ef4263b9286d.tar.bz2 dexon-62dd9833ec768e2026bccb1cf7a8ef4263b9286d.tar.lz dexon-62dd9833ec768e2026bccb1cf7a8ef4263b9286d.tar.xz dexon-62dd9833ec768e2026bccb1cf7a8ef4263b9286d.tar.zst dexon-62dd9833ec768e2026bccb1cf7a8ef4263b9286d.zip | |
Merge branch 'develop' of github.com:ethereum/go-ethereum into develop
Diffstat (limited to 'p2p/handshake_test.go')
| -rw-r--r-- | p2p/handshake_test.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/p2p/handshake_test.go b/p2p/handshake_test.go index 9018e14f2..ab75921a3 100644 --- a/p2p/handshake_test.go +++ b/p2p/handshake_test.go @@ -141,9 +141,10 @@ func TestSetupConn(t *testing.T) { fd0, fd1 := net.Pipe() done := make(chan struct{}) + keepalways := func(discover.NodeID) bool { return true } go func() { defer close(done) - conn0, err := setupConn(fd0, prv0, hs0, node1, false, nil) + conn0, err := setupConn(fd0, prv0, hs0, node1, keepalways) if err != nil { t.Errorf("outbound side error: %v", err) return @@ -156,7 +157,7 @@ func TestSetupConn(t *testing.T) { } }() - conn1, err := setupConn(fd1, prv1, hs1, nil, false, nil) + conn1, err := setupConn(fd1, prv1, hs1, nil, keepalways) if err != nil { t.Fatalf("inbound side error: %v", err) } |