Correct linter issues

ackleymi · ackleymi · commit c74764cc6a16 · 2022-07-15T03:58:27.000Z
diff --git a/.golangci.yml b/.golangci.yml
@@ -15,9 +15,7 @@ linters:
     - govet
     - ineffassign
     - misspell
-    - nakedret
     - revive
-    - structcheck
     - unused
     - varcheck
     - staticcheck
@@ -26,6 +24,6 @@ linters-settings:
   gofmt:
     simplify: true
   goimports:
-    local-prefixes: helm.sh/helm/v3
+    local-prefixes: github.com/quickfixgo/quickfix
   dupl:
     threshold: 400
diff --git a/Makefile b/Makefile
@@ -1,3 +1,26 @@
+GOBIN         = $(shell go env GOBIN)
+ifeq ($(GOBIN),)
+GOBIN         = $(shell go env GOPATH)/bin
+endif
+GOX           = $(GOBIN)/gox
+GOIMPORTS     = $(GOBIN)/goimports
+ARCH          = $(shell uname -p)
+
+# ------------------------------------------------------------------------------
+#  dependencies
+
+# If go install is run from inside the project directory it will add the
+# dependencies to the go.mod file. To avoid that we change to a directory
+# without a go.mod file when downloading the following dependencies
+
+$(GOX):
+	(cd /; GO111MODULE=on go install github.com/mitchellh/gox@latest)
+
+$(GOIMPORTS):
+	(cd /; GO111MODULE=on go install golang.org/x/tools/cmd/goimports@latest)
+
+# ------------------------------------------------------------------------------
+
 all: vet test
 
 clean:
@@ -13,6 +36,10 @@ generate-dist:
 test-style:
 	GO111MODULE=on golangci-lint run
 
+.PHONY: format
+format: $(GOIMPORTS)
+	GO111MODULE=on go list -f '{{.Dir}}' ./... | xargs $(GOIMPORTS) -w -local github.com/quickfixgo/quickfix
+
 fmt:
 	go fmt `go list ./... | grep -v quickfix/gen`
 
diff --git a/acceptor.go b/acceptor.go
@@ -11,6 +11,7 @@ import (
 	"sync"
 
 	proxyproto "github.com/armon/go-proxyproto"
+
 	"github.com/quickfixgo/quickfix/config"
 )
 
