From 3fa76298e464345868c29a803eeec66c148c8443 Mon Sep 17 00:00:00 2001
From: ANOTHEL <anothel1@naver.com>
Date: Wed, 10 Apr 2019 17:49:02 +0900
Subject: [PATCH] p2p: remove useless parameter (#19433)
---
p2p/rlpx.go | 4 ++--
p2p/rlpx_test.go | 3 +--
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/p2p/rlpx.go b/p2p/rlpx.go
index 67cc1d9bf..0697ef3b0 100644
--- a/p2p/rlpx.go
+++ b/p2p/rlpx.go
@@ -128,7 +128,7 @@ func (t *rlpx) doProtoHandshake(our *protoHandshake) (their *protoHandshake, err
// as the error so it can be tracked elsewhere.
werr := make(chan error, 1)
go func() { werr <- Send(t.rw, handshakeMsg, our) }()
- if their, err = readProtocolHandshake(t.rw, our); err != nil {
+ if their, err = readProtocolHandshake(t.rw); err != nil {
<-werr // make sure the write terminates too
return nil, err
}
@@ -141,7 +141,7 @@ func (t *rlpx) doProtoHandshake(our *protoHandshake) (their *protoHandshake, err
return their, nil
}
-func readProtocolHandshake(rw MsgReader, our *protoHandshake) (*protoHandshake, error) {
+func readProtocolHandshake(rw MsgReader) (*protoHandshake, error) {
msg, err := rw.ReadMsg()
if err != nil {
return nil, err
diff --git a/p2p/rlpx_test.go b/p2p/rlpx_test.go
index 5d8981802..e62196ff0 100644
--- a/p2p/rlpx_test.go
+++ b/p2p/rlpx_test.go
@@ -222,7 +222,6 @@ func TestProtocolHandshake(t *testing.T) {
}
func TestProtocolHandshakeErrors(t *testing.T) {
- our := &protoHandshake{Version: 3, Caps: []Cap{{"foo", 2}, {"bar", 3}}, Name: "quux"}
tests := []struct {
code uint64
msg interface{}
@@ -258,7 +257,7 @@ func TestProtocolHandshakeErrors(t *testing.T) {
for i, test := range tests {
p1, p2 := MsgPipe()
go Send(p1, test.code, test.msg)
- _, err := readProtocolHandshake(p2, our)
+ _, err := readProtocolHandshake(p2)
if !reflect.DeepEqual(err, test.err) {
t.Errorf("test %d: error mismatch: got %q, want %q", i, err, test.err)
}
--
GitLab