Refactor dumpRounds

cmd/dumpRounds.go

@@ -11,16 +11,19 @@ package cmd
 import (
 	"encoding/base64"
 	"fmt"
-	"github.com/spf13/viper"
 	"strconv"
 	"time"
 
+	"github.com/spf13/viper"
+
 	"github.com/spf13/cobra"
 	jww "github.com/spf13/jwalterweatherman"
 	"gitlab.com/elixxir/client/cmix/rounds"
+	"gitlab.com/elixxir/client/xxdk"
 	"gitlab.com/xx_network/comms/signature"
 	"gitlab.com/xx_network/crypto/signature/ec"
 	"gitlab.com/xx_network/primitives/id"
+	"gitlab.com/xx_network/primitives/ndf"
 )
 
 // dumpRoundsCmd allows the user to view network information about a specific
@@ -48,22 +51,22 @@ var dumpRoundsCmd = &cobra.Command{
 			})
 		waitUntilConnected(connected)
 
-		numRequests := len(roundIDs)
-		requestCh := make(chan bool, numRequests)
+		roundInfos := dumpRounds(roundIDs, user)
 
-		registration := user.GetStorage().GetNDF().Registration
-		ecp := registration.EllipticPubKey
-		pubkey, err := ec.LoadPublicKey(ecp)
-		if err != nil {
-			jww.FATAL.Panicf("%+v", err)
+		ndf := user.GetStorage().GetNDF()
+
+		for i := range roundInfos {
+			printRoundInfo(roundInfos[i])
+			printAndVerifyRoundSig(roundInfos[i], ndf)
+		}
+	},
 }
-		fmt.Printf("registration pubkey: %s\n\n", pubkey.MarshalText())
 
-		rcb := func(round rounds.Round, success bool) {
-			if !success {
-				fmt.Printf("round %v lookup failed", round.ID)
+func init() {
+	rootCmd.AddCommand(dumpRoundsCmd)
 }
 
+func printRoundInfo(round rounds.Round) {
 	fmt.Printf("Round %v:", round.ID)
 	fmt.Printf("\n\tBatch size: %v, State: %v",
 		round.BatchSize, round.State)
@@ -97,6 +100,16 @@ var dumpRoundsCmd = &cobra.Command{
 			base64.StdEncoding.EncodeToString(
 				ce.Source))
 	}
+}
+
+func printAndVerifyRoundSig(round rounds.Round, ndf *ndf.NetworkDefinition) {
+	registration := ndf.Registration
+	ecp := registration.EllipticPubKey
+	pubkey, err := ec.LoadPublicKey(ecp)
+	if err != nil {
+		jww.FATAL.Panicf("%+v", err)
+	}
+	fmt.Printf("registration pubkey: %s\n\n", pubkey.MarshalText())
 
 	ri := round.Raw
 	err = signature.VerifyEddsa(ri, pubkey)
@@ -118,8 +131,17 @@ var dumpRoundsCmd = &cobra.Command{
 	// } else {
 	// 	fmt.Printf("RSA signature succeeded!")
 	// }
+}
+
+func dumpRounds(roundIDs []id.Round, user *xxdk.E2e) []rounds.Round {
+	numRequests := len(roundIDs)
+	requestCh := make(chan rounds.Round, numRequests)
 
-			requestCh <- success
+	rcb := func(round rounds.Round, success bool) {
+		if !success {
+			fmt.Printf("round %v lookup failed", round.ID)
+		}
+		requestCh <- round
 	}
 
 	for i := range roundIDs {
@@ -130,15 +152,13 @@ var dumpRoundsCmd = &cobra.Command{
 		}
 	}
 
+	roundInfos := make([]rounds.Round, 0)
 	for done := 0; done < numRequests; done++ {
 		res := <-requestCh
+		roundInfos = append(roundInfos, res)
 		fmt.Printf("request complete: %v", res)
 	}
-	},
-}
-
-func init() {
-	rootCmd.AddCommand(dumpRoundsCmd)
+	return roundInfos
 }
 
 func parseRoundIDs(roundStrs []string) []id.Round {