Skip to content

Commit 23adf07

Browse files
author
Chris Busbey
committed
removed references to generated enum package from top-level quickfix package
1 parent ac97362 commit 23adf07

File tree

10 files changed

+58
-70
lines changed

10 files changed

+58
-70
lines changed

‎in_session.go‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import (
44
"bytes"
55
"time"
66

7-
"github.com/quickfixgo/quickfix/enum"
87
"github.com/quickfixgo/quickfix/internal"
98
)
109

@@ -18,8 +17,8 @@ func (state inSession) FixMsgIn(session *session, msg *Message) sessionState {
1817
return handleStateError(session, err)
1918
}
2019

21-
switch enum.MsgType(msgType) {
22-
case enum.MsgType_LOGON:
20+
switch {
21+
case bytes.Equal(msgTypeLogon, msgType):
2322
if err := session.handleLogon(msg); err != nil {
2423
if err := session.initiateLogoutInReplyTo("", msg); err != nil {
2524
return handleStateError(session, err)
@@ -28,13 +27,13 @@ func (state inSession) FixMsgIn(session *session, msg *Message) sessionState {
2827
}
2928

3029
return state
31-
case enum.MsgType_LOGOUT:
30+
case bytes.Equal(msgTypeLogout, msgType):
3231
return state.handleLogout(session, msg)
33-
case enum.MsgType_RESEND_REQUEST:
32+
case bytes.Equal(msgTypeResendRequest, msgType):
3433
return state.handleResendRequest(session, msg)
35-
case enum.MsgType_SEQUENCE_RESET:
34+
case bytes.Equal(msgTypeSequenceReset, msgType):
3635
return state.handleSequenceReset(session, msg)
37-
case enum.MsgType_TEST_REQUEST:
36+
case bytes.Equal(msgTypeTestRequest, msgType):
3837
return state.handleTestRequest(session, msg)
3938
default:
4039
if err := session.verify(msg); err != nil {

‎in_session_test.go‎

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import (
44
"testing"
55
"time"
66

7-
"github.com/quickfixgo/quickfix/enum"
87
"github.com/quickfixgo/quickfix/internal"
98
"github.com/stretchr/testify/suite"
109
)
@@ -38,7 +37,7 @@ func (s *InSessionTestSuite) TestLogout() {
3837
s.State(latentState{})
3938

4039
s.LastToAdminMessageSent()
41-
s.MessageType(enum.MsgType_LOGOUT, s.MockApp.lastToAdmin)
40+
s.MessageType(string(msgTypeLogout), s.MockApp.lastToAdmin)
4241
s.NextTargetMsgSeqNum(2)
4342
s.NextSenderMsgSeqNum(2)
4443
}
@@ -54,7 +53,7 @@ func (s *InSessionTestSuite) TestLogoutEnableLastMsgSeqNumProcessed() {
5453
s.MockApp.AssertExpectations(s.T())
5554
s.LastToAdminMessageSent()
5655

57-
s.MessageType(enum.MsgType_LOGOUT, s.MockApp.lastToAdmin)
56+
s.MessageType(string(msgTypeLogout), s.MockApp.lastToAdmin)
5857
s.FieldEquals(tagLastMsgSeqNumProcessed, 1, s.MockApp.lastToAdmin.Header)
5958
}
6059

@@ -74,7 +73,7 @@ func (s *InSessionTestSuite) TestLogoutResetOnLogout() {
7473
s.State(latentState{})
7574
s.LastToAppMessageSent()
7675
s.LastToAdminMessageSent()
77-
s.MessageType(enum.MsgType_LOGOUT, s.MockApp.lastToAdmin)
76+
s.MessageType(string(msgTypeLogout), s.MockApp.lastToAdmin)
7877

7978
s.NextTargetMsgSeqNum(1)
8079
s.NextSenderMsgSeqNum(1)
@@ -88,7 +87,7 @@ func (s *InSessionTestSuite) TestTimeoutNeedHeartbeat() {
8887
s.MockApp.AssertExpectations(s.T())
8988
s.State(inSession{})
9089
s.LastToAdminMessageSent()
91-
s.MessageType(enum.MsgType_HEARTBEAT, s.MockApp.lastToAdmin)
90+
s.MessageType(string(msgTypeHeartbeat), s.MockApp.lastToAdmin)
9291
s.NextSenderMsgSeqNum(2)
9392
}
9493

@@ -99,7 +98,7 @@ func (s *InSessionTestSuite) TestTimeoutPeerTimeout() {
9998
s.MockApp.AssertExpectations(s.T())
10099
s.State(pendingTimeout{inSession{}})
101100
s.LastToAdminMessageSent()
102-
s.MessageType(enum.MsgType_TEST_REQUEST, s.MockApp.lastToAdmin)
101+
s.MessageType(string(msgTypeTestRequest), s.MockApp.lastToAdmin)
103102
s.NextSenderMsgSeqNum(2)
104103
}
105104

@@ -117,7 +116,7 @@ func (s *InSessionTestSuite) TestStop() {
117116
s.MockApp.AssertExpectations(s.T())
118117
s.State(logoutState{})
119118
s.LastToAdminMessageSent()
120-
s.MessageType(enum.MsgType_LOGOUT, s.MockApp.lastToAdmin)
119+
s.MessageType(string(msgTypeLogout), s.MockApp.lastToAdmin)
121120

122121
s.MockApp.On("OnLogout")
123122
s.session.Timeout(s.session, <-s.sessionEvent)
@@ -136,7 +135,7 @@ func (s *InSessionTestSuite) TestFIXMsgInTargetTooHighEnableLastMsgSeqNumProcess
136135

137136
s.MockApp.AssertExpectations(s.T())
138137
s.LastToAdminMessageSent()
139-
s.MessageType(enum.MsgType_RESEND_REQUEST, s.MockApp.lastToAdmin)
138+
s.MessageType(string(msgTypeResendRequest), s.MockApp.lastToAdmin)
140139
s.FieldEquals(tagLastMsgSeqNumProcessed, 0, s.MockApp.lastToAdmin.Header)
141140
}
142141

@@ -149,7 +148,7 @@ func (s *InSessionTestSuite) TestFIXMsgInTargetTooHigh() {
149148

150149
s.MockApp.AssertExpectations(s.T())
151150
s.LastToAdminMessageSent()
152-
s.MessageType(enum.MsgType_RESEND_REQUEST, s.MockApp.lastToAdmin)
151+
s.MessageType(string(msgTypeResendRequest), s.MockApp.lastToAdmin)
153152
s.FieldEquals(tagBeginSeqNo, 1, s.MockApp.lastToAdmin.Body)
154153
s.FieldEquals(tagEndSeqNo, 0, s.MockApp.lastToAdmin.Body)
155154

@@ -187,7 +186,7 @@ func (s *InSessionTestSuite) TestFIXMsgInTargetTooHighResendRequestChunkSize() {
187186

188187
s.MockApp.AssertExpectations(s.T())
189188
s.LastToAdminMessageSent()
190-
s.MessageType(enum.MsgType_RESEND_REQUEST, s.MockApp.lastToAdmin)
189+
s.MessageType(string(msgTypeResendRequest), s.MockApp.lastToAdmin)
191190
s.FieldEquals(tagBeginSeqNo, 1, s.MockApp.lastToAdmin.Body)
192191
s.FieldEquals(tagEndSeqNo, test.expectedEndSeqNo, s.MockApp.lastToAdmin.Body)
193192

@@ -224,7 +223,7 @@ func (s *InSessionTestSuite) TestFIXMsgInResendRequestAllAdminExpectGapFill() {
224223

225224
s.MockApp.AssertExpectations(s.T())
226225
s.LastToAdminMessageSent()
227-
s.MessageType(enum.MsgType_SEQUENCE_RESET, s.MockApp.lastToAdmin)
226+
s.MessageType(string(msgTypeSequenceReset), s.MockApp.lastToAdmin)
228227
s.FieldEquals(tagMsgSeqNum, 1, s.MockApp.lastToAdmin.Header)
229228
s.FieldEquals(tagPossDupFlag, true, s.MockApp.lastToAdmin.Header)
230229
s.FieldEquals(tagNewSeqNo, 4, s.MockApp.lastToAdmin.Body)
@@ -259,14 +258,14 @@ func (s *InSessionTestSuite) TestFIXMsgInResendRequestAllAdminThenApp() {
259258
s.MockApp.AssertNumberOfCalls(s.T(), "ToApp", 2)
260259

261260
s.LastToAdminMessageSent()
262-
s.MessageType(enum.MsgType_SEQUENCE_RESET, s.MockApp.lastToAdmin)
261+
s.MessageType(string(msgTypeSequenceReset), s.MockApp.lastToAdmin)
263262
s.FieldEquals(tagMsgSeqNum, 1, s.MockApp.lastToAdmin.Header)
264263
s.FieldEquals(tagPossDupFlag, true, s.MockApp.lastToAdmin.Header)
265264
s.FieldEquals(tagNewSeqNo, 3, s.MockApp.lastToAdmin.Body)
266265
s.FieldEquals(tagGapFillFlag, true, s.MockApp.lastToAdmin.Body)
267266

268267
s.LastToAppMessageSent()
269-
s.MessageType(enum.MsgType_ORDER_SINGLE, s.MockApp.lastToApp)
268+
s.MessageType("D", s.MockApp.lastToApp)
270269
s.FieldEquals(tagMsgSeqNum, 3, s.MockApp.lastToApp.Header)
271270
s.FieldEquals(tagPossDupFlag, true, s.MockApp.lastToApp.Header)
272271

@@ -292,7 +291,7 @@ func (s *InSessionTestSuite) TestFIXMsgInResendRequestNoMessagePersist() {
292291
s.MockApp.AssertNumberOfCalls(s.T(), "ToApp", 1)
293292

294293
s.LastToAdminMessageSent()
295-
s.MessageType(enum.MsgType_SEQUENCE_RESET, s.MockApp.lastToAdmin)
294+
s.MessageType(string(msgTypeSequenceReset), s.MockApp.lastToAdmin)
296295
s.FieldEquals(tagMsgSeqNum, 1, s.MockApp.lastToAdmin.Header)
297296
s.FieldEquals(tagPossDupFlag, true, s.MockApp.lastToAdmin.Header)
298297
s.FieldEquals(tagNewSeqNo, 2, s.MockApp.lastToAdmin.Body)
@@ -329,7 +328,7 @@ func (s *InSessionTestSuite) TestFIXMsgInResendRequestDoNotSendApp() {
329328
s.MockApp.AssertNumberOfCalls(s.T(), "ToApp", 1)
330329

331330
s.LastToAdminMessageSent()
332-
s.MessageType(enum.MsgType_SEQUENCE_RESET, s.MockApp.lastToAdmin)
331+
s.MessageType(string(msgTypeSequenceReset), s.MockApp.lastToAdmin)
333332
s.FieldEquals(tagMsgSeqNum, 1, s.MockApp.lastToAdmin.Header)
334333
s.FieldEquals(tagPossDupFlag, true, s.MockApp.lastToAdmin.Header)
335334
s.FieldEquals(tagNewSeqNo, 4, s.MockApp.lastToAdmin.Body)
@@ -348,7 +347,7 @@ func (s *InSessionTestSuite) TestFIXMsgInTargetTooLow() {
348347
s.fixMsgIn(s.session, s.NewOrderSingle())
349348
s.MockApp.AssertExpectations(s.T())
350349
s.LastToAdminMessageSent()
351-
s.MessageType(enum.MsgType_LOGOUT, s.MockApp.lastToAdmin)
350+
s.MessageType(string(msgTypeLogout), s.MockApp.lastToAdmin)
352351
s.FieldEquals(tagText, "MsgSeqNum too low, expecting 2 but received 1", s.MockApp.lastToAdmin.Body)
353352
s.State(logoutState{})
354353
}
@@ -363,7 +362,7 @@ func (s *InSessionTestSuite) TestFIXMsgInTargetTooLowPossDup() {
363362
s.fixMsgIn(s.session, nos)
364363
s.MockApp.AssertExpectations(s.T())
365364
s.LastToAdminMessageSent()
366-
s.MessageType(enum.MsgType_REJECT, s.MockApp.lastToAdmin)
365+
s.MessageType(string(msgTypeReject), s.MockApp.lastToAdmin)
367366
s.FieldEquals(tagText, "Required tag missing", s.MockApp.lastToAdmin.Body)
368367
s.FieldEquals(tagRefTagID, int(tagOrigSendingTime), s.MockApp.lastToAdmin.Body)
369368
s.State(inSession{})

‎logon_state.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
package quickfix
22

33
import (
4-
"github.com/quickfixgo/quickfix/enum"
4+
"bytes"
5+
56
"github.com/quickfixgo/quickfix/internal"
67
)
78

@@ -10,12 +11,12 @@ type logonState struct{ connectedNotLoggedOn }
1011
func (s logonState) String() string { return "Logon State" }
1112

1213
func (s logonState) FixMsgIn(session *session, msg *Message) (nextState sessionState) {
13-
msgType, err := msg.MsgType()
14+
msgType, err := msg.Header.GetBytes(tagMsgType)
1415
if err != nil {
1516
return handleStateError(session, err)
1617
}
1718

18-
if msgType != enum.MsgType_LOGON {
19+
if !bytes.Equal(msgType, msgTypeLogon) {
1920
session.log.OnEventf("Invalid Session State: Received Msg %s while waiting for Logon", msg)
2021
return latentState{}
2122
}

‎logon_state_test.go‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import (
55
"testing"
66
"time"
77

8-
"github.com/quickfixgo/quickfix/enum"
98
"github.com/quickfixgo/quickfix/internal"
109
"github.com/stretchr/testify/suite"
1110
)
@@ -85,7 +84,7 @@ func (s *LogonStateTestSuite) TestFixMsgInLogon() {
8584
s.Equal(32*time.Second, s.session.HeartBtInt)
8685

8786
s.LastToAdminMessageSent()
88-
s.MessageType(enum.MsgType_LOGON, s.MockApp.lastToAdmin)
87+
s.MessageType(string(msgTypeLogon), s.MockApp.lastToAdmin)
8988
s.FieldEquals(tagHeartBtInt, 32, s.MockApp.lastToAdmin.Body)
9089

9190
s.NextTargetMsgSeqNum(3)
@@ -110,7 +109,7 @@ func (s *LogonStateTestSuite) TestFixMsgInLogonEnableLastMsgSeqNumProcessed() {
110109
s.MockApp.AssertExpectations(s.T())
111110

112111
s.LastToAdminMessageSent()
113-
s.MessageType(enum.MsgType_LOGON, s.MockApp.lastToAdmin)
112+
s.MessageType(string(msgTypeLogon), s.MockApp.lastToAdmin)
114113
s.FieldEquals(tagLastMsgSeqNumProcessed, 2, s.MockApp.lastToAdmin.Header)
115114
}
116115

@@ -132,7 +131,7 @@ func (s *LogonStateTestSuite) TestFixMsgInLogonResetSeqNum() {
132131
s.Equal(32*time.Second, s.session.HeartBtInt)
133132

134133
s.LastToAdminMessageSent()
135-
s.MessageType(enum.MsgType_LOGON, s.MockApp.lastToAdmin)
134+
s.MessageType(string(msgTypeLogon), s.MockApp.lastToAdmin)
136135
s.FieldEquals(tagHeartBtInt, 32, s.MockApp.lastToAdmin.Body)
137136
s.FieldEquals(tagResetSeqNumFlag, true, s.MockApp.lastToAdmin.Body)
138137

@@ -258,7 +257,7 @@ func (s *LogonStateTestSuite) TestFixMsgInLogonRejectLogon() {
258257
s.State(latentState{})
259258

260259
s.LastToAdminMessageSent()
261-
s.MessageType(enum.MsgType_LOGOUT, s.MockApp.lastToAdmin)
260+
s.MessageType(string(msgTypeLogout), s.MockApp.lastToAdmin)
262261
s.FieldEquals(tagText, "reject message", s.MockApp.lastToAdmin.Body)
263262

264263
s.NextTargetMsgSeqNum(3)
@@ -285,10 +284,10 @@ func (s *LogonStateTestSuite) TestFixMsgInLogonSeqNumTooHigh() {
285284
sentMessage := NewMessage()
286285
err := ParseMessage(sentMessage, bytes.NewBuffer(msgBytesSent))
287286
s.Require().Nil(err)
288-
s.MessageType(enum.MsgType_LOGON, sentMessage)
287+
s.MessageType(string(msgTypeLogon), sentMessage)
289288

290289
s.session.sendQueued()
291-
s.MessageType(enum.MsgType_RESEND_REQUEST, s.MockApp.lastToAdmin)
290+
s.MessageType(string(msgTypeResendRequest), s.MockApp.lastToAdmin)
292291
s.FieldEquals(tagBeginSeqNo, 1, s.MockApp.lastToAdmin.Body)
293292

294293
s.MockApp.On("FromAdmin").Return(nil)

‎message.go‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import (
77
"time"
88

99
"github.com/quickfixgo/quickfix/datadictionary"
10-
"github.com/quickfixgo/quickfix/enum"
1110
)
1211

1312
//Header is first section of a FIX Message
@@ -256,16 +255,12 @@ func isTrailerField(tag Tag, dataDict *datadictionary.DataDictionary) bool {
256255
}
257256

258257
// MsgType returns MsgType (tag 35) field's value
259-
func (m *Message) MsgType() (enum.MsgType, MessageRejectError) {
260-
s, err := m.Header.GetString(tagMsgType)
261-
if err != nil {
262-
return enum.MsgType(""), err
263-
}
264-
return enum.MsgType(s), nil
258+
func (m *Message) MsgType() (string, MessageRejectError) {
259+
return m.Header.GetString(tagMsgType)
265260
}
266261

267262
// IsMsgTypeOf returns true if the Header contains MsgType (tag 35) field and its value is the specified one.
268-
func (m *Message) IsMsgTypeOf(msgType enum.MsgType) bool {
263+
func (m *Message) IsMsgTypeOf(msgType string) bool {
269264
if v, err := m.MsgType(); err == nil {
270265
return v == msgType
271266
}

‎message_test.go‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import (
55
"testing"
66

77
"github.com/quickfixgo/quickfix/datadictionary"
8-
"github.com/quickfixgo/quickfix/enum"
98
"github.com/stretchr/testify/suite"
109
)
1110

@@ -48,10 +47,10 @@ func (s *MessageSuite) TestParseMessage() {
4847
msgType, err := s.msg.MsgType()
4948
s.Nil(err)
5049

51-
s.Equal(enum.MsgType_ORDER_SINGLE, msgType)
52-
s.True(s.msg.IsMsgTypeOf(enum.MsgType_ORDER_SINGLE))
50+
s.Equal("D", msgType)
51+
s.True(s.msg.IsMsgTypeOf("D"))
5352

54-
s.False(s.msg.IsMsgTypeOf(enum.MsgType_LOGON))
53+
s.False(s.msg.IsMsgTypeOf("A"))
5554
}
5655

5756
func (s *MessageSuite) TestParseMessageWithDataDictionary() {

‎quickfix_test.go‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package quickfix
33
import (
44
"time"
55

6-
"github.com/quickfixgo/quickfix/enum"
76
"github.com/quickfixgo/quickfix/internal"
87
"github.com/stretchr/testify/mock"
98
"github.com/stretchr/testify/require"
@@ -21,8 +20,8 @@ type KnowsFieldMap interface {
2120
GetField(Tag, FieldValueReader) MessageRejectError
2221
}
2322

24-
func (s *QuickFIXSuite) MessageType(msgType enum.MsgType, msg *Message) {
25-
s.FieldEquals(tagMsgType, string(msgType), msg.Header)
23+
func (s *QuickFIXSuite) MessageType(msgType string, msg *Message) {
24+
s.FieldEquals(tagMsgType, msgType, msg.Header)
2625
}
2726

2827
func (s *QuickFIXSuite) FieldEquals(tag Tag, expectedValue interface{}, fieldMap KnowsFieldMap) {
@@ -134,31 +133,31 @@ func (m *MessageFactory) buildMessage(msgType string) *Message {
134133
}
135134

136135
func (m *MessageFactory) Logout() *Message {
137-
return m.buildMessage(string(enum.MsgType_LOGOUT))
136+
return m.buildMessage(string(msgTypeLogout))
138137
}
139138

140139
func (m *MessageFactory) NewOrderSingle() *Message {
141-
return m.buildMessage(string(enum.MsgType_ORDER_SINGLE))
140+
return m.buildMessage("D")
142141
}
143142

144143
func (m *MessageFactory) Heartbeat() *Message {
145-
return m.buildMessage(string(enum.MsgType_HEARTBEAT))
144+
return m.buildMessage(string(msgTypeHeartbeat))
146145
}
147146

148147
func (m *MessageFactory) Logon() *Message {
149-
return m.buildMessage(string(enum.MsgType_LOGON))
148+
return m.buildMessage(string(msgTypeLogon))
150149
}
151150

152151
func (m *MessageFactory) ResendRequest(beginSeqNo int) *Message {
153-
msg := m.buildMessage(string(enum.MsgType_RESEND_REQUEST))
152+
msg := m.buildMessage(string(msgTypeResendRequest))
154153
msg.Body.SetField(tagBeginSeqNo, FIXInt(beginSeqNo))
155154
msg.Body.SetField(tagEndSeqNo, FIXInt(0))
156155

157156
return msg
158157
}
159158

160159
func (m *MessageFactory) SequenceReset(seqNo int) *Message {
161-
msg := m.buildMessage(string(enum.MsgType_SEQUENCE_RESET))
160+
msg := m.buildMessage(string(msgTypeSequenceReset))
162161
msg.Body.SetField(tagNewSeqNo, FIXInt(seqNo))
163162

164163
return msg

0 commit comments

Comments
 (0)