Skip to content

Commit fdcb6a1

Browse files
committed
Satisfies linter
1 parent aa15928 commit fdcb6a1

File tree

3 files changed

+25
-25
lines changed

3 files changed

+25
-25
lines changed

_test/test-server/main.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -185,19 +185,19 @@ func main() {
185185
http.HandleFunc("/seqnum", func(w http.ResponseWriter, r *http.Request) {
186186
defer w.WriteHeader(http.StatusOK)
187187
queryParams := r.URL.Query()
188-
sessionStr, ok := queryParams["SESSION"]
188+
sessionStr, ok := queryParams["SESSION"]
189189
if !ok {
190190
fmt.Println("cannot find session")
191191
os.Exit(1)
192192
}
193193
splts := strings.Split(sessionStr[0], ":")
194194
parties := strings.Split(splts[1], "->")
195195
sessionID := quickfix.SessionID{
196-
BeginString: splts[0],
196+
BeginString: splts[0],
197197
SenderCompID: parties[0],
198198
TargetCompID: parties[1],
199199
}
200-
num, ok := queryParams["NEXTTARGETSEQNUM"]
200+
num, ok := queryParams["NEXTTARGETSEQNUM"]
201201
if ok {
202202
seqnumInt, cErr := strconv.Atoi(num[0])
203203
if cErr != nil {
@@ -213,7 +213,7 @@ func main() {
213213
return
214214
}
215215

216-
num, ok = queryParams["NEXTSENDERSEQNUM"]
216+
num, ok = queryParams["NEXTSENDERSEQNUM"]
217217
if ok {
218218
seqnumInt, cErr := strconv.Atoi(num[0])
219219
if cErr != nil {
@@ -225,10 +225,10 @@ func main() {
225225
fmt.Println("err setting sender seqnum: " + setErr.Error())
226226
return
227227
}
228-
fmt.Println("set sender seqnum to: "+num[0])
228+
fmt.Println("set sender seqnum to: " + num[0])
229229
return
230230
}
231-
231+
232232
fmt.Println("never found seqnum")
233233
os.Exit(1)
234234
})

config/configuration.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1020,8 +1020,8 @@ const (
10201020
// - N
10211021
EnableLastMsgSeqNumProcessed string = "EnableLastMsgSeqNumProcessed"
10221022

1023-
// EnableNextExpectedMsgSeqNum tells the FIX engine to add tag NextExpectedMsgSeqNum (optional tag 789) on the
1024-
// sent Logon message and use value of tag 789 on received Logon message to synchronize session.
1023+
// EnableNextExpectedMsgSeqNum tells the FIX engine to add tag NextExpectedMsgSeqNum (optional tag 789) on the
1024+
// sent Logon message and use value of tag 789 on received Logon message to synchronize session.
10251025
// This should not be enabled for FIX versions less than FIX.4.4.
10261026
//
10271027
// Required: No
@@ -1031,5 +1031,5 @@ const (
10311031
// Valid Values:
10321032
// - Y
10331033
// - N
1034-
EnableNextExpectedMsgSeqNum string = "EnableNextExpectedMsgSeqNum"
1034+
EnableNextExpectedMsgSeqNum string = "EnableNextExpectedMsgSeqNum"
10351035
)

session.go

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -209,9 +209,9 @@ func (s *session) sendLogonInReplyTo(setResetSeqNum bool, inReplyTo *Message) er
209209
return nil
210210
}
211211

212-
func (session *session) generateSequenceReset(beginSeqNo int, endSeqNo int, inReplyTo Message) (err error) {
212+
func (s *session) generateSequenceReset(beginSeqNo int, endSeqNo int, inReplyTo Message) (err error) {
213213
sequenceReset := NewMessage()
214-
session.fillDefaultHeader(sequenceReset, &inReplyTo)
214+
s.fillDefaultHeader(sequenceReset, &inReplyTo)
215215

216216
sequenceReset.Header.SetField(tagMsgType, FIXString("4"))
217217
sequenceReset.Header.SetField(tagMsgSeqNum, FIXInt(beginSeqNo))
@@ -224,12 +224,12 @@ func (session *session) generateSequenceReset(beginSeqNo int, endSeqNo int, inRe
224224
sequenceReset.Header.SetField(tagOrigSendingTime, origSendingTime)
225225
}
226226

227-
session.application.ToAdmin(sequenceReset, session.sessionID)
227+
s.application.ToAdmin(sequenceReset, s.sessionID)
228228

229229
msgBytes := sequenceReset.build()
230230

231-
session.EnqueueBytesAndSend(msgBytes)
232-
session.log.OnEventf("Sent SequenceReset TO: %v", endSeqNo)
231+
s.EnqueueBytesAndSend(msgBytes)
232+
s.log.OnEventf("Sent SequenceReset TO: %v", endSeqNo)
233233

234234
return
235235
}
@@ -549,19 +549,19 @@ func (s *session) handleLogon(msg *Message) error {
549549

550550
// Evaluate tag 789 to see if we end up with an implied gapfill/resend.
551551
if s.EnableNextExpectedMsgSeqNum && !msg.Body.Has(tagResetSeqNumFlag) {
552-
targetWantsNextSeqNumToBe, getErr := msg.Body.GetInt(tagNextExpectedMsgSeqNum)
553-
if getErr == nil {
554-
if targetWantsNextSeqNumToBe != nextSenderMsgNumAtLogonReceived {
555-
if !s.DisableMessagePersist {
556-
seqResetErr := s.generateSequenceReset(targetWantsNextSeqNumToBe, nextSenderMsgNumAtLogonReceived+1, *msg)
557-
if seqResetErr != nil {
558-
return seqResetErr
559-
}
560-
} else {
561-
return targetTooHigh{ReceivedTarget: targetWantsNextSeqNumToBe, ExpectedTarget: nextSenderMsgNumAtLogonReceived}
562-
}
552+
targetWantsNextSeqNumToBe, getErr := msg.Body.GetInt(tagNextExpectedMsgSeqNum)
553+
if getErr == nil {
554+
if targetWantsNextSeqNumToBe != nextSenderMsgNumAtLogonReceived {
555+
if !s.DisableMessagePersist {
556+
seqResetErr := s.generateSequenceReset(targetWantsNextSeqNumToBe, nextSenderMsgNumAtLogonReceived+1, *msg)
557+
if seqResetErr != nil {
558+
return seqResetErr
563559
}
560+
} else {
561+
return targetTooHigh{ReceivedTarget: targetWantsNextSeqNumToBe, ExpectedTarget: nextSenderMsgNumAtLogonReceived}
562+
}
564563
}
564+
}
565565
}
566566

567567
if err := s.checkTargetTooHigh(msg); err != nil {

0 commit comments

Comments
 (0)