Skip to content

Commit 0a9aeaf

Browse files
authored
Merge pull request #11 from cbusbey/qfix_bump
Qfix bump
2 parents 8f11074 + becdd92 commit 0a9aeaf

File tree

149 files changed

+11899
-1605
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

149 files changed

+11899
-1605
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ language: go
22
sudo: false
33

44
go:
5-
- 1.7
5+
- 1.9
66
- tip
77

88
matrix:

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ Before proposing a large change, please discuss your change by raising an issue.
1111

1212
## Notes
1313

14-
* If you report a bug and don not include a fix, please include a failing test
14+
* If you report a bug and do not include a fix, please include a failing test
1515
* Generally, contributions without tests will not be accepted
1616
* Contributions that fail the automated build will not be accepted

Gopkg.lock

Lines changed: 81 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Gopkg.toml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
2+
# Gopkg.toml example
3+
#
4+
# Refer to https://github.com/golang/dep/blob/master/docs/Gopkg.toml.md
5+
# for detailed Gopkg.toml documentation.
6+
#
7+
# required = ["github.com/user/thing/cmd/thing"]
8+
# ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"]
9+
#
10+
# [[constraint]]
11+
# name = "github.com/user/project"
12+
# version = "1.0.0"
13+
#
14+
# [[constraint]]
15+
# name = "github.com/user/project2"
16+
# branch = "dev"
17+
# source = "github.com/myfork/project2"
18+
#
19+
# [[override]]
20+
# name = "github.com/x/y"
21+
# version = "2.4.0"
22+
23+
24+
[[constraint]]
25+
name = "github.com/quickfixgo/quickfix"
26+
branch = "master"
27+
28+
[[constraint]]
29+
branch = "master"
30+
name = "github.com/shopspring/decimal"

