aboutsummaryrefslogtreecommitdiffstats
path: root/p2p/handshake_test.go
diff options
context:
space:
mode:
authorJeffrey Wilcke <jeffrey@ethereum.org>2015-05-08 22:47:56 +0800
committerJeffrey Wilcke <jeffrey@ethereum.org>2015-05-08 22:47:56 +0800
commit7c678554b585b70d5498442bc7122e3091ace80f (patch)
tree1136276c2c0a3a1067edc1ec4d05858bc1bbc4fb /p2p/handshake_test.go
parent23454dcfcb75b9e421d0c3bfe67d33ab49633c5c (diff)
parentd4f0a67323dec12e5b84ba4907970267a2e27601 (diff)
downloaddexon-7c678554b585b70d5498442bc7122e3091ace80f.tar
dexon-7c678554b585b70d5498442bc7122e3091ace80f.tar.gz
dexon-7c678554b585b70d5498442bc7122e3091ace80f.tar.bz2
dexon-7c678554b585b70d5498442bc7122e3091ace80f.tar.lz
dexon-7c678554b585b70d5498442bc7122e3091ace80f.tar.xz
dexon-7c678554b585b70d5498442bc7122e3091ace80f.tar.zst
dexon-7c678554b585b70d5498442bc7122e3091ace80f.zip
Merge pull request #885 from fjl/p2p-fixes
p2p: more last-minute fixes
Diffstat (limited to 'p2p/handshake_test.go')
-rw-r--r--p2p/handshake_test.go5
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)
}