Formatting

Author: ackleymi

fileutil.go

@@ -19,8 +19,6 @@ import (
 	"fmt"
 	"os"
 	"strings"
-
-	"github.com/pkg/errors"
 )
 
 func sessionIDFilenamePrefix(s SessionID) string {
@@ -47,26 +45,6 @@ func sessionIDFilenamePrefix(s SessionID) string {
 	return strings.Join(fname, "-")
 }
 
-// closeFile behaves like Close, except that no error is returned if the file does not exist.
-func closeFile(f *os.File) error {
-	if f != nil {
-		if err := f.Close(); err != nil {
-			if !os.IsNotExist(err) {
-				return err
-			}
-		}
-	}
-	return nil
-}
-
-// removeFile behaves like os.Remove, except that no error is returned if the file does not exist.
-func removeFile(fname string) error {
-	if err := os.Remove(fname); (err != nil) && !os.IsNotExist(err) {
-		return errors.Wrapf(err, "remove %v", fname)
-	}
-	return nil
-}
-
 // openOrCreateFile opens a file for reading and writing, creating it if necessary.
 func openOrCreateFile(fname string, perm os.FileMode) (f *os.File, err error) {
 	if f, err = os.OpenFile(fname, os.O_RDWR, perm); err != nil {

internal/testsuite/store_suite.go

@@ -29,8 +29,7 @@ type StoreTestSuite struct {
 	MsgStore quickfix.MessageStore
 }
 
-
-func (s *StoreTestSuite) TestMessageStore_SetNextMsgSeqNum_Refresh_IncrNextMsgSeqNum() {
+func (s *StoreTestSuite) TestMessageStoreSetNextMsgSeqNumRefreshIncrNextMsgSeqNum() {
 	// Given a MessageStore with the following sender and target seqnums
 	s.Require().Nil(s.MsgStore.SetNextSenderMsgSeqNum(867))
 	s.Require().Nil(s.MsgStore.SetNextTargetMsgSeqNum(5309))
@@ -58,7 +57,7 @@ func (s *StoreTestSuite) TestMessageStore_SetNextMsgSeqNum_Refresh_IncrNextMsgSe
 	s.Equal(5310, s.MsgStore.NextTargetMsgSeqNum())
 }
 
-func (s *StoreTestSuite) TestMessageStore_Reset() {
+func (s *StoreTestSuite) TestMessageStoreReset() {
 	// Given a MessageStore with the following sender and target seqnums
 	s.Require().Nil(s.MsgStore.SetNextSenderMsgSeqNum(1234))
 	s.Require().Nil(s.MsgStore.SetNextTargetMsgSeqNum(5678))
@@ -78,7 +77,7 @@ func (s *StoreTestSuite) TestMessageStore_Reset() {
 	s.Equal(1, s.MsgStore.NextTargetMsgSeqNum())
 }
 
-func (s *StoreTestSuite) TestMessageStore_SaveMessage_GetMessage() {
+func (s *StoreTestSuite) TestMessageStoreSaveMessageGetMessage() {
 	// Given the following saved messages
 	expectedMsgsBySeqNum := map[int]string{
 		1: "In the frozen land of Nador",
@@ -113,7 +112,7 @@ func (s *StoreTestSuite) TestMessageStore_SaveMessage_GetMessage() {
 	s.Equal(expectedMsgsBySeqNum[3], string(actualMsgs[2]))
 }
 
-func (s *StoreTestSuite) TestMessageStore_SaveMessage_AndIncrement_GetMessage() {
+func (s *StoreTestSuite) TestMessageStoreSaveMessageAndIncrementGetMessage() {
 	s.Require().Nil(s.MsgStore.SetNextSenderMsgSeqNum(420))
 
 	// Given the following saved messages
@@ -153,7 +152,7 @@ func (s *StoreTestSuite) TestMessageStore_SaveMessage_AndIncrement_GetMessage()
 	s.Equal(expectedMsgsBySeqNum[3], string(actualMsgs[2]))
 }
 
-func (s *StoreTestSuite) TestMessageStore_GetMessages_EmptyStore() {
+func (s *StoreTestSuite) TestMessageStoreGetMessagesEmptyStore() {
 	// When messages are retrieved from an empty store
 	messages, err := s.MsgStore.GetMessages(1, 2)
 	require.Nil(s.T(), err)
@@ -162,7 +161,7 @@ func (s *StoreTestSuite) TestMessageStore_GetMessages_EmptyStore() {
 	require.Empty(s.T(), messages, "Did not expect messages from empty store")
 }
 
-func (s *StoreTestSuite) TestMessageStore_GetMessages_VariousRanges() {
+func (s *StoreTestSuite) TestMessageStoreGetMessagesVariousRanges() {
 	t := s.T()
 
 	// Given the following saved messages
@@ -197,7 +196,7 @@ func (s *StoreTestSuite) TestMessageStore_GetMessages_VariousRanges() {
 	}
 }
 
-func (s *StoreTestSuite) TestMessageStore_CreationTime() {
+func (s *StoreTestSuite) TestMessageStoreCreationTime() {
 	s.False(s.MsgStore.CreationTime().IsZero())
 
 	t0 := time.Now()

memorystore.go

@@ -21,7 +21,6 @@ import (
 	"github.com/pkg/errors"
 )
 
-
 type memoryStore struct {
 	senderMsgSeqNum, targetMsgSeqNum int
 	creationTime                     time.Time

store.go

@@ -31,8 +31,7 @@ type MessageStore interface {
 	SetNextTargetMsgSeqNum(next int) error
 
 	CreationTime() time.Time
-	SetCreationTime(time.Time) 
-
+	SetCreationTime(time.Time)
 
 	SaveMessage(seqNum int, msg []byte) error
 	SaveMessageAndIncrNextSenderMsgSeqNum(seqNum int, msg []byte) error

store/file/filestore.go

@@ -103,11 +103,11 @@ func newFileStore(sessionID quickfix.SessionID, dirname string, fileSync bool) (
 	memStore, memErr := quickfix.NewMemoryStoreFactory().Create(sessionID)
 	if memErr != nil {
 		return nil, errors.Wrap(memErr, "cache creation")
-	} 
+	}
 
 	store := &fileStore{
 		sessionID:          sessionID,
-		cache:             memStore,
+		cache:              memStore,
 		offsets:            make(map[int]msgDef),
 		bodyFname:          path.Join(dirname, fmt.Sprintf("%s.%s", sessionPrefix, "body")),
 		headerFname:        path.Join(dirname, fmt.Sprintf("%s.%s", sessionPrefix, "header")),
@@ -322,7 +322,7 @@ func (store *fileStore) CreationTime() time.Time {
 }
 
 // SetCreationTime is a no-op for FileStore.
-func (store *fileStore) SetCreationTime(_ time.Time)  {
+func (store *fileStore) SetCreationTime(_ time.Time) {
 }
 
 func (store *fileStore) SaveMessage(seqNum int, msg []byte) error {

store/file/util.go

@@ -24,7 +24,6 @@ import (
 	"github.com/quickfixgo/quickfix"
 )
 
-
 func createFilenamePrefix(s quickfix.SessionID) string {
 	sender := []string{s.SenderCompID}
 	if s.SenderSubID != "" {

store/memory/ignore.go

@@ -1,3 +1,3 @@
 package memory
 
-// This is a test-only package. This ignore file is intentional.
+// This is a test-only package. This ignore file is intentional.

store/mongo/mongostore.go

@@ -94,7 +94,7 @@ func newMongoStore(sessionID quickfix.SessionID, mongoURL, mongoDatabase, mongoR
 	if memErr != nil {
 		err = errors.Wrap(memErr, "cache creation")
 		return
-	} 
+	}
 
 	allowTransactions := len(mongoReplicaSet) > 0
 	store = &mongoStore{
@@ -281,7 +281,7 @@ func (store *mongoStore) CreationTime() time.Time {
 }
 
 // SetCreationTime is a no-op for MongoStore.
-func (store *mongoStore) SetCreationTime(_ time.Time)  {
+func (store *mongoStore) SetCreationTime(_ time.Time) {
 }
 
 func (store *mongoStore) SaveMessage(seqNum int, msg []byte) (err error) {

store/sql/sqlstore.go

@@ -104,7 +104,7 @@ func newSQLStore(sessionID quickfix.SessionID, driver string, dataSourceName str
 	if memErr != nil {
 		err = errors.Wrap(memErr, "cache creation")
 		return
-	} 
+	}
 
 	store = &sqlStore{
 		sessionID:          sessionID,
@@ -289,7 +289,7 @@ func (store *sqlStore) CreationTime() time.Time {
 }
 
 // SetCreationTime is a no-op for SQLStore.
-func (store *sqlStore) SetCreationTime(_ time.Time)  {
+func (store *sqlStore) SetCreationTime(_ time.Time) {
 }
 
 func (store *sqlStore) SaveMessage(seqNum int, msg []byte) error {