diff options
| author | obscuren <geffobscura@gmail.com> | 2015-05-07 04:54:21 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-05-07 04:54:21 +0800 |
| commit | 062fa049d0322f17f8ba831203a609d048f623f1 (patch) | |
| tree | 1600884f30471066b9f54cc26c2a9e95b9b20989 /p2p/handshake_test.go | |
| parent | 24d44f35f2cf17b07330a7e7be79abc2b6b92fc6 (diff) | |
| parent | 4accc187d5cf6a100d6c10c0e0f35780f52871a0 (diff) | |
| download | go-tangerine-062fa049d0322f17f8ba831203a609d048f623f1.tar go-tangerine-062fa049d0322f17f8ba831203a609d048f623f1.tar.gz go-tangerine-062fa049d0322f17f8ba831203a609d048f623f1.tar.bz2 go-tangerine-062fa049d0322f17f8ba831203a609d048f623f1.tar.lz go-tangerine-062fa049d0322f17f8ba831203a609d048f623f1.tar.xz go-tangerine-062fa049d0322f17f8ba831203a609d048f623f1.tar.zst go-tangerine-062fa049d0322f17f8ba831203a609d048f623f1.zip | |
fixed merge issue
Diffstat (limited to 'p2p/handshake_test.go')
| -rw-r--r-- | p2p/handshake_test.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/p2p/handshake_test.go b/p2p/handshake_test.go index f618ef20d..9018e14f2 100644 --- a/p2p/handshake_test.go +++ b/p2p/handshake_test.go @@ -143,7 +143,7 @@ func TestSetupConn(t *testing.T) { done := make(chan struct{}) go func() { defer close(done) - conn0, err := setupConn(fd0, prv0, hs0, node1, false) + conn0, err := setupConn(fd0, prv0, hs0, node1, false, nil) if err != nil { t.Errorf("outbound side error: %v", err) return @@ -156,7 +156,7 @@ func TestSetupConn(t *testing.T) { } }() - conn1, err := setupConn(fd1, prv1, hs1, nil, false) + conn1, err := setupConn(fd1, prv1, hs1, nil, false, nil) if err != nil { t.Fatalf("inbound side error: %v", err) } |