Skip to content

Commit 33c88e2

Browse files
ackleymiackleymi
committed
Adds linter fixes and cfg.
1 parent 173a431 commit 33c88e2

File tree

6 files changed

+77
-49
lines changed

6 files changed

+77
-49
lines changed

‎.golangci.yml‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
run:
2+
timeout: 10m
3+
skip-dirs:
4+
- gen
5+
- vendor
6+
7+
linters:
8+
disable-all: true
9+
enable:
10+
- dupl
11+
- gofmt
12+
- goimports
13+
- gosimple
14+
- govet
15+
- ineffassign
16+
- misspell
17+
- revive
18+
- unused
19+
- staticcheck
20+
21+
linters-settings:
22+
gofmt:
23+
simplify: true
24+
goimports:
25+
local-prefixes: github.com/quickfixgo/quickfix
26+
dupl:
27+
threshold: 400

‎cmd/executor/executor.go‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,18 @@ import (
2020
"bytes"
2121
"fmt"
2222
"io"
23-
"io/ioutil"
2423
"path"
2524
"syscall"
2625

2726
"github.com/fatih/color"
2827
"github.com/quickfixgo/enum"
2928
"github.com/quickfixgo/field"
30-
"github.com/quickfixgo/quickfix"
3129
"github.com/quickfixgo/tag"
3230
"github.com/shopspring/decimal"
3331
"github.com/spf13/cobra"
3432

33+
"github.com/quickfixgo/quickfix"
34+
3535
fix40nos "github.com/quickfixgo/fix40/newordersingle"
3636
fix41nos "github.com/quickfixgo/fix41/newordersingle"
3737
fix42nos "github.com/quickfixgo/fix42/newordersingle"
@@ -79,7 +79,7 @@ func (e *executor) genExecID() field.ExecIDField {
7979
return field.NewExecID(strconv.Itoa(e.execID))
8080
}
8181

82-
//quickfix.Application interface
82+
// quickfix.Application interface
8383
func (e executor) OnCreate(sessionID quickfix.SessionID) {}
8484
func (e executor) OnLogon(sessionID quickfix.SessionID) {}
8585
func (e executor) OnLogout(sessionID quickfix.SessionID) {}
@@ -89,7 +89,7 @@ func (e executor) FromAdmin(msg *quickfix.Message, sessionID quickfix.SessionID)
8989
return nil
9090
}
9191

92-
//Use Message Cracker on Incoming Application Messages
92+
// Use Message Cracker on Incoming Application Messages
9393
func (e *executor) FromApp(msg *quickfix.Message, sessionID quickfix.SessionID) (reject quickfix.MessageRejectError) {
9494
return e.Route(msg, sessionID)
9595
}
@@ -514,22 +514,22 @@ func execute(cmd *cobra.Command, args []string) error {
514514
}
515515
default:
516516
{
517-
return fmt.Errorf("Incorrect argument number")
517+
return fmt.Errorf("incorrect argument number")
518518
}
519519
}
520520
cfg, err := os.Open(cfgFileName)
521521
if err != nil {
522-
return fmt.Errorf("Error opening %v, %v\n", cfgFileName, err)
522+
return fmt.Errorf("error opening %v, %v", cfgFileName, err)
523523
}
524524
defer cfg.Close()
525-
stringData, readErr := ioutil.ReadAll(cfg)
525+
stringData, readErr := io.ReadAll(cfg)
526526
if readErr != nil {
527-
return fmt.Errorf("Error reading cfg: %s,", readErr)
527+
return fmt.Errorf("error reading cfg: %s,", readErr)
528528
}
529529

530530
appSettings, err := quickfix.ParseSettings(bytes.NewReader(stringData))
531531
if err != nil {
532-
return fmt.Errorf("Error reading cfg: %s,", err)
532+
return fmt.Errorf("error reading cfg: %s,", err)
533533
}
534534

