fixup! feat(cosmos)!: add required export-dir export cmd option

golang/cosmos/daemon/cmd/root.go

@@ -135,13 +135,12 @@ func initRootCmd(sender Sender, rootCmd *cobra.Command, encodingConfig params.En
 	}
 	server.AddCommands(rootCmd, gaia.DefaultNodeHome, ac.newApp, ac.appExport, addModuleInitFlags)
 
+	hasVMController := sender != nil
 	for _, command := range rootCmd.Commands() {
-		if command.Name() != "export" {
-			continue
+		if command.Name() == "export" {
+			extendCosmosExportCommand(command, hasVMController)
+			break
 		}
-
-		extendCosmosExportCommand(command, sender != nil)
-		break
 	}
 
 	// add keybase, auxiliary RPC, query, and tx child commands
@@ -284,11 +283,17 @@ func (ac appCreator) newApp(
 }
 
 const (
-	FlagExportDir                   = "export-dir"
-	ExportedGenesisFileName         = "genesis.json"
+	// FlagExportDir is the command-line flag for the "export" command specifying
+	// where the output of the export should be placed.
+	FlagExportDir = "export-dir"
+	// ExportedGenesisFileName is the file name used to save the genesis in the export-dir
+	ExportedGenesisFileName = "genesis.json"
 	ExportedSwingStoreDirectoryName = "swing-store"
 )
 
+// extendCosmosExportCommand monkey-patches the "export" command added by
+// cosmos-sdk to add a required "export-dir" command-line flag, and create the
+// genesis export in the specified directory.
 func extendCosmosExportCommand(cmd *cobra.Command, hasVMController bool) {
 	cmd.Flags().String(FlagExportDir, "", "The directory where to create the genesis export")
 	err := cmd.MarkFlagRequired(FlagExportDir)
@@ -316,6 +321,7 @@ func extendCosmosExportCommand(cmd *cobra.Command, hasVMController bool) {
 		}
 		serverCtx.Viper.Set(gaia.FlagSwingStoreExportDir, swingStoreExportPath)
 
+		// This will fail is a genesis.json already exists in the export-dir
 		genesisFile, err := os.OpenFile(genesisPath, os.O_CREATE|os.O_EXCL|os.O_WRONLY, os.ModePerm)
 		if err != nil {
 			return err
@@ -327,9 +333,10 @@ func extendCosmosExportCommand(cmd *cobra.Command, hasVMController bool) {
 		return originalRunE(cmd, args)
 	}
 
-	// Only do modify the command handler if we actually have a controller.
-	// Otherwise, there will be an exec of the VM program (OnExportHook), where
-	// this will handle all of the export logic.
+	// Only modify the command handler when we have a VM controller to handle
+	// the full export logic. Otherwise, appExport will just exec the VM program
+	// (OnExportHook), which will result in re-entering this flow with the VM
+	// controller set.
 	if hasVMController {
 		cmd.RunE = extendedRunE
 	}