Skip to content
This repository was archived by the owner on Jun 5, 2021. It is now read-only.

Commit f5f4fe3

Browse files
committed
all: fix golangci-lint warnings
1 parent d62c688 commit f5f4fe3

File tree

8 files changed

+42
-34
lines changed

8 files changed

+42
-34
lines changed

.golangci.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,9 @@ issues:
9090
- linters: [godot]
9191
source: "\\/\\/\\s+}"
9292

93+
- linters: [gci]
94+
source: "#nosec"
95+
9396
linters:
9497
enable-all: true
9598
disable:
@@ -102,6 +105,10 @@ linters:
102105
- gomnd
103106
- goerr113
104107
- testpackage
108+
- errorlint
109+
- wrapcheck
110+
- exhaustivestruct
111+
- nlreturn
105112

106113
run:
107114
skip-dirs:

client_test.go

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -442,11 +442,9 @@ func TestDial(t *testing.T) {
442442
if err != nil {
443443
t.Fatal(err)
444444
}
445-
defer func() {
446-
if err = c.Close(); err != nil {
447-
t.Error(err)
448-
}
449-
}()
445+
if err = c.Close(); err != nil {
446+
t.Error(err)
447+
}
450448
}
451449

452450
func TestDialError(t *testing.T) {
@@ -455,6 +453,7 @@ func TestDialError(t *testing.T) {
455453
t.Fatal("error expected")
456454
}
457455
}
456+
458457
func TestClientCloseErr(t *testing.T) {
459458
response := MustBuild(TransactionID, BindingSuccess)
460459
response.Encode()
@@ -472,11 +471,9 @@ func TestClientCloseErr(t *testing.T) {
472471
if err != nil {
473472
log.Fatal(err)
474473
}
475-
defer func() {
476-
if err, ok := c.Close().(CloseErr); !ok || err.AgentErr != io.ErrUnexpectedEOF {
477-
t.Error("unexpected close err")
478-
}
479-
}()
474+
if err, ok := c.Close().(CloseErr); !ok || err.AgentErr != io.ErrUnexpectedEOF {
475+
t.Error("unexpected close err")
476+
}
480477
}
481478

482479
func TestWithNoConnClose(t *testing.T) {
@@ -618,13 +615,15 @@ func TestClientFinalizer(t *testing.T) {
618615
}
619616
clientFinalizer(c)
620617
reader := bufio.NewScanner(buf)
621-
var lines int
622-
var expectedLines = []string{
623-
"client: called finalizer on non-closed client: client not initialized",
624-
"client: called finalizer on non-closed client",
625-
"client: called finalizer on non-closed client: failed to close: " +
626-
"<nil> (connection), unexpected EOF (agent)",
627-
}
618+
var (
619+
lines int
620+
expectedLines = []string{
621+
"client: called finalizer on non-closed client: client not initialized",
622+
"client: called finalizer on non-closed client",
623+
"client: called finalizer on non-closed client: failed to close: " +
624+
"<nil> (connection), unexpected EOF (agent)",
625+
}
626+
)
628627
for reader.Scan() {
629628
if reader.Text() != expectedLines[lines] {
630629
t.Error(reader.Text(), "!=", expectedLines[lines])
@@ -855,6 +854,7 @@ func TestClient_DoConcurrent(t *testing.T) {
855854
1, 5, 10, 25, 100, 500,
856855
} {
857856
t.Run(fmt.Sprintf("%d", concurrency), func(t *testing.T) {
857+
t.Parallel()
858858
testClientDoConcurrent(t, concurrency)
859859
})
860860
}

cmd/stun-bench/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020

2121
var (
2222
workers = flag.Int("w", runtime.GOMAXPROCS(0), "concurrent workers")
23-
addr = flag.String("addr", fmt.Sprintf("localhost"), "target address")
23+
addr = flag.String("addr", "localhost", "target address")
2424
port = flag.Int("port", stun.DefaultPort, "target port")
2525
duration = flag.Duration("d", time.Minute, "benchmark duration")
2626
network = flag.String("net", "udp", "protocol to use (udp, tcp)")

cmd/stun-traversal/main.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,7 @@ import (
1313
"gortc.io/stun"
1414
)
1515

16-
var (
17-
server = flag.String("server", fmt.Sprintf("gortc.io:3478"), "Stun server address")
18-
)
16+
var server = flag.String("server", "gortc.io:3478", "Stun server address")
1917

2018
const (
2119
udp = "udp4"

fuzz.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@ import (
77
"fmt"
88
)
99

10-
var (
11-
m = New()
12-
)
10+
var m = New()
1311

1412
// FuzzMessage is go-fuzz endpoint for message.
1513
func FuzzMessage(data []byte) int {
@@ -96,7 +94,7 @@ func FuzzSetters(data []byte) int {
9694
{new(MappedAddress), AttrMappedAddress},
9795
{new(Realm), AttrRealm},
9896
}
99-
var firstByte = byte(0)
97+
firstByte := byte(0)
10098
if len(data) > 0 {
10199
firstByte = data[0]
102100
}

integrity_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ func BenchmarkMessageIntegrity_AddTo(b *testing.B) {
102102
m.Reset()
103103
}
104104
}
105+
105106
func BenchmarkMessageIntegrity_Check(b *testing.B) {
106107
m := new(Message)
107108
// TODO: Find a way to make this test zero-alloc without excessive pre-alloc.

message.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -416,7 +416,7 @@ const (
416416
var (
417417
// Binding request message type.
418418
BindingRequest = NewType(MethodBinding, ClassRequest)
419-
// Binding success response message type
419+
// Binding success response message type.
420420
BindingSuccess = NewType(MethodBinding, ClassSuccessResponse)
421421
// Binding error response message type.
422422
BindingError = NewType(MethodBinding, ClassErrorResponse)

message_test.go

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ func BenchmarkMessage_Write(b *testing.B) {
6464
}
6565

6666
func TestMessageType_Value(t *testing.T) {
67-
var tests = []struct {
67+
tests := []struct {
6868
in MessageType
6969
out uint16
7070
}{
@@ -82,7 +82,7 @@ func TestMessageType_Value(t *testing.T) {
8282
}
8383

8484
func TestMessageType_ReadValue(t *testing.T) {
85-
var tests = []struct {
85+
tests := []struct {
8686
in uint16
8787
out MessageType
8888
}{
@@ -100,7 +100,7 @@ func TestMessageType_ReadValue(t *testing.T) {
100100
}
101101

102102
func TestMessageType_ReadWriteValue(t *testing.T) {
103-
var tests = []MessageType{
103+
tests := []MessageType{
104104
{Method: MethodBinding, Class: ClassRequest},
105105
{Method: MethodBinding, Class: ClassSuccessResponse},
106106
{Method: MethodBinding, Class: ClassErrorResponse},
@@ -197,8 +197,10 @@ func TestMessage_AttrLengthLessThanHeader(t *testing.T) {
197197

198198
func TestMessage_AttrSizeLessThanLength(t *testing.T) {
199199
mType := MessageType{Method: MethodBinding, Class: ClassRequest}
200-
messageAttribute := RawAttribute{Length: 4,
201-
Value: []byte{1, 2, 3, 4}, Type: 0x1,
200+
messageAttribute := RawAttribute{
201+
Length: 4,
202+
Value: []byte{1, 2, 3, 4},
203+
Type: 0x1,
202204
}
203205
messageAttributes := Attributes{
204206
messageAttribute,
@@ -497,7 +499,7 @@ func TestIsMessage(t *testing.T) {
497499
NewSoftware("software").AddTo(m)
498500
m.WriteHeader()
499501

500-
var tt = [...]struct {
502+
tt := [...]struct {
501503
in []byte
502504
out bool
503505
}{
@@ -506,9 +508,11 @@ func TestIsMessage(t *testing.T) {
506508
{[]byte{1, 2, 4}, false}, // 2
507509
{[]byte{1, 2, 4, 5, 6, 7, 8, 9, 20}, false}, // 3
508510
{m.Raw, true}, // 5
509-
{[]byte{0, 0, 0, 0, 33, 18,
511+
{[]byte{
512+
0, 0, 0, 0, 33, 18,
510513
164, 66, 0, 0, 0, 0, 0,
511-
0, 0, 0, 0, 0, 0, 0, 0}, true}, // 6
514+
0, 0, 0, 0, 0, 0, 0, 0,
515+
}, true}, // 6
512516
}
513517
for i, v := range tt {
514518
if got := IsMessage(v.in); got != v.out {

0 commit comments

Comments
 (0)