Skip to content

Commit

Permalink
changes to example for latest quickfix api
Browse files Browse the repository at this point in the history
  • Loading branch information
Chris Busbey committed Oct 7, 2017
1 parent e7fd16d commit becdd92
Show file tree
Hide file tree
Showing 9 changed files with 108 additions and 109 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ language: go
sudo: false

go:
- 1.7
- 1.9
- tip

matrix:
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ Before proposing a large change, please discuss your change by raising an issue.

## Notes

* If you report a bug and don not include a fix, please include a failing test
* If you report a bug and do not include a fix, please include a failing test
* Generally, contributions without tests will not be accepted
* Contributions that fail the automated build will not be accepted
44 changes: 22 additions & 22 deletions cmd/executor/executor.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,25 +5,25 @@ import (
"fmt"
"path"

"github.com/quickfixgo/enum"
"github.com/quickfixgo/field"
"github.com/quickfixgo/quickfix"
"github.com/quickfixgo/quickfix/enum"
"github.com/quickfixgo/quickfix/field"
"github.com/quickfixgo/quickfix/tag"
"github.com/quickfixgo/tag"
"github.com/shopspring/decimal"

fix40nos "github.com/quickfixgo/quickfix/fix40/newordersingle"
fix41nos "github.com/quickfixgo/quickfix/fix41/newordersingle"
fix42nos "github.com/quickfixgo/quickfix/fix42/newordersingle"
fix43nos "github.com/quickfixgo/quickfix/fix43/newordersingle"
fix44nos "github.com/quickfixgo/quickfix/fix44/newordersingle"
fix50nos "github.com/quickfixgo/quickfix/fix50/newordersingle"
fix40nos "github.com/quickfixgo/fix40/newordersingle"
fix41nos "github.com/quickfixgo/fix41/newordersingle"
fix42nos "github.com/quickfixgo/fix42/newordersingle"
fix43nos "github.com/quickfixgo/fix43/newordersingle"
fix44nos "github.com/quickfixgo/fix44/newordersingle"
fix50nos "github.com/quickfixgo/fix50/newordersingle"

fix40er "github.com/quickfixgo/quickfix/fix40/executionreport"
fix41er "github.com/quickfixgo/quickfix/fix41/executionreport"
fix42er "github.com/quickfixgo/quickfix/fix42/executionreport"
fix43er "github.com/quickfixgo/quickfix/fix43/executionreport"
fix44er "github.com/quickfixgo/quickfix/fix44/executionreport"
fix50er "github.com/quickfixgo/quickfix/fix50/executionreport"
fix40er "github.com/quickfixgo/fix40/executionreport"
fix41er "github.com/quickfixgo/fix41/executionreport"
fix42er "github.com/quickfixgo/fix42/executionreport"
fix43er "github.com/quickfixgo/fix43/executionreport"
fix44er "github.com/quickfixgo/fix44/executionreport"
fix50er "github.com/quickfixgo/fix50/executionreport"

"os"
"os/signal"
Expand Down Expand Up @@ -59,17 +59,17 @@ func (e *executor) genExecID() field.ExecIDField {
}

//quickfix.Application interface
func (e executor) OnCreate(sessionID quickfix.SessionID) { return }
func (e executor) OnLogon(sessionID quickfix.SessionID) { return }
func (e executor) OnLogout(sessionID quickfix.SessionID) { return }
func (e executor) ToAdmin(msg quickfix.Message, sessionID quickfix.SessionID) { return }
func (e executor) ToApp(msg quickfix.Message, sessionID quickfix.SessionID) error { return nil }
func (e executor) FromAdmin(msg quickfix.Message, sessionID quickfix.SessionID) quickfix.MessageRejectError {
func (e executor) OnCreate(sessionID quickfix.SessionID) { return }
func (e executor) OnLogon(sessionID quickfix.SessionID) { return }
func (e executor) OnLogout(sessionID quickfix.SessionID) { return }
func (e executor) ToAdmin(msg *quickfix.Message, sessionID quickfix.SessionID) { return }
func (e executor) ToApp(msg *quickfix.Message, sessionID quickfix.SessionID) error { return nil }
func (e executor) FromAdmin(msg *quickfix.Message, sessionID quickfix.SessionID) quickfix.MessageRejectError {
return nil
}

//Use Message Cracker on Incoming Application Messages
func (e *executor) FromApp(msg quickfix.Message, sessionID quickfix.SessionID) (reject quickfix.MessageRejectError) {
func (e *executor) FromApp(msg *quickfix.Message, sessionID quickfix.SessionID) (reject quickfix.MessageRejectError) {
return e.Route(msg, sessionID)
}

Expand Down
2 changes: 1 addition & 1 deletion cmd/ordermatch/internal/market.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"sort"
"time"

"github.com/quickfixgo/quickfix/enum"
"github.com/quickfixgo/enum"
)

type orderList struct {
Expand Down
2 changes: 1 addition & 1 deletion cmd/ordermatch/internal/order.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package internal
import (
"time"

"github.com/quickfixgo/quickfix/enum"
"github.com/quickfixgo/enum"
"github.com/shopspring/decimal"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/ordermatch/internal/ordermatcher.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package internal
import (
"fmt"

"github.com/quickfixgo/quickfix/enum"
"github.com/quickfixgo/enum"
)

type OrderMatcher struct {
Expand Down
20 changes: 10 additions & 10 deletions cmd/ordermatch/ordermatch.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ import (
"path"
"strconv"

"github.com/quickfixgo/enum"
"github.com/quickfixgo/examples/cmd/ordermatch/internal"
"github.com/quickfixgo/field"
"github.com/quickfixgo/fix42/executionreport"
"github.com/quickfixgo/fix42/marketdatarequest"
"github.com/quickfixgo/fix42/newordersingle"
"github.com/quickfixgo/fix42/ordercancelrequest"
"github.com/quickfixgo/quickfix"
"github.com/quickfixgo/quickfix/enum"
"github.com/quickfixgo/quickfix/field"
"github.com/quickfixgo/quickfix/fix42/executionreport"
"github.com/quickfixgo/quickfix/fix42/marketdatarequest"
"github.com/quickfixgo/quickfix/fix42/newordersingle"
"github.com/quickfixgo/quickfix/fix42/ordercancelrequest"
)

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

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

//ToApp implemented as part of Application interface
func (a Application) ToApp(msg quickfix.Message, sessionID quickfix.SessionID) error {
func (a Application) ToApp(msg *quickfix.Message, sessionID quickfix.SessionID) error {
return nil
}

//FromAdmin implemented as part of Application interface
func (a Application) FromAdmin(msg quickfix.Message, sessionID quickfix.SessionID) quickfix.MessageRejectError {
func (a Application) FromAdmin(msg *quickfix.Message, sessionID quickfix.SessionID) quickfix.MessageRejectError {
return nil
}

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

Expand Down
Loading

0 comments on commit becdd92

Please sign in to comment.