Merge pull request #626 from ackleymi/main

ackleymi · web-flow · commit 9886e6861db4 · 2024-04-17T21:34:17.000-05:00
Update and satisfy code linter
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -21,15 +21,14 @@ jobs:
     name: Linter
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-go@v4
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
         with:
           go-version: '1.21'
-          cache: false
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v3
+        uses: golangci/golangci-lint-action@v4
         with:
-          version: v1.51
+          version: v1.57.2
 
   build:
     name: build
diff --git a/.golangci.yml b/.golangci.yml
@@ -1,6 +1,12 @@
 run:
   timeout: 10m
-  skip-dirs:
+  # deprecated config - 
+  # skip-dirs:
+  #   - gen
+  #   - vendor
+
+issues:
+  exclude-dirs:
     - gen
     - vendor
 
diff --git a/Makefile b/Makefile
@@ -19,7 +19,7 @@ test:
 linters-install:
 	@golangci-lint --version >/dev/null 2>&1 || { \
 		echo "installing linting tools..."; \
-		curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s v1.50.1; \
+		curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s v1.57.2; \
 	}
 
 lint: linters-install
diff --git a/datadictionary/datadictionary.go b/datadictionary/datadictionary.go
@@ -315,7 +315,7 @@ func Parse(path string) (*DataDictionary, error) {
 func ParseSrc(xmlSrc io.Reader) (*DataDictionary, error) {
 	doc := new(XMLDoc)
 	decoder := xml.NewDecoder(xmlSrc)
-	decoder.CharsetReader = func(encoding string, input io.Reader) (io.Reader, error) {
+	decoder.CharsetReader = func(_ string, input io.Reader) (io.Reader, error) {
 		return input, nil
 	}
 
diff --git a/logon_state.go b/logon_state.go
@@ -68,7 +68,7 @@ func (s logonState) Timeout(session *session, e internal.Event) (nextState sessi
 	return s
 }
 
-func (s logonState) Stop(session *session) (nextState sessionState) {
+func (s logonState) Stop(_ *session) (nextState sessionState) {
 	return latentState{}
 }
 
diff --git a/logout_state.go b/logout_state.go
@@ -40,6 +40,6 @@ func (state logoutState) Timeout(session *session, event internal.Event) (nextSt
 	return state
 }
 
-func (state logoutState) Stop(session *session) (nextstate sessionState) {
+func (state logoutState) Stop(_ *session) (nextstate sessionState) {
 	return state
 }
diff --git a/memorystore.go b/memorystore.go
@@ -109,7 +109,7 @@ func (store *memoryStore) GetMessages(beginSeqNum, endSeqNum int) ([][]byte, err
 
 type memoryStoreFactory struct{}
 
-func (f memoryStoreFactory) Create(sessionID SessionID) (MessageStore, error) {
+func (f memoryStoreFactory) Create(_ SessionID) (MessageStore, error) {
 	m := new(memoryStore)
 	if err := m.Reset(); err != nil {
 		return m, errors.Wrap(err, "reset")
diff --git a/message.go b/message.go
@@ -152,7 +152,7 @@ func ParseMessageWithDataDictionary(
 	msg *Message,
 	rawMessage *bytes.Buffer,
 	transportDataDictionary *datadictionary.DataDictionary,
-	applicationDataDictionary *datadictionary.DataDictionary,
+	_ *datadictionary.DataDictionary,
 ) (err error) {
 	msg.Header.Clear()
 	msg.Body.Clear()
@@ -322,7 +322,7 @@ func (m *Message) IsMsgTypeOf(msgType string) bool {
 func (m *Message) reverseRoute() *Message {
 	reverseMsg := NewMessage()
 
-	copy := func(src Tag, dest Tag) {
+	copyFunc := func(src Tag, dest Tag) {
 		var field FIXString
 		if m.Header.GetField(src, &field) == nil {
 			if len(field) != 0 {
@@ -331,25 +331,25 @@ func (m *Message) reverseRoute() *Message {
 		}
 	}
 
-	copy(tagSenderCompID, tagTargetCompID)
-	copy(tagSenderSubID, tagTargetSubID)
-	copy(tagSenderLocationID, tagTargetLocationID)
+	copyFunc(tagSenderCompID, tagTargetCompID)
+	copyFunc(tagSenderSubID, tagTargetSubID)
+	copyFunc(tagSenderLocationID, tagTargetLocationID)
 
-	copy(tagTargetCompID, tagSenderCompID)
-	copy(tagTargetSubID, tagSenderSubID)
-	copy(tagTargetLocationID, tagSenderLocationID)
+	copyFunc(tagTargetCompID, tagSenderCompID)
+	copyFunc(tagTargetSubID, tagSenderSubID)
+	copyFunc(tagTargetLocationID, tagSenderLocationID)
 
-	copy(tagOnBehalfOfCompID, tagDeliverToCompID)
-	copy(tagOnBehalfOfSubID, tagDeliverToSubID)
-	copy(tagDeliverToCompID, tagOnBehalfOfCompID)
-	copy(tagDeliverToSubID, tagOnBehalfOfSubID)
+	copyFunc(tagOnBehalfOfCompID, tagDeliverToCompID)
+	copyFunc(tagOnBehalfOfSubID, tagDeliverToSubID)
+	copyFunc(tagDeliverToCompID, tagOnBehalfOfCompID)
+	copyFunc(tagDeliverToSubID, tagOnBehalfOfSubID)
 
 	// Tags added in 4.1.
 	var beginString FIXString
 	if m.Header.GetField(tagBeginString, &beginString) == nil {
 		if string(beginString) != BeginStringFIX40 {
-			copy(tagOnBehalfOfLocationID, tagDeliverToLocationID)
-			copy(tagDeliverToLocationID, tagOnBehalfOfLocationID)
+			copyFunc(tagOnBehalfOfLocationID, tagDeliverToLocationID)
+			copyFunc(tagDeliverToLocationID, tagOnBehalfOfLocationID)
 		}
 	}
 
diff --git a/null_log.go b/null_log.go
@@ -17,17 +17,17 @@ package quickfix
 
 type nullLog struct{}
 
-func (l nullLog) OnIncoming([]byte)                        {}
-func (l nullLog) OnOutgoing([]byte)                        {}
-func (l nullLog) OnEvent(string)                           {}
-func (l nullLog) OnEventf(format string, a ...interface{}) {}
+func (l nullLog) OnIncoming([]byte)                   {}
+func (l nullLog) OnOutgoing([]byte)                   {}
+func (l nullLog) OnEvent(string)                      {}
+func (l nullLog) OnEventf(_ string, _ ...interface{}) {}
 
 type nullLogFactory struct{}
 
 func (nullLogFactory) Create() (Log, error) {
 	return nullLog{}, nil
 }
-func (nullLogFactory) CreateSessionLog(sessionID SessionID) (Log, error) {
+func (nullLogFactory) CreateSessionLog(_ SessionID) (Log, error) {
 	return nullLog{}, nil
 }
 
diff --git a/quickfix_test.go b/quickfix_test.go
@@ -85,26 +85,26 @@ type MockApp struct {
 	lastToApp       *Message
 }
 
-func (e *MockApp) OnCreate(sessionID SessionID) {
+func (e *MockApp) OnCreate(_ SessionID) {
 }
 
-func (e *MockApp) OnLogon(sessionID SessionID) {
+func (e *MockApp) OnLogon(_ SessionID) {
 	e.Called()
 }
 
-func (e *MockApp) OnLogout(sessionID SessionID) {
+func (e *MockApp) OnLogout(_ SessionID) {
 	e.Called()
 }
 
-func (e *MockApp) FromAdmin(msg *Message, sessionID SessionID) (reject MessageRejectError) {
+func (e *MockApp) FromAdmin(_ *Message, _ SessionID) (reject MessageRejectError) {
 	if err, ok := e.Called().Get(0).(MessageRejectError); ok {
 		return err
 	}
 
 	return nil
 }
 
-func (e *MockApp) ToAdmin(msg *Message, sessionID SessionID) {
+func (e *MockApp) ToAdmin(msg *Message, _ SessionID) {
 	e.Called()
 
 	if e.decorateToAdmin != nil {
@@ -114,12 +114,12 @@ func (e *MockApp) ToAdmin(msg *Message, sessionID SessionID) {
 	e.lastToAdmin = msg
 }
 
-func (e *MockApp) ToApp(msg *Message, sessionID SessionID) (err error) {
+func (e *MockApp) ToApp(msg *Message, _ SessionID) (err error) {
 	e.lastToApp = msg
 	return e.Called().Error(0)
 }
 
-func (e *MockApp) FromApp(msg *Message, sessionID SessionID) (reject MessageRejectError) {
+func (e *MockApp) FromApp(_ *Message, _ SessionID) (reject MessageRejectError) {
 	if err, ok := e.Called().Get(0).(MessageRejectError); ok {
 		return err
 	}
diff --git a/session_factory_test.go b/session_factory_test.go
@@ -373,7 +373,7 @@ func (s *SessionFactorySuite) TestInvalidWeekdays() {
 	}
 
 	for _, testcase := range testcases {
-		s.T().Run(testcase.label, func(t *testing.T) {
+		s.T().Run(testcase.label, func(_ *testing.T) {
 			s.SessionSettings.Set(config.Weekdays, testcase.input)
 
 			_, err := s.newSession(s.SessionID, s.MessageStoreFactory, s.SessionSettings, s.LogFactory, s.App)
diff --git a/store/sql/sqlstore.go b/store/sql/sqlstore.go
@@ -50,10 +50,10 @@ func sqlString(raw string, placeholder placeholderFunc) string {
 		return raw
 	}
 	idx := 0
-	return rePlaceholder.ReplaceAllStringFunc(raw, func(s string) string {
-		new := placeholder(idx)
+	return rePlaceholder.ReplaceAllStringFunc(raw, func(_ string) string {
+		p := placeholder(idx)
 		idx++
-		return new
+		return p
 	})
 }
 
diff --git a/validation.go b/validation.go
@@ -149,7 +149,7 @@ func validateFIXT(transportDD, appDD *datadictionary.DataDictionary, settings Va
 	return nil
 }
 
-func validateMsgType(d *datadictionary.DataDictionary, msgType string, msg *Message) MessageRejectError {
+func validateMsgType(d *datadictionary.DataDictionary, msgType string, _ *Message) MessageRejectError {
 	if _, validMsgType := d.Messages[msgType]; !validMsgType {
 		return InvalidMessageType()
 	}
@@ -296,7 +296,7 @@ func validateRequired(transportDD *datadictionary.DataDictionary, appDD *datadic
 	return nil
 }
 
-func validateRequiredFieldMap(msg *Message, requiredTags map[int]struct{}, fieldMap FieldMap) MessageRejectError {
+func validateRequiredFieldMap(_ *Message, requiredTags map[int]struct{}, fieldMap FieldMap) MessageRejectError {
 	for required := range requiredTags {
 		requiredTag := Tag(required)
 		if !fieldMap.Has(requiredTag) {
@@ -328,7 +328,7 @@ func validateFields(transportDD *datadictionary.DataDictionary, appDD *datadicti
 	return nil
 }
 
-func validateField(d *datadictionary.DataDictionary, validFields datadictionary.TagSet, field TagValue) MessageRejectError {
+func validateField(d *datadictionary.DataDictionary, _ datadictionary.TagSet, field TagValue) MessageRejectError {
 	if len(field.value) == 0 {
 		return TagSpecifiedWithoutAValue(field.tag)
 	}

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ test:`
`19`	`19`	`linters-install:`
`20`	`20`	`@golangci-lint --version >/dev/null 2>&1 \|\| { \`
`21`	`21`	`echo "installing linting tools..."; \`
`22`		`- curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh\| sh -s v1.50.1; \`
	`22`	`+ curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh\| sh -s v1.57.2; \`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`lint: linters-install`
Original file line number	Diff line number	Diff line change
`@@ -315,7 +315,7 @@ func Parse(path string) (*DataDictionary, error) {`
`315`	`315`	`func ParseSrc(xmlSrc io.Reader) (*DataDictionary, error) {`
`316`	`316`	`doc := new(XMLDoc)`
`317`	`317`	`decoder := xml.NewDecoder(xmlSrc)`
`318`		`- decoder.CharsetReader = func(encoding string, input io.Reader) (io.Reader, error) {`
	`318`	`+ decoder.CharsetReader = func(_ string, input io.Reader) (io.Reader, error) {`
`319`	`319`	`return input, nil`
`320`	`320`	`}`
`321`	`321`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ func (s logonState) Timeout(session *session, e internal.Event) (nextState sessi`
`68`	`68`	`return s`
`69`	`69`	`}`
`70`	`70`
`71`		`-func (s logonState) Stop(session *session) (nextState sessionState) {`
	`71`	`+func (s logonState) Stop(_ *session) (nextState sessionState) {`
`72`	`72`	`return latentState{}`
`73`	`73`	`}`
`74`	`74`
Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,6 @@ func (state logoutState) Timeout(session *session, event internal.Event) (nextSt`
`40`	`40`	`return state`
`41`	`41`	`}`
`42`	`42`
`43`		`-func (state logoutState) Stop(session *session) (nextstate sessionState) {`
	`43`	`+func (state logoutState) Stop(_ *session) (nextstate sessionState) {`
`44`	`44`	`return state`
`45`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -85,26 +85,26 @@ type MockApp struct {`
`85`	`85`	`lastToApp *Message`
`86`	`86`	`}`
`87`	`87`
`88`		`-func (e *MockApp) OnCreate(sessionID SessionID) {`
	`88`	`+func (e *MockApp) OnCreate(_ SessionID) {`
`89`	`89`	`}`
`90`	`90`
`91`		`-func (e *MockApp) OnLogon(sessionID SessionID) {`
	`91`	`+func (e *MockApp) OnLogon(_ SessionID) {`
`92`	`92`	`e.Called()`
`93`	`93`	`}`
`94`	`94`
`95`		`-func (e *MockApp) OnLogout(sessionID SessionID) {`
	`95`	`+func (e *MockApp) OnLogout(_ SessionID) {`
`96`	`96`	`e.Called()`
`97`	`97`	`}`
`98`	`98`
`99`		`-func (e MockApp) FromAdmin(msg Message, sessionID SessionID) (reject MessageRejectError) {`
	`99`	`+func (e MockApp) FromAdmin(_ Message, _ SessionID) (reject MessageRejectError) {`
`100`	`100`	`if err, ok := e.Called().Get(0).(MessageRejectError); ok {`
`101`	`101`	`return err`
`102`	`102`	`}`
`103`	`103`
`104`	`104`	`return nil`
`105`	`105`	`}`
`106`	`106`
`107`		`-func (e MockApp) ToAdmin(msg Message, sessionID SessionID) {`
	`107`	`+func (e MockApp) ToAdmin(msg Message, _ SessionID) {`
`108`	`108`	`e.Called()`
`109`	`109`
`110`	`110`	`if e.decorateToAdmin != nil {`
`@@ -114,12 +114,12 @@ func (e MockApp) ToAdmin(msg Message, sessionID SessionID) {`
`114`	`114`	`e.lastToAdmin = msg`
`115`	`115`	`}`
`116`	`116`
`117`		`-func (e MockApp) ToApp(msg Message, sessionID SessionID) (err error) {`
	`117`	`+func (e MockApp) ToApp(msg Message, _ SessionID) (err error) {`
`118`	`118`	`e.lastToApp = msg`
`119`	`119`	`return e.Called().Error(0)`
`120`	`120`	`}`
`121`	`121`
`122`		`-func (e MockApp) FromApp(msg Message, sessionID SessionID) (reject MessageRejectError) {`
	`122`	`+func (e MockApp) FromApp(_ Message, _ SessionID) (reject MessageRejectError) {`
`123`	`123`	`if err, ok := e.Called().Get(0).(MessageRejectError); ok {`
`124`	`124`	`return err`
`125`	`125`	`}`