ScuroNeko/mtg
1
0
Fork 0
mirror of https://github.com/ScuroNeko/mtg.git synced 2026-08-31 12:54:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

Update golanci-lint

Browse Source
This commit is contained in:
9seconds
2021-04-09 14:35:04 +03:00
parent 81bca75c25
commit 585ebfeb50
32 changed files with 101 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mtglib/conns.go
+1 -1
View File
@@ -48,7 +48,7 @@ func (c *connRewind) Read(p []byte) (int, error) {
c.mutex.RLock()
defer c.mutex.RUnlock()
return c.active.Read(p)
return c.active.Read(p) // nolint: wrapcheck
}
func (c *connRewind) Rewind() {
mtglib/conns_internal_test.go
+11 -7
View File
@@ -22,7 +22,7 @@ type ConnRewindBaseConn struct {
func (c *ConnRewindBaseConn) Read(p []byte) (int, error) {
c.Called(p)
return c.readBuffer.Read(p)
return c.readBuffer.Read(p) // nolint: wrapcheck
}
type ConnTrafficTestSuite struct {
@@ -54,8 +54,9 @@ func (suite *ConnTrafficTestSuite) TestReadOk() {
On("Send", mock.Anything, mock.Anything).
Once().
Run(func(args mock.Arguments) {
evt := args.Get(1).(EventTraffic)
evt, ok := args.Get(1).(EventTraffic)
suite.True(ok)
suite.Equal("CONNID", evt.StreamID())
suite.WithinDuration(time.Now(), evt.Timestamp(), time.Second)
suite.EqualValues(10, evt.Traffic)
@@ -68,13 +69,14 @@ func (suite *ConnTrafficTestSuite) TestReadOk() {
suite.Equal(10, n)
}
func (suite *ConnTrafficTestSuite) TestReadErr() {
func (suite *ConnTrafficTestSuite) TestReadErr() { // nolint: dupl
suite.eventStreamMock.
On("Send", mock.Anything, mock.Anything).
Once().
Run(func(args mock.Arguments) {
evt := args.Get(1).(EventTraffic)
evt, ok := args.Get(1).(EventTraffic)
suite.True(ok)
suite.Equal("CONNID", evt.StreamID())
suite.WithinDuration(time.Now(), evt.Timestamp(), time.Second)
suite.EqualValues(10, evt.Traffic)
@@ -108,8 +110,9 @@ func (suite *ConnTrafficTestSuite) TestWriteOk() {
On("Send", mock.Anything, mock.Anything).
Once().
Run(func(args mock.Arguments) {
evt := args.Get(1).(EventTraffic)
evt, ok := args.Get(1).(EventTraffic)
suite.True(ok)
suite.Equal("CONNID", evt.StreamID())
suite.WithinDuration(time.Now(), evt.Timestamp(), time.Second)
suite.EqualValues(10, evt.Traffic)
@@ -122,13 +125,14 @@ func (suite *ConnTrafficTestSuite) TestWriteOk() {
suite.Equal(10, n)
}
func (suite *ConnTrafficTestSuite) TestWriteErr() {
func (suite *ConnTrafficTestSuite) TestWriteErr() { // nolint: dupl
suite.eventStreamMock.
On("Send", mock.Anything, mock.Anything).
Once().
Run(func(args mock.Arguments) {
evt := args.Get(1).(EventTraffic)
evt, ok := args.Get(1).(EventTraffic)
suite.True(ok)
suite.Equal("CONNID", evt.StreamID())
suite.WithinDuration(time.Now(), evt.Timestamp(), time.Second)
suite.EqualValues(10, evt.Traffic)
mtglib/internal/faketls/conn.go
+1 -1
View File
@@ -32,7 +32,7 @@ func (c *Conn) Read(p []byte) (int, error) {
case record.TypeApplicationData:
rec.Payload.WriteTo(&c.readBuffer) // nolint: errcheck
return c.readBuffer.Read(p)
return c.readBuffer.Read(p) // nolint: wrapcheck
case record.TypeChangeCipherSpec:
default:
return 0, fmt.Errorf("unsupported record type %v", rec.Type)
mtglib/internal/faketls/conn_test.go
+2 -2
View File
@@ -24,13 +24,13 @@ type ConnMock struct {
func (m *ConnMock) Read(p []byte) (int, error) {
m.Called(p)
return m.readBuffer.Read(p)
return m.readBuffer.Read(p) // nolint: wrapcheck
}
func (m *ConnMock) Write(p []byte) (int, error) {
m.Called(p)
return m.writeBuffer.Write(p)
return m.writeBuffer.Write(p) // nolint: wrapcheck
}
type ConnTestSuite struct {
mtglib/internal/faketls/welcome.go
+2 -2
View File
@@ -45,8 +45,8 @@ func SendWelcomePacket(writer io.Writer, secret []byte, clientHello ClientHello)
packet := buf.Bytes()
mac := hmac.New(sha256.New, secret)
mac.Write(clientHello.Random[:]) // nolint: errcheck
mac.Write(packet) // nolint: errcheck
mac.Write(clientHello.Random[:])
mac.Write(packet)
copy(packet[WelcomePacketRandomOffset:], mac.Sum(nil))
mtglib/internal/faketls/welcome_test.go
+2 -2
View File
@@ -70,8 +70,8 @@ func (suite *WelcomeTestSuite) TestOk() {
copy(welcomePacket[11:], empty)
mac := hmac.New(sha256.New, suite.secret.Key[:])
mac.Write(suite.h.Random[:]) // nolint: errcheck
mac.Write(welcomePacket) // nolint: errcheck
mac.Write(suite.h.Random[:])
mac.Write(welcomePacket)
suite.Equal(random, mac.Sum(nil))
}
mtglib/internal/obfuscated2/client_handshake.go
+4 -4
View File
@@ -16,8 +16,8 @@ func (c *clientHandhakeFrame) decryptor(secret []byte) cipher.Stream {
hasher := acquireSha256Hasher()
defer releaseSha256Hasher(hasher)
hasher.Write(c.key()) // nolint: errcheck
hasher.Write(secret) // nolint: errcheck
hasher.Write(c.key())
hasher.Write(secret)
return makeAesCtr(hasher.Sum(nil), c.iv())
}
@@ -28,8 +28,8 @@ func (c *clientHandhakeFrame) encryptor(secret []byte) cipher.Stream {
hasher := acquireSha256Hasher()
defer releaseSha256Hasher(hasher)
hasher.Write(invertedHandshake.key()) // nolint: errcheck
hasher.Write(secret) // nolint: errcheck
hasher.Write(invertedHandshake.key())
hasher.Write(secret)
return makeAesCtr(hasher.Sum(nil), invertedHandshake.iv())
}
mtglib/internal/obfuscated2/client_handshake_test.go
+6 -2
View File
@@ -47,14 +47,18 @@ func (suite *ClientHandshakeTestSuite) TestOk() {
Once().
Return(len(snapshot.Decrypted.Text.data), nil).
Run(func(args mock.Arguments) {
arr := args.Get(0).([]byte)
arr, ok := args.Get(0).([]byte)
suite.True(ok)
copy(arr, snapshot.Decrypted.Cipher.data)
})
connMock.On("Write", mock.Anything).
Once().
Return(len(snapshot.Encrypted.Text.data), nil).
Run(func(args mock.Arguments) {
arr := args.Get(0).([]byte)
arr, ok := args.Get(0).([]byte)
suite.True(ok)
copy(writeData, arr)
})
mtglib/internal/obfuscated2/conn.go
+1 -1
View File
@@ -32,5 +32,5 @@ func (c Conn) Write(p []byte) (int, error) {
payload := buf.Bytes()
c.Encryptor.XORKeyStream(payload, payload)
return c.Conn.Write(payload)
return c.Conn.Write(payload) // nolint: wrapcheck
}
mtglib/internal/relay/init_test.go
+2 -2
View File
@@ -25,7 +25,7 @@ func (r *rwcMock) Read(p []byte) (int, error) {
return 0, io.EOF
}
return r.Buffer.Read(p)
return r.Buffer.Read(p) // nolint: wrapcheck
}
func (r *rwcMock) Write(p []byte) (int, error) {
@@ -36,7 +36,7 @@ func (r *rwcMock) Write(p []byte) (int, error) {
return 0, io.EOF
}
return r.Buffer.Write(p)
return r.Buffer.Write(p) // nolint: wrapcheck
}
func (r *rwcMock) Close() error {
mtglib/internal/relay/pools.go
+5 -1
View File
@@ -18,7 +18,11 @@ var relayPool = sync.Pool{
func AcquireRelay(ctx context.Context, logger Logger, bufferSize int, idleTimeout time.Duration) *Relay {
ctx, cancel := context.WithCancel(ctx)
r := relayPool.Get().(*Relay)
r, ok := relayPool.Get().(*Relay)
if !ok {
panic("Relay pool has no relay!")
}
r.ctx = ctx
r.ctxCancel = cancel
r.logger = logger
mtglib/stream_context.go
+1 -1
View File
@@ -27,7 +27,7 @@ func (s *streamContext) Done() <-chan struct{} {
}
func (s *streamContext) Err() error {
return s.ctx.Err()
return s.ctx.Err() // nolint: wrapcheck
}
func (s *streamContext) Value(key interface{}) interface{} {