Fix few nits

Signed-off-by: Sylvain Rabot <sylvain@abstraction.fr>
sylr · Dec 7, 2022 · 480f28e · 480f28e
1 parent d8d5387
commit 480f28e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 42 deletions.
diff --git a/cmd/cancel/cancel.go b/cmd/cancel/cancel.go
@@ -11,28 +11,11 @@ import (
 
 // CancelCmd represents the buy command
 var CancelCmd = &cobra.Command{
-	Use:   "cancel",
-	Short: "Send a cancel FIX message",
-	Long:  "Send a cancel FIX message after initiating a sesion with a FIX acceptor.",
-	RunE:  Execute,
-	PersistentPreRunE: func(cmd *cobra.Command, args []string) error {
-		if err := utils.ValidateRequiredFlags(cmd); err != nil {
-			return err
-		}
-
-		if err := initiator.ValidateOptions(cmd, args); err != nil {
-			return err
-		}
-
-		if cmd.HasParent() {
-			parent := cmd.Parent()
-			if parent.PersistentPreRunE != nil {
-				return parent.PersistentPreRunE(parent, args)
-			}
-		}
-
-		return nil
-	},
+	Use:               "cancel",
+	Short:             "Send a cancel FIX message",
+	Long:              "Send a cancel FIX message after initiating a sesion with a FIX acceptor.",
+	RunE:              Execute,
+	PersistentPreRunE: utils.MakePersistentPreRunE(initiator.ValidateOptions),
 }
 
 func init() {

diff --git a/cmd/cancel/mass/mass.go b/cmd/cancel/mass/mass.go
@@ -38,24 +38,8 @@ var MassCancelOrderCmd = &cobra.Command{
 	Long:              "Send mass cancel order request after initiating a session with a FIX acceptor.",
 	Args:              cobra.ExactArgs(0),
 	ValidArgsFunction: cobra.NoFileCompletions,
-	PersistentPreRunE: func(cmd *cobra.Command, args []string) error {
-		if err := utils.ValidateRequiredFlags(cmd); err != nil {
-			return err
-		}
-
-		if err := Validate(cmd, args); err != nil {
-			return err
-		}
-
-		if cmd.HasParent() {
-			parent := cmd.Parent()
-			if parent.PersistentPreRunE != nil {
-				return parent.PersistentPreRunE(cmd, args)
-			}
-		}
-		return nil
-	},
-	RunE: Execute,
+	PersistentPreRunE: utils.MakePersistentPreRunE(Validate),
+	RunE:              Execute,
 }
 
 func init() {

diff --git a/pkg/initiator/application/cancel_order.go b/pkg/initiator/application/cancel_order.go
@@ -100,6 +100,7 @@ func (app *CancelOrder) treatMessageByType(message *quickfix.Message, f func(enu
 	if err != nil {
 		app.Logger.Error().Msgf("Message type error: %s", err)
 	}
+
 	f(enum.MsgType(msgType), message)
 }
 
@@ -108,7 +109,7 @@ func (app *CancelOrder) FromAdmin(message *quickfix.Message, sessionID quickfix.
 	app.Logger.Debug().Msgf("<- Message received from admin")
 	app.LogMessage(zerolog.TraceLevel, message, sessionID, false)
 
-	app.treatMessageByType(message, func(msgType enum.MsgType, m *quickfix.Message) {
+	app.treatMessageByType(message, func(msgType enum.MsgType, _ *quickfix.Message) {
 		if msgType == enum.MsgType_REJECT {
 			app.FromAppMessages <- message
 		}
@@ -144,7 +145,7 @@ func (app *CancelOrder) FromApp(message *quickfix.Message, sessionID quickfix.Se
 	}
 	app.mux.RUnlock()
 
-	app.treatMessageByType(message, func(msgType enum.MsgType, m *quickfix.Message) {
+	app.treatMessageByType(message, func(msgType enum.MsgType, _ *quickfix.Message) {
 		switch msgType {
 		case enum.MsgType_EXECUTION_REPORT:
 			fallthrough