diff --git a/events/event_stream.go b/events/event_stream.go index 7552d2e..dede8b0 100644 --- a/events/event_stream.go +++ b/events/event_stream.go @@ -64,7 +64,7 @@ func NewEventStream(observerFactories []ObserverFactory) EventStream { chans: make([]chan mtglib.Event, runtime.NumCPU()), } - for i := 0; i < runtime.NumCPU(); i++ { + for i := range runtime.NumCPU() { rv.chans[i] = make(chan mtglib.Event, 1) if len(observerFactories) == 1 { diff --git a/internal/config/type_bool_test.go b/internal/config/type_bool_test.go index 99d0488..8098f05 100644 --- a/internal/config/type_bool_test.go +++ b/internal/config/type_bool_test.go @@ -20,7 +20,7 @@ type TypeBoolTestSuite struct { } func (suite *TypeBoolTestSuite) TestUnmarshalFail() { - testData := []interface{}{ + testData := []any{ "", "np", "нет", @@ -29,7 +29,7 @@ func (suite *TypeBoolTestSuite) TestUnmarshalFail() { } for _, v := range testData { - data, err := json.Marshal(map[string]interface{}{ + data, err := json.Marshal(map[string]any{ "value": v, }) suite.NoError(err) diff --git a/logger/init.go b/logger/init.go index da4ff40..56906fc 100644 --- a/logger/init.go +++ b/logger/init.go @@ -8,5 +8,5 @@ package logger // commonly used by many 3pp tools. While mtglib itself does not need it, it is // always a good idea to support it and have a transient end to end logging. type StdLikeLogger interface { - Printf(format string, args ...interface{}) + Printf(format string, args ...any) } diff --git a/logger/noop.go b/logger/noop.go index 5d04b79..768e48b 100644 --- a/logger/noop.go +++ b/logger/noop.go @@ -8,7 +8,7 @@ func (n noopLogger) Named(_ string) mtglib.Logger { return n } func (n noopLogger) BindInt(_ string, _ int) mtglib.Logger { return n } func (n noopLogger) BindStr(_, _ string) mtglib.Logger { return n } func (n noopLogger) BindJSON(_, _ string) mtglib.Logger { return n } -func (n noopLogger) Printf(_ string, _ ...interface{}) {} +func (n noopLogger) Printf(_ string, _ ...any) {} func (n noopLogger) Info(_ string) {} func (n noopLogger) Warning(_ string) {} func (n noopLogger) Debug(_ string) {} diff --git a/logger/zerolog.go b/logger/zerolog.go index 4f9c9b7..4cf7cd6 100644 --- a/logger/zerolog.go +++ b/logger/zerolog.go @@ -78,7 +78,7 @@ func (z *zeroLogContext) BindJSON(name, value string) mtglib.Logger { } } -func (z *zeroLogContext) Printf(format string, args ...interface{}) { +func (z *zeroLogContext) Printf(format string, args ...any) { z.Debug(fmt.Sprintf(format, args...)) } diff --git a/mtglib/init.go b/mtglib/init.go index 40e3f41..81dee7a 100644 --- a/mtglib/init.go +++ b/mtglib/init.go @@ -249,7 +249,7 @@ type Logger interface { BindJSON(name, value string) Logger // Printf is to support log.Logger behavior. - Printf(format string, args ...interface{}) + Printf(format string, args ...any) // Info puts a message about some normal situation. Info(msg string) diff --git a/mtglib/init_internal_test.go b/mtglib/init_internal_test.go index b182d57..50833e8 100644 --- a/mtglib/init_internal_test.go +++ b/mtglib/init_internal_test.go @@ -8,17 +8,17 @@ import ( type NoopLogger struct{} -func (n NoopLogger) Named(_ string) Logger { return n } -func (n NoopLogger) BindInt(_ string, _ int) Logger { return n } -func (n NoopLogger) BindStr(_, _ string) Logger { return n } -func (n NoopLogger) BindJSON(_, _ string) Logger { return n } -func (n NoopLogger) Printf(_ string, _ ...interface{}) {} -func (n NoopLogger) Info(_ string) {} -func (n NoopLogger) Warning(_ string) {} -func (n NoopLogger) Debug(_ string) {} -func (n NoopLogger) InfoError(_ string, _ error) {} -func (n NoopLogger) WarningError(_ string, _ error) {} -func (n NoopLogger) DebugError(_ string, _ error) {} +func (n NoopLogger) Named(_ string) Logger { return n } +func (n NoopLogger) BindInt(_ string, _ int) Logger { return n } +func (n NoopLogger) BindStr(_, _ string) Logger { return n } +func (n NoopLogger) BindJSON(_, _ string) Logger { return n } +func (n NoopLogger) Printf(_ string, _ ...any) {} +func (n NoopLogger) Info(_ string) {} +func (n NoopLogger) Warning(_ string) {} +func (n NoopLogger) Debug(_ string) {} +func (n NoopLogger) InfoError(_ string, _ error) {} +func (n NoopLogger) WarningError(_ string, _ error) {} +func (n NoopLogger) DebugError(_ string, _ error) {} type EventStreamMock struct { mock.Mock diff --git a/mtglib/internal/faketls/client_hello.go b/mtglib/internal/faketls/client_hello.go index d27d769..0e5e5b4 100644 --- a/mtglib/internal/faketls/client_hello.go +++ b/mtglib/internal/faketls/client_hello.go @@ -76,7 +76,7 @@ func ParseClientHello(secret, handshake []byte) (ClientHello, error) { computedRandom := mac.Sum(nil) - for i := 0; i < RandomLen; i++ { + for i := range RandomLen { computedRandom[i] ^= hello.Random[i] } diff --git a/mtglib/internal/faketls/pools.go b/mtglib/internal/faketls/pools.go index 54183a0..b1f4275 100644 --- a/mtglib/internal/faketls/pools.go +++ b/mtglib/internal/faketls/pools.go @@ -6,7 +6,7 @@ import ( ) var bytesBufferPool = sync.Pool{ - New: func() interface{} { + New: func() any { return &bytes.Buffer{} }, } diff --git a/mtglib/internal/faketls/record/pools.go b/mtglib/internal/faketls/record/pools.go index cc4739a..4f758b7 100644 --- a/mtglib/internal/faketls/record/pools.go +++ b/mtglib/internal/faketls/record/pools.go @@ -5,7 +5,7 @@ import ( ) var recordPool = sync.Pool{ - New: func() interface{} { + New: func() any { return &Record{} }, } diff --git a/mtglib/internal/obfuscated2/handshake_frame.go b/mtglib/internal/obfuscated2/handshake_frame.go index 8fec889..0dd3c6c 100644 --- a/mtglib/internal/obfuscated2/handshake_frame.go +++ b/mtglib/internal/obfuscated2/handshake_frame.go @@ -63,7 +63,7 @@ func (h *handshakeFrame) connectionType() []byte { func (h *handshakeFrame) invert() handshakeFrame { copyFrame := *h - for i := 0; i < handshakeFrameLenKey+handshakeFrameLenIV; i++ { + for i := range handshakeFrameLenKey + handshakeFrameLenIV { copyFrame.data[handshakeFrameOffsetKey+i] = h.data[handshakeFrameOffsetConnectionType-1-i] } diff --git a/mtglib/internal/obfuscated2/init_test.go b/mtglib/internal/obfuscated2/init_test.go index 50d031c..5aa85a9 100644 --- a/mtglib/internal/obfuscated2/init_test.go +++ b/mtglib/internal/obfuscated2/init_test.go @@ -117,7 +117,7 @@ func NewServerHandshakeTestData(t *testing.T) ServerHandshakeTestData { serverEncryptedReverted := make([]byte, len(serverEncrypted)) - for i := 0; i < 32+16; i++ { + for i := range 32 + 16 { serverEncryptedReverted[8+i] = serverEncrypted[8+32+16-1-i] } diff --git a/mtglib/internal/obfuscated2/pools.go b/mtglib/internal/obfuscated2/pools.go index f714262..5f10fd2 100644 --- a/mtglib/internal/obfuscated2/pools.go +++ b/mtglib/internal/obfuscated2/pools.go @@ -9,12 +9,12 @@ import ( var ( sha256HasherPool = sync.Pool{ - New: func() interface{} { + New: func() any { return sha256.New() }, } bytesBufferPool = sync.Pool{ - New: func() interface{} { + New: func() any { return &bytes.Buffer{} }, } diff --git a/mtglib/internal/relay/init.go b/mtglib/internal/relay/init.go index a0dcb0c..8bcc66c 100644 --- a/mtglib/internal/relay/init.go +++ b/mtglib/internal/relay/init.go @@ -5,5 +5,5 @@ const ( ) type Logger interface { - Printf(msg string, args ...interface{}) + Printf(msg string, args ...any) } diff --git a/mtglib/internal/relay/init_test.go b/mtglib/internal/relay/init_test.go index e43244a..c884532 100644 --- a/mtglib/internal/relay/init_test.go +++ b/mtglib/internal/relay/init_test.go @@ -2,4 +2,4 @@ package relay_test type loggerMock struct{} -func (l loggerMock) Printf(format string, args ...interface{}) {} +func (l loggerMock) Printf(format string, args ...any) {} diff --git a/mtglib/internal/relay/pools.go b/mtglib/internal/relay/pools.go index 49ac7ac..db42933 100644 --- a/mtglib/internal/relay/pools.go +++ b/mtglib/internal/relay/pools.go @@ -3,7 +3,7 @@ package relay import "sync" var copyBufferPool = sync.Pool{ - New: func() interface{} { + New: func() any { rv := make([]byte, copyBufferSize) return &rv diff --git a/mtglib/proxy.go b/mtglib/proxy.go index 830a2f9..104c723 100644 --- a/mtglib/proxy.go +++ b/mtglib/proxy.go @@ -323,7 +323,7 @@ func NewProxy(opts ProxyOpts) (*Proxy, error) { } pool, err := ants.NewPoolWithFunc(opts.getConcurrency(), - func(arg interface{}) { + func(arg any) { proxy.ServeConn(arg.(essentials.Conn)) //nolint: forcetypeassert }, ants.WithLogger(opts.getLogger("ants")), diff --git a/mtglib/stream_context.go b/mtglib/stream_context.go index 3c6a739..3858282 100644 --- a/mtglib/stream_context.go +++ b/mtglib/stream_context.go @@ -32,7 +32,7 @@ func (s *streamContext) Err() error { return s.ctx.Err() //nolint: wrapcheck } -func (s *streamContext) Value(key interface{}) interface{} { +func (s *streamContext) Value(key any) any { return s.ctx.Value(key) } diff --git a/network/circuit_breaker_internal_test.go b/network/circuit_breaker_internal_test.go index 16a8443..fc7f671 100644 --- a/network/circuit_breaker_internal_test.go +++ b/network/circuit_breaker_internal_test.go @@ -59,7 +59,7 @@ func (suite *CircuitBreakerTestSuite) TestMultipleRunsOk() { suite.ctxCancel() }() - for i := 0; i < 5; i++ { + for range 5 { go func() { defer wg.Done() diff --git a/network/load_balanced_socks5_test.go b/network/load_balanced_socks5_test.go index 1d5e86c..96298ac 100644 --- a/network/load_balanced_socks5_test.go +++ b/network/load_balanced_socks5_test.go @@ -64,7 +64,7 @@ func (suite *LoadBalancedSocks5TestSuite) TestCannotDial() { }) suite.NoError(err) - for i := 0; i < network.ProxyDialerOpenThreshold*2; i++ { + for range network.ProxyDialerOpenThreshold * 2 { _, err = lbDialer.Dial("tcp", "127.1.1.1:80") suite.True(errors.Is(err, network.ErrCannotDialWithAllProxies)) } diff --git a/stats/pools.go b/stats/pools.go index a8c9621..f80286a 100644 --- a/stats/pools.go +++ b/stats/pools.go @@ -3,7 +3,7 @@ package stats import "sync" var streamInfoPool = sync.Pool{ - New: func() interface{} { + New: func() any { return &streamInfo{ tags: make(map[string]string), }