diff --git a/datadictionary/component_type_test.go b/datadictionary/component_type_test.go
@@ -3,8 +3,9 @@ package datadictionary_test
 import (
 	"testing"
 
-	"github.com/quickfixgo/quickfix/datadictionary"
 	"github.com/stretchr/testify/assert"
+
+	"github.com/quickfixgo/quickfix/datadictionary"
 )
 
 func TestNewComponentType(t *testing.T) {
diff --git a/datadictionary/field_def_test.go b/datadictionary/field_def_test.go
@@ -3,8 +3,9 @@ package datadictionary_test
 import (
 	"testing"
 
-	"github.com/quickfixgo/quickfix/datadictionary"
 	"github.com/stretchr/testify/assert"
+
+	"github.com/quickfixgo/quickfix/datadictionary"
 )
 
 func TestNewFieldDef(t *testing.T) {
diff --git a/datadictionary/field_type_test.go b/datadictionary/field_type_test.go
@@ -3,8 +3,9 @@ package datadictionary_test
 import (
 	"testing"
 
-	"github.com/quickfixgo/quickfix/datadictionary"
 	"github.com/stretchr/testify/assert"
+
+	"github.com/quickfixgo/quickfix/datadictionary"
 )
 
 func TestNewFieldType(t *testing.T) {
diff --git a/datadictionary/group_field_def_test.go b/datadictionary/group_field_def_test.go
@@ -3,8 +3,9 @@ package datadictionary_test
 import (
 	"testing"
 
-	"github.com/quickfixgo/quickfix/datadictionary"
 	"github.com/stretchr/testify/assert"
+
+	"github.com/quickfixgo/quickfix/datadictionary"
 )
 
 func TestNewGroupField(t *testing.T) {
diff --git a/datadictionary/message_def_test.go b/datadictionary/message_def_test.go
@@ -3,8 +3,9 @@ package datadictionary_test
 import (
 	"testing"
 
-	"github.com/quickfixgo/quickfix/datadictionary"
 	"github.com/stretchr/testify/assert"
+
+	"github.com/quickfixgo/quickfix/datadictionary"
 )
 
 func TestNewMessageDef(t *testing.T) {
diff --git a/dialer.go b/dialer.go
@@ -4,8 +4,9 @@ import (
 	"fmt"
 	"net"
 
-	"github.com/quickfixgo/quickfix/config"
 	"golang.org/x/net/proxy"
+
+	"github.com/quickfixgo/quickfix/config"
 )
 
 func loadDialerConfig(settings *SessionSettings) (dialer proxy.Dialer, err error) {
diff --git a/dialer_test.go b/dialer_test.go
@@ -5,8 +5,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/quickfixgo/quickfix/config"
 	"github.com/stretchr/testify/suite"
+
+	"github.com/quickfixgo/quickfix/config"
 )
 
 type DialerTestSuite struct {
diff --git a/in_session_test.go b/in_session_test.go
@@ -4,8 +4,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/quickfixgo/quickfix/internal"
 	"github.com/stretchr/testify/suite"
+
+	"github.com/quickfixgo/quickfix/internal"
 )
 
 type InSessionTestSuite struct {
diff --git a/logon_state_test.go b/logon_state_test.go
@@ -5,8 +5,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/quickfixgo/quickfix/internal"
 	"github.com/stretchr/testify/suite"
+
+	"github.com/quickfixgo/quickfix/internal"
 )
 
 type LogonStateTestSuite struct {
@@ -82,7 +83,7 @@ func (s *LogonStateTestSuite) TestFixMsgInLogon() {
 	s.MockApp.AssertExpectations(s.T())
 
 	s.State(inSession{})
-	s.Equal(32*time.Second, s.session.HeartBtInt)  //should be written from logon message
+	s.Equal(32*time.Second, s.session.HeartBtInt) //should be written from logon message
 	s.False(s.session.HeartBtIntOverride)
 
 	s.LastToAdminMessageSent()
diff --git a/logout_state_test.go b/logout_state_test.go
@@ -3,8 +3,9 @@ package quickfix
 import (
 	"testing"
 
-	"github.com/quickfixgo/quickfix/internal"
 	"github.com/stretchr/testify/suite"
+
+	"github.com/quickfixgo/quickfix/internal"
 )
 
 type LogoutStateTestSuite struct {
diff --git a/message.go b/message.go
@@ -114,7 +114,7 @@ func NewMessage() *Message {
 	return m
 }
 
-// CopyInto erases the dest messages and copies the curreny message content
+// CopyInto erases the dest messages and copies the currency message content
 // into it.
 func (m *Message) CopyInto(to *Message) {
 	m.Header.CopyInto(&to.Header.FieldMap)
diff --git a/message_test.go b/message_test.go
@@ -5,8 +5,9 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/quickfixgo/quickfix/datadictionary"
 	"github.com/stretchr/testify/suite"
+
+	"github.com/quickfixgo/quickfix/datadictionary"
 )
 
 func BenchmarkParseMessage(b *testing.B) {
diff --git a/mongostore.go b/mongostore.go
@@ -7,6 +7,7 @@ import (
 	"github.com/globalsign/mgo"
 	"github.com/globalsign/mgo/bson"
 	"github.com/pkg/errors"
+
 	"github.com/quickfixgo/quickfix/config"
 )
 
diff --git a/parser.go b/parser.go
@@ -11,7 +11,6 @@ const (
 	defaultBufSize = 4096
 )
 
-
 type parser struct {
 	//buffer is a slice of bigBuffer
 	bigBuffer, buffer []byte
diff --git a/pending_timeout_test.go b/pending_timeout_test.go
@@ -3,8 +3,9 @@ package quickfix
 import (
 	"testing"
 
-	"github.com/quickfixgo/quickfix/internal"
 	"github.com/stretchr/testify/suite"
+
+	"github.com/quickfixgo/quickfix/internal"
 )
 
 type PendingTimeoutTestSuite struct {
diff --git a/quickfix_test.go b/quickfix_test.go
@@ -3,10 +3,11 @@ package quickfix
 import (
 	"time"
 
-	"github.com/quickfixgo/quickfix/internal"
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
+
+	"github.com/quickfixgo/quickfix/internal"
 )
 
 type QuickFIXSuite struct {
diff --git a/resend_state_test.go b/resend_state_test.go
@@ -3,8 +3,9 @@ package quickfix
 import (
 	"testing"
 
-	"github.com/quickfixgo/quickfix/internal"
 	"github.com/stretchr/testify/suite"
+
+	"github.com/quickfixgo/quickfix/internal"
 )
 
 type resendStateTestSuite struct {
diff --git a/session_factory_test.go b/session_factory_test.go
@@ -4,9 +4,10 @@ import (
 	"testing"
 	"time"
 
+	"github.com/stretchr/testify/suite"
+
 	"github.com/quickfixgo/quickfix/config"
 	"github.com/quickfixgo/quickfix/internal"
-	"github.com/stretchr/testify/suite"
 )
 
 type SessionFactorySuite struct {
diff --git a/session_id.go b/session_id.go
@@ -2,7 +2,7 @@ package quickfix
 
 import "bytes"
 
-// SessionID is a unique identifer of a Session
+// SessionID is a unique identifier of a Session
 type SessionID struct {
 	BeginString, TargetCompID, TargetSubID, TargetLocationID, SenderCompID, SenderSubID, SenderLocationID, Qualifier string
 }
diff --git a/settings_test.go b/settings_test.go
@@ -4,10 +4,11 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/quickfixgo/quickfix/config"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
+
+	"github.com/quickfixgo/quickfix/config"
 )
 
 func TestSettings_New(t *testing.T) {
diff --git a/sqlstore.go b/sqlstore.go
@@ -7,6 +7,7 @@ import (
 	"time"
 
 	"github.com/pkg/errors"
+
 	"github.com/quickfixgo/quickfix/config"
 )
 
diff --git a/tls_test.go b/tls_test.go
@@ -4,8 +4,9 @@ import (
 	"crypto/tls"
 	"testing"
 
-	"github.com/quickfixgo/quickfix/config"
 	"github.com/stretchr/testify/suite"
+
+	"github.com/quickfixgo/quickfix/config"
 )
 
 type TLSTestSuite struct {
diff --git a/validation_test.go b/validation_test.go
@@ -5,8 +5,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/quickfixgo/quickfix/datadictionary"
 	"github.com/stretchr/testify/assert"
+
+	"github.com/quickfixgo/quickfix/datadictionary"
 )
 
 type validateTest struct {

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@ import (`
`11`	`11`	`"sync"`
`12`	`12`
`13`	`13`	`proxyproto "github.com/armon/go-proxyproto"`
	`14`	`+`
`14`	`15`	`"github.com/quickfixgo/quickfix/config"`
`15`	`16`	`)`
`16`	`17`
Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,9 @@ package datadictionary_test`
`3`	`3`	`import (`
`4`	`4`	`"testing"`
`5`	`5`
`6`		`- "github.com/quickfixgo/quickfix/datadictionary"`
`7`	`6`	`"github.com/stretchr/testify/assert"`
	`7`	`+`
	`8`	`+ "github.com/quickfixgo/quickfix/datadictionary"`
`8`	`9`	`)`
`9`	`10`
`10`	`11`	`func TestNewComponentType(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,9 @@ import (`
`4`	`4`	`"fmt"`
`5`	`5`	`"net"`
`6`	`6`
`7`		`- "github.com/quickfixgo/quickfix/config"`
`8`	`7`	`"golang.org/x/net/proxy"`
	`8`	`+`
	`9`	`+ "github.com/quickfixgo/quickfix/config"`
`9`	`10`	`)`
`10`	`11`
`11`	`12`	`func loadDialerConfig(settings *SessionSettings) (dialer proxy.Dialer, err error) {`
Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,9 @@ import (`
`5`	`5`	`"testing"`
`6`	`6`	`"time"`
`7`	`7`
`8`		`- "github.com/quickfixgo/quickfix/config"`
`9`	`8`	`"github.com/stretchr/testify/suite"`
	`9`	`+`
	`10`	`+ "github.com/quickfixgo/quickfix/config"`
`10`	`11`	`)`
`11`	`12`
`12`	`13`	`type DialerTestSuite struct {`