remove some code duplication

Author: umbynos

cli/certificates/flash.go

@@ -190,12 +190,12 @@ func run(cmd *cobra.Command, args []string) {
 	}
 
 	// Print the results
-	feedback.PrintResult(&flashResult{
-		Programmer: (&ExecOutput{
+	feedback.PrintResult(&flasher.FlashResult{
+		Programmer: (&flasher.ExecOutput{
 			Stdout: programmerOut.String(),
 			Stderr: programmerErr.String(),
 		}),
-		Flasher: (&ExecOutput{
+		Flasher: (&flasher.ExecOutput{
 			Stdout: flasherOut.String(),
 			Stderr: flasherErr.String(),
 		}),
@@ -205,22 +205,3 @@ func run(cmd *cobra.Command, args []string) {
 		os.Exit(errorcodes.ErrGeneric)
 	}
 }
-
-type flashResult struct {
-	Programmer *ExecOutput `json:"programmer"`
-	Flasher    *ExecOutput `json:"flasher"`
-}
-
-type ExecOutput struct {
-	Stdout string `json:"stdout"`
-	Stderr string `json:"stderr"`
-}
-
-func (r *flashResult) Data() interface{} {
-	return r
-}
-
-func (r *flashResult) String() string {
-	// The output is already printed via os.Stdout/os.Stdin
-	return ""
-}

cli/firmware/flash.go

@@ -216,12 +216,12 @@ func run(cmd *cobra.Command, args []string) {
 	}
 
 	// Print the results
-	feedback.PrintResult(&flashResult{
-		Programmer: (&ExecOutput{
+	feedback.PrintResult(&flasher.FlashResult{
+		Programmer: (&flasher.ExecOutput{
 			Stdout: programmerOut.String(),
 			Stderr: programmerErr.String(),
 		}),
-		Flasher: (&ExecOutput{
+		Flasher: (&flasher.ExecOutput{
 			Stdout: flasherOut.String(),
 			Stderr: flasherErr.String(),
 		}),
@@ -231,22 +231,3 @@ func run(cmd *cobra.Command, args []string) {
 		os.Exit(errorcodes.ErrGeneric)
 	}
 }
-
-type flashResult struct {
-	Programmer *ExecOutput `json:"programmer"`
-	Flasher    *ExecOutput `json:"flasher"`
-}
-
-type ExecOutput struct {
-	Stdout string `json:"stdout"`
-	Stderr string `json:"stderr"`
-}
-
-func (r *flashResult) Data() interface{} {
-	return r
-}
-
-func (r *flashResult) String() string {
-	// The output is already printed via os.Stdout/os.Stdin
-	return ""
-}

flasher/flasher.go

@@ -93,3 +93,22 @@ func openSerial(portAddress string) (serial.Port, error) {
 
 	return nil, lastError
 }
+
+type FlashResult struct {
+	Programmer *ExecOutput `json:"programmer"`
+	Flasher    *ExecOutput `json:"flasher"`
+}
+
+type ExecOutput struct {
+	Stdout string `json:"stdout"`
+	Stderr string `json:"stderr"`
+}
+
+func (r *FlashResult) Data() interface{} {
+	return r
+}
+
+func (r *FlashResult) String() string {
+	// The output is already printed via os.Stdout/os.Stdin
+	return ""
+}