Skip to content

Commit afed0b7

Browse files
committed
Corrects ioutil pkg usage
1 parent a332c80 commit afed0b7

File tree

4 files changed

+8
-10
lines changed

4 files changed

+8
-10
lines changed

_test/test-server/main.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package main
33
import (
44
"bytes"
55
"fmt"
6-
"io/ioutil"
6+
"io"
77
"log"
88
"os"
99
"os/signal"
@@ -92,7 +92,7 @@ func copyMessage(msg *quickfix.Message) *quickfix.Message {
9292

9393
func main() {
9494
app := &EchoApplication{}
95-
app.log = log.New(ioutil.Discard, "", log.LstdFlags)
95+
app.log = log.New(io.Discard, "", log.LstdFlags)
9696
//app.log = log.New(os.Stdout, "", log.LstdFlags)
9797

9898
router.AddRoute(quickfix.BeginStringFIX40, "D", app.processMsg)

filestore.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ package quickfix
1818
import (
1919
"fmt"
2020
"io"
21-
"io/ioutil"
2221
"os"
2322
"path"
2423
"strconv"
@@ -205,23 +204,23 @@ func (store *fileStore) populateCache() (creationTimePopulated bool, err error)
205204
}
206205
}
207206

208-
if timeBytes, err := ioutil.ReadFile(store.sessionFname); err == nil {
207+
if timeBytes, err := os.ReadFile(store.sessionFname); err == nil {
209208
var ctime time.Time
210209
if err := ctime.UnmarshalText(timeBytes); err == nil {
211210
store.cache.creationTime = ctime
212211
creationTimePopulated = true
213212
}
214213
}
215214

216-
if senderSeqNumBytes, err := ioutil.ReadFile(store.senderSeqNumsFname); err == nil {
215+
if senderSeqNumBytes, err := os.ReadFile(store.senderSeqNumsFname); err == nil {
217216
if senderSeqNum, err := strconv.Atoi(strings.Trim(string(senderSeqNumBytes), "\r\n")); err == nil {
218217
if err = store.cache.SetNextSenderMsgSeqNum(senderSeqNum); err != nil {
219218
return creationTimePopulated, errors.Wrap(err, "cache set next sender")
220219
}
221220
}
222221
}
223222

224-
if targetSeqNumBytes, err := ioutil.ReadFile(store.targetSeqNumsFname); err == nil {
223+
if targetSeqNumBytes, err := os.ReadFile(store.targetSeqNumsFname); err == nil {
225224
if targetSeqNum, err := strconv.Atoi(strings.Trim(string(targetSeqNumBytes), "\r\n")); err == nil {
226225
if err = store.cache.SetNextTargetMsgSeqNum(targetSeqNum); err != nil {
227226
return creationTimePopulated, errors.Wrap(err, "cache set next target")

sqlstore_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ package quickfix
1818
import (
1919
"database/sql"
2020
"fmt"
21-
"io/ioutil"
2221
"os"
2322
"path"
2423
"path/filepath"
@@ -50,7 +49,7 @@ func (suite *SQLStoreTestSuite) SetupTest() {
5049
ddlFnames, err := filepath.Glob(fmt.Sprintf("_sql/%s/*.sql", sqlDriver))
5150
require.Nil(suite.T(), err)
5251
for _, fname := range ddlFnames {
53-
sqlBytes, err := ioutil.ReadFile(fname)
52+
sqlBytes, err := os.ReadFile(fname)
5453
require.Nil(suite.T(), err)
5554
_, err = db.Exec(string(sqlBytes))
5655
require.Nil(suite.T(), err)

tls.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import (
1919
"crypto/tls"
2020
"crypto/x509"
2121
"fmt"
22-
"io/ioutil"
22+
"os"
2323

2424
"github.com/quickfixgo/quickfix/config"
2525
)
@@ -95,7 +95,7 @@ func loadTLSConfig(settings *SessionSettings) (tlsConfig *tls.Config, err error)
9595
return
9696
}
9797

98-
pem, err := ioutil.ReadFile(caFile)
98+
pem, err := os.ReadFile(caFile)
9999
if err != nil {
100100
return
101101
}

0 commit comments

Comments
 (0)