535535
logFactory := quickfix.NewScreenLogFactory()
@@ -538,12 +538,12 @@ func execute(cmd *cobra.Command, args []string) error {
538538
printConfig(bytes.NewReader(stringData))
539539
acceptor, err := quickfix.NewAcceptor(app, quickfix.NewMemoryStoreFactory(), appSettings, logFactory)
540540
if err != nil {
541-
return fmt.Errorf("Unable to create Acceptor: %s\n", err)
541+
return fmt.Errorf("unable to create acceptor: %s", err)
542542
}
543543

544544
err = acceptor.Start()
545545
if err != nil {
546-
return fmt.Errorf("Unable to start Acceptor: %s\n", err)
546+
return fmt.Errorf("unable to start acceptor: %s", err)
547547
}
548548

549549
interrupt := make(chan os.Signal, 1)

‎cmd/ordermatch/internal/market.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,13 +81,13 @@ func offers() (o orderList) {
8181
return
8282
}
8383

84-
//Market is a simple CLOB
84+
// Market is a simple CLOB
8585
type Market struct {
8686
Bids orderList
8787
Offers orderList
8888
}
8989

90-
//NewMarket returns an initialized Market instance
90+
// NewMarket returns an initialized Market instance
9191
func NewMarket() *Market {
9292
return &Market{bids(), offers()}
9393
}

‎cmd/ordermatch/ordermatch.go‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import (
2020
"bytes"
2121
"fmt"
2222
"io"
23-
"io/ioutil"
2423
"os"
2524
"os/signal"
2625
"path"
@@ -35,11 +34,12 @@ import (
3534
"github.com/quickfixgo/fix42/marketdatarequest"
3635
"github.com/quickfixgo/fix42/newordersingle"
3736
"github.com/quickfixgo/fix42/ordercancelrequest"
38-
"github.com/quickfixgo/quickfix"
3937
"github.com/spf13/cobra"
38+
39+
"github.com/quickfixgo/quickfix"
4040
)
4141

42-
//Application implements the quickfix.Application interface
42+
// Application implements the quickfix.Application interface
4343
type Application struct {
4444
*quickfix.MessageRouter
4545
*internal.OrderMatcher
@@ -58,29 +58,29 @@ func newApplication() *Application {
5858
return app
5959
}
6060

61-
//OnCreate implemented as part of Application interface
61+
// OnCreate implemented as part of Application interface
6262
func (a Application) OnCreate(sessionID quickfix.SessionID) {}
6363

64-
//OnLogon implemented as part of Application interface
64+
// OnLogon implemented as part of Application interface
6565
func (a Application) OnLogon(sessionID quickfix.SessionID) {}
6666

67-
//OnLogout implemented as part of Application interface
67+
// OnLogout implemented as part of Application interface
6868
func (a Application) OnLogout(sessionID quickfix.SessionID) {}
6969

70-
//ToAdmin implemented as part of Application interface
70+
// ToAdmin implemented as part of Application interface
7171
func (a Application) ToAdmin(msg *quickfix.Message, sessionID quickfix.SessionID) {}
7272

73-
//ToApp implemented as part of Application interface
73+
// ToApp implemented as part of Application interface
7474
func (a Application) ToApp(msg *quickfix.Message, sessionID quickfix.SessionID) error {
7575
return nil
7676
}
7777

78-
//FromAdmin implemented as part of Application interface
78+
// FromAdmin implemented as part of Application interface
7979
func (a Application) FromAdmin(msg *quickfix.Message, sessionID quickfix.SessionID) quickfix.MessageRejectError {
8080
return nil
8181
}
8282

83-
//FromApp implemented as part of Application interface, uses Router on incoming application messages
83+
// FromApp implemented as part of Application interface, uses Router on incoming application messages
8484
func (a *Application) FromApp(msg *quickfix.Message, sessionID quickfix.SessionID) (reject quickfix.MessageRejectError) {
8585
return a.Route(msg, sessionID)
8686
}
@@ -264,23 +264,23 @@ func execute(cmd *cobra.Command, args []string) error {
264264
}
265265
default:
266266
{
267-
return fmt.Errorf("Incorrect argument number")
267+
return fmt.Errorf("incorrect argument number")
268268
}
269269
}
270270

271271
cfg, err := os.Open(cfgFileName)
272272
if err != nil {
273-
return fmt.Errorf("Error opening %v, %v\n", cfgFileName, err)
273+
return fmt.Errorf("error opening %v, %v", cfgFileName, err)
274274
}
275275
defer cfg.Close()
276-
stringData, readErr := ioutil.ReadAll(cfg)
276+
stringData, readErr := io.ReadAll(cfg)
277277
if readErr != nil {
278-
return fmt.Errorf("Error reading cfg: %s,", readErr)
278+
return fmt.Errorf("error reading cfg: %s,", readErr)
279279
}
280280

281281
appSettings, err := quickfix.ParseSettings(bytes.NewReader(stringData))
282282
if err != nil {
283-
return fmt.Errorf("Error reading cfg: %s,", err)
283+
return fmt.Errorf("error reading cfg: %s,", err)
284284
}
285285

286286
logFactory := quickfix.NewScreenLogFactory()
@@ -289,12 +289,12 @@ func execute(cmd *cobra.Command, args []string) error {
289289
printConfig(bytes.NewReader(stringData))
290290
acceptor, err := quickfix.NewAcceptor(app, quickfix.NewMemoryStoreFactory(), appSettings, logFactory)
291291
if err != nil {
292-
return fmt.Errorf("Unable to create Acceptor: %s\n", err)
292+
return fmt.Errorf("unable to create acceptor: %s", err)
293293
}
294294

295295
err = acceptor.Start()
296296
if err != nil {
297-
return fmt.Errorf("Unable to start Acceptor: %s\n", err)
297+
return fmt.Errorf("unable to start acceptor: %s", err)
298298
}
299299

300300
interrupt := make(chan os.Signal, 1)

‎cmd/tradeclient/internal/console.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,10 @@ import (
2222

2323
"github.com/quickfixgo/enum"
2424
"github.com/quickfixgo/field"
25-
"github.com/quickfixgo/quickfix"
2625
"github.com/shopspring/decimal"
2726

27+
"github.com/quickfixgo/quickfix"
28+
2829
"os"
2930
"strconv"
3031
"strings"

‎cmd/tradeclient/tradeclient.go‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -20,44 +20,44 @@ import (
2020
"bytes"
2121
"fmt"
2222
"io"
23-
"io/ioutil"
2423
"os"
2524
"path"
2625

2726
"github.com/fatih/color"
2827
"github.com/quickfixgo/examples/cmd/tradeclient/internal"
29-
"github.com/quickfixgo/quickfix"
3028
"github.com/spf13/cobra"
29+
30+
"github.com/quickfixgo/quickfix"
3131
)
3232

33-
//TradeClient implements the quickfix.Application interface
33+
// TradeClient implements the quickfix.Application interface
3434
type TradeClient struct {
3535
}
3636

37-
//OnCreate implemented as part of Application interface
37+
// OnCreate implemented as part of Application interface
3838
func (e TradeClient) OnCreate(sessionID quickfix.SessionID) {}
3939

40-
//OnLogon implemented as part of Application interface
40+
// OnLogon implemented as part of Application interface
4141
func (e TradeClient) OnLogon(sessionID quickfix.SessionID) {}
4242

43-
//OnLogout implemented as part of Application interface
43+
// OnLogout implemented as part of Application interface
4444
func (e TradeClient) OnLogout(sessionID quickfix.SessionID) {}
4545

46-
//FromAdmin implemented as part of Application interface
46+
// FromAdmin implemented as part of Application interface
4747
func (e TradeClient) FromAdmin(msg *quickfix.Message, sessionID quickfix.SessionID) (reject quickfix.MessageRejectError) {
4848
return nil
4949
}
5050

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

54-
//ToApp implemented as part of Application interface
54+
// ToApp implemented as part of Application interface
5555
func (e TradeClient) ToApp(msg *quickfix.Message, sessionID quickfix.SessionID) (err error) {
5656
fmt.Printf("Sending %s\n", msg)
5757
return
5858
}
5959

60-
//FromApp implemented as part of Application interface. This is the callback for all Application level messages from the counter party.
60+
// FromApp implemented as part of Application interface. This is the callback for all Application level messages from the counter party.
6161
func (e TradeClient) FromApp(msg *quickfix.Message, sessionID quickfix.SessionID) (reject quickfix.MessageRejectError) {
6262
fmt.Printf("FromApp: %s\n", msg.String())
6363
return
@@ -95,41 +95,41 @@ func execute(cmd *cobra.Command, args []string) error {
9595
}
9696
default:
9797
{
98-
return fmt.Errorf("Incorrect argument number")
98+
return fmt.Errorf("incorrect argument number")
9999
}
100100
}
101101

102102
cfg, err := os.Open(cfgFileName)
103103
if err != nil {
104-
return fmt.Errorf("Error opening %v, %v\n", cfgFileName, err)
104+
return fmt.Errorf("error opening %v, %v", cfgFileName, err)
105105
}
106106
defer cfg.Close()
107107

108-
stringData, readErr := ioutil.ReadAll(cfg)
108+
stringData, readErr := io.ReadAll(cfg)
109109
if readErr != nil {
110-
return fmt.Errorf("Error reading cfg: %s,", readErr)
110+
return fmt.Errorf("error reading cfg: %s,", readErr)
111111
}
112112

113113
appSettings, err := quickfix.ParseSettings(bytes.NewReader(stringData))
114114
if err != nil {
115-
return fmt.Errorf("Error reading cfg: %s,", err)
115+
return fmt.Errorf("error reading cfg: %s,", err)
116116
}
117117

118118
app := TradeClient{}
119119
fileLogFactory, err := quickfix.NewFileLogFactory(appSettings)
120120

121121
if err != nil {
122-
return fmt.Errorf("Error creating file log factory: %s,", err)
122+
return fmt.Errorf("error creating file log factory: %s,", err)
123123
}
124124

125125
initiator, err := quickfix.NewInitiator(app, quickfix.NewMemoryStoreFactory(), appSettings, fileLogFactory)
126126
if err != nil {
127-
return fmt.Errorf("Unable to create Initiator: %s\n", err)
127+
return fmt.Errorf("unable to create initiator: %s", err)
128128
}
129129

130130
err = initiator.Start()
131131
if err != nil {
132-
return fmt.Errorf("Unable to start Initiator: %s\n", err)
132+
return fmt.Errorf("unable to start initiator: %s", err)
133133
}
134134

135135
printConfig(bytes.NewReader(stringData))

0 commit comments

Comments
 (0)