Address issues with pull-root-block & generate-root-block-vote

Author: sjonpaulbrown

cmd/bootstrap/transit/cmd/generate_root_block_vote.go

@@ -26,10 +26,10 @@ var generateVoteCmd = &cobra.Command{
 
 func init() {
 	rootCmd.AddCommand(generateVoteCmd)
-	addGenerateRootBlockCmdFlags()
+	addGenerateVoteCmdFlags()
 }
 
-func addGenerateRootBlockCmdFlags() {
+func addGenerateVoteCmdFlags() {
 	generateVoteCmd.Flags().StringVarP(&flagOutputDir, "outputDir", "o", "", "ouput directory for vote files; if not set defaults to bootstrap directory")
 }
 
@@ -83,6 +83,12 @@ func generateVote(c *cobra.Command, args []string) {
 	signer := verification.NewCombinedSigner(me, beaconKeyStore)
 
 	path = filepath.Join(flagBootDir, bootstrap.PathRootBlockData)
+
+	// If output directory is specified, use it for the root-block.json
+	if flagOutputDir != "" {
+		path = filepath.Join(flagOutputDir, "root-block.json")
+	}
+
 	data, err = io.ReadFile(path)
 	if err != nil {
 		log.Fatal().Err(err).Msg("could not read root block file")

cmd/bootstrap/transit/cmd/pull_root_block.go

@@ -63,6 +63,8 @@ func pullRootBlock(c *cobra.Command, args []string) {
 		log.Fatal().Err(err).Msgf("could not download google bucket file")
 	}
 
+	log.Info().Msg("successfully downloaded root block ")
+
 	objectName := filepath.Join(flagToken, fmt.Sprintf(FilenameRandomBeaconCipher, nodeID))
 
 	// By default, use the bootstrap directory for the random beacon download & unwrapping
@@ -83,12 +85,12 @@ func pullRootBlock(c *cobra.Command, args []string) {
 
 	err = bucket.DownloadFile(ctx, client, fullRandomBeaconPath, objectName)
 	if err != nil {
-		log.Fatal().Err(err).Msg("could not download file from google bucket")
-	}
-	err = unWrapFile(flagBootDir, nodeID, flagOutputDir, unWrappedRandomBeaconPath)
-	if err != nil {
-		log.Fatal().Err(err).Msg("could not unwrap random beacon file")
+		log.Info().Msg("could not download file from google bucket")
+	} else {
+		err = unWrapFile(flagBootDir, nodeID, flagOutputDir, unWrappedRandomBeaconPath)
+		if err != nil {
+			log.Fatal().Err(err).Msg("could not unwrap random beacon file")
+		}
+		log.Info().Msg("successfully downloaded and unwrapped random beacon private key")
 	}
-
-	log.Info().Msg("successfully downloaded root block and random beacon key")
 }