From 142c0750c71db5ff6fc01d3a0a8843891e518937 Mon Sep 17 00:00:00 2001
From: Wolfgang Welz <welzwo@gmail.com>
Date: Sat, 4 Jan 2020 13:57:04 +0100
Subject: [PATCH] fix: correct linter warnings
---
packages/gossip/server/server.go | 19 ++++++++++++-------
packages/gossip/server/server_test.go | 3 +--
2 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/packages/gossip/server/server.go b/packages/gossip/server/server.go
index 658f6be6..fdb72cc0 100644
--- a/packages/gossip/server/server.go
+++ b/packages/gossip/server/server.go
@@ -332,7 +332,8 @@ func (t *TCP) doHandshake(key peer.PublicKey, remoteAddr string, conn net.Conn)
return fmt.Errorf("handshake size too large: %d, max %d", l, maxHandshakePacketSize)
}
- if err := conn.SetWriteDeadline(time.Now().Add(handshakeTimeout)); err != nil {
+ err = conn.SetWriteDeadline(time.Now().Add(handshakeTimeout))
+ if err != nil {
return err
}
_, err = conn.Write(b)
@@ -340,7 +341,8 @@ func (t *TCP) doHandshake(key peer.PublicKey, remoteAddr string, conn net.Conn)
return err
}
- if err := conn.SetReadDeadline(time.Now().Add(handshakeTimeout)); err != nil {
+ err = conn.SetReadDeadline(time.Now().Add(handshakeTimeout))
+ if err != nil {
return err
}
b = make([]byte, maxHandshakePacketSize)
@@ -349,8 +351,9 @@ func (t *TCP) doHandshake(key peer.PublicKey, remoteAddr string, conn net.Conn)
return err
}
- pkt = new(pb.Packet)
- if err := proto.Unmarshal(b[:n], pkt); err != nil {
+ pkt = &pb.Packet{}
+ err = proto.Unmarshal(b[:n], pkt)
+ if err != nil {
return err
}
@@ -375,8 +378,9 @@ func (t *TCP) readHandshakeRequest(conn net.Conn) (peer.PublicKey, []byte, error
return nil, nil, errors.Wrap(err, ErrInvalidHandshake.Error())
}
- pkt := new(pb.Packet)
- if err := proto.Unmarshal(b[:n], pkt); err != nil {
+ pkt := &pb.Packet{}
+ err = proto.Unmarshal(b[:n], pkt)
+ if err != nil {
return nil, nil, err
}
@@ -411,7 +415,8 @@ func (t *TCP) writeHandshakeResponse(reqData []byte, conn net.Conn) error {
return fmt.Errorf("handshake size too large: %d, max %d", l, maxHandshakePacketSize)
}
- if err := conn.SetWriteDeadline(time.Now().Add(handshakeTimeout)); err != nil {
+ err = conn.SetWriteDeadline(time.Now().Add(handshakeTimeout))
+ if err != nil {
return err
}
_, err = conn.Write(b)
diff --git a/packages/gossip/server/server_test.go b/packages/gossip/server/server_test.go
index e4f06070..517f948b 100644
--- a/packages/gossip/server/server_test.go
+++ b/packages/gossip/server/server_test.go
@@ -111,8 +111,7 @@ func TestNoHandshakeResponse(t *testing.T) {
lis, err := net.Listen("tcp", "localhost:0")
require.NoError(t, err)
go func() {
- conn, err := lis.Accept()
- require.NoError(t, err)
+ conn, _ := lis.Accept()
n, _ := conn.Read(make([]byte, maxHandshakePacketSize))
assert.NotZero(t, n)
_ = conn.Close()
--
GitLab