cmd/executor/executor.go

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -5,25 +5,25 @@ import (
55
"fmt"
66
"path"
77

8+
"github.com/quickfixgo/enum"
9+
"github.com/quickfixgo/field"
810
"github.com/quickfixgo/quickfix"
9-
"github.com/quickfixgo/quickfix/enum"
10-
"github.com/quickfixgo/quickfix/field"
11-
"github.com/quickfixgo/quickfix/tag"
11+
"github.com/quickfixgo/tag"
1212
"github.com/shopspring/decimal"
1313

14-
fix40nos "github.com/quickfixgo/quickfix/fix40/newordersingle"
15-
fix41nos "github.com/quickfixgo/quickfix/fix41/newordersingle"
16-
fix42nos "github.com/quickfixgo/quickfix/fix42/newordersingle"
17-
fix43nos "github.com/quickfixgo/quickfix/fix43/newordersingle"
18-
fix44nos "github.com/quickfixgo/quickfix/fix44/newordersingle"
19-
fix50nos "github.com/quickfixgo/quickfix/fix50/newordersingle"
14+
fix40nos "github.com/quickfixgo/fix40/newordersingle"
15+
fix41nos "github.com/quickfixgo/fix41/newordersingle"
16+
fix42nos "github.com/quickfixgo/fix42/newordersingle"
17+
fix43nos "github.com/quickfixgo/fix43/newordersingle"
18+
fix44nos "github.com/quickfixgo/fix44/newordersingle"
19+
fix50nos "github.com/quickfixgo/fix50/newordersingle"
2020

21-
fix40er "github.com/quickfixgo/quickfix/fix40/executionreport"
22-
fix41er "github.com/quickfixgo/quickfix/fix41/executionreport"
23-
fix42er "github.com/quickfixgo/quickfix/fix42/executionreport"
24-
fix43er "github.com/quickfixgo/quickfix/fix43/executionreport"
25-
fix44er "github.com/quickfixgo/quickfix/fix44/executionreport"
26-
fix50er "github.com/quickfixgo/quickfix/fix50/executionreport"
21+
fix40er "github.com/quickfixgo/fix40/executionreport"
22+
fix41er "github.com/quickfixgo/fix41/executionreport"
23+
fix42er "github.com/quickfixgo/fix42/executionreport"
24+
fix43er "github.com/quickfixgo/fix43/executionreport"
25+
fix44er "github.com/quickfixgo/fix44/executionreport"
26+
fix50er "github.com/quickfixgo/fix50/executionreport"
2727

2828
"os"
2929
"os/signal"
@@ -59,17 +59,17 @@ func (e *executor) genExecID() field.ExecIDField {
5959
}
6060

6161
//quickfix.Application interface
62-
func (e executor) OnCreate(sessionID quickfix.SessionID) { return }
63-
func (e executor) OnLogon(sessionID quickfix.SessionID) { return }
64-
func (e executor) OnLogout(sessionID quickfix.SessionID) { return }
65-
func (e executor) ToAdmin(msg quickfix.Message, sessionID quickfix.SessionID) { return }
66-
func (e executor) ToApp(msg quickfix.Message, sessionID quickfix.SessionID) error { return nil }
67-
func (e executor) FromAdmin(msg quickfix.Message, sessionID quickfix.SessionID) quickfix.MessageRejectError {
62+
func (e executor) OnCreate(sessionID quickfix.SessionID) { return }
63+
func (e executor) OnLogon(sessionID quickfix.SessionID) { return }
64+
func (e executor) OnLogout(sessionID quickfix.SessionID) { return }
65+
func (e executor) ToAdmin(msg *quickfix.Message, sessionID quickfix.SessionID) { return }
66+
func (e executor) ToApp(msg *quickfix.Message, sessionID quickfix.SessionID) error { return nil }
67+
func (e executor) FromAdmin(msg *quickfix.Message, sessionID quickfix.SessionID) quickfix.MessageRejectError {
6868
return nil
6969
}
7070

7171
//Use Message Cracker on Incoming Application Messages
72-
func (e *executor) FromApp(msg quickfix.Message, sessionID quickfix.SessionID) (reject quickfix.MessageRejectError) {
72+
func (e *executor) FromApp(msg *quickfix.Message, sessionID quickfix.SessionID) (reject quickfix.MessageRejectError) {
7373
return e.Route(msg, sessionID)
7474
}
7575

cmd/ordermatch/internal/market.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"sort"
66
"time"
77

8-
"github.com/quickfixgo/quickfix/enum"
8+
"github.com/quickfixgo/enum"
99
)
1010

1111
type orderList struct {

cmd/ordermatch/internal/order.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package internal
33
import (
44
"time"
55

6-
"github.com/quickfixgo/quickfix/enum"
6+
"github.com/quickfixgo/enum"
77
"github.com/shopspring/decimal"
88
)
99

cmd/ordermatch/internal/ordermatcher.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package internal
33
import (
44
"fmt"
55

6-
"github.com/quickfixgo/quickfix/enum"
6+
"github.com/quickfixgo/enum"
77
)
88

99
type OrderMatcher struct {

cmd/ordermatch/ordermatch.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ import (
99
"path"
1010
"strconv"
1111

12+
"github.com/quickfixgo/enum"
1213
"github.com/quickfixgo/examples/cmd/ordermatch/internal"
14+
"github.com/quickfixgo/field"
15+
"github.com/quickfixgo/fix42/executionreport"
16+
"github.com/quickfixgo/fix42/marketdatarequest"
17+
"github.com/quickfixgo/fix42/newordersingle"
18+
"github.com/quickfixgo/fix42/ordercancelrequest"
1319
"github.com/quickfixgo/quickfix"
14-
"github.com/quickfixgo/quickfix/enum"
15-
"github.com/quickfixgo/quickfix/field"
16-
"github.com/quickfixgo/quickfix/fix42/executionreport"
17-
"github.com/quickfixgo/quickfix/fix42/marketdatarequest"
18-
"github.com/quickfixgo/quickfix/fix42/newordersingle"
19-
"github.com/quickfixgo/quickfix/fix42/ordercancelrequest"
2020
)
2121

2222
//Application implements the quickfix.Application interface
@@ -48,20 +48,20 @@ func (a Application) OnLogon(sessionID quickfix.SessionID) { return }
4848
func (a Application) OnLogout(sessionID quickfix.SessionID) { return }
4949

5050
//ToAdmin implemented as part of Application interface
51-
func (a Application) ToAdmin(msg quickfix.Message, sessionID quickfix.SessionID) { return }
51+
func (a Application) ToAdmin(msg *quickfix.Message, sessionID quickfix.SessionID) { return }
5252

5353
//ToApp implemented as part of Application interface
54-
func (a Application) ToApp(msg quickfix.Message, sessionID quickfix.SessionID) error {
54+
func (a Application) ToApp(msg *quickfix.Message, sessionID quickfix.SessionID) error {
5555
return nil
5656
}
5757

5858
//FromAdmin implemented as part of Application interface
59-
func (a Application) FromAdmin(msg quickfix.Message, sessionID quickfix.SessionID) quickfix.MessageRejectError {
59+
func (a Application) FromAdmin(msg *quickfix.Message, sessionID quickfix.SessionID) quickfix.MessageRejectError {
6060
return nil
6161
}
6262

6363
//FromApp implemented as part of Application interface, uses Router on incoming application messages
64-
func (a *Application) FromApp(msg quickfix.Message, sessionID quickfix.SessionID) (reject quickfix.MessageRejectError) {
64+
func (a *Application) FromApp(msg *quickfix.Message, sessionID quickfix.SessionID) (reject quickfix.MessageRejectError) {
6565
return a.Route(msg, sessionID)
6666
}
6767

0 commit comments

Comments
 (0)