save appCreator in store component

cosmos · Aug 6, 2024 · 4735146 · 4735146
1 parent de47370
commit 4735146
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 14 deletions.
diff --git a/server/v2/store/server.go b/server/v2/store/server.go
@@ -15,11 +15,13 @@ import (
 // StoreComponent manages store config
 // and contains prune & snapshot commands
 type StoreComponent[T transaction.Tx] struct {
-	config *Config
+	config     *Config
+	// saving appCreator for only RestoreSnapshotCmd
+	appCreator serverv2.AppCreator[T] 
 }
 
-func New[T transaction.Tx]() *StoreComponent[T] {
-	return &StoreComponent[T]{}
+func New[T transaction.Tx](appCreator serverv2.AppCreator[T]) *StoreComponent[T] {
+	return &StoreComponent[T]{appCreator: appCreator}
 }
 
 func (s *StoreComponent[T]) Init(appI serverv2.AppI[T], v *viper.Viper, logger log.Logger) error {
@@ -54,6 +56,7 @@ func (s *StoreComponent[T]) CLICommands() serverv2.CLIConfig {
 			s.ListSnapshotsCmd(),
 			s.DumpArchiveCmd(),
 			s.LoadArchiveCmd(),
+			s.RestoreSnapshotCmd(s.appCreator),
 		},
 	}
 }

diff --git a/simapp/v2/simdv2/cmd/commands.go b/simapp/v2/simdv2/cmd/commands.go
@@ -68,7 +68,7 @@ func initRootCmd[T transaction.Tx](
 		offchain.OffChain(),
 	)
 
-	storeComponent := store.New[T]()
+	storeComponent := store.New[T](newApp)
 	// wire server commands
 	if err = serverv2.AddCommands(
 		rootCmd,
@@ -80,14 +80,6 @@ func initRootCmd[T transaction.Tx](
 	); err != nil {
 		panic(err)
 	}
-
-	// Add RestoreSnapshotCmd separately cause need appCreator
-	for _, cmd := range rootCmd.Commands() {
-		if cmd.Use == storeComponent.Name() {
-			cmd.AddCommand(storeComponent.RestoreSnapshotCmd(newApp))
-			break
-		}
-	}
 }
 
 // genesisCommand builds genesis-related `simd genesis` command. Users may provide application specific commands as a parameter

diff --git a/simapp/v2/simdv2/cmd/testnet.go b/simapp/v2/simdv2/cmd/testnet.go
@@ -343,7 +343,7 @@ func initTestnetFiles[T transaction.Tx](
 			cometbft.ServerOptions[T]{},
 			cometbft.OverwriteDefaultConfigTomlConfig(nodeConfig),
 		)
-		storeServer := store.New[T]()
+		storeServer := store.New[T](newApp)
 		grpcServer := grpc.New[T](grpc.OverwriteDefaultConfig(grpcConfig))
 		server := serverv2.NewServer(log.NewNopLogger(), cometServer, grpcServer, storeServer)
 		err = server.WriteConfig(filepath.Join(nodeDir, "config"))
@@ -366,7 +366,7 @@ func initTestnetFiles[T transaction.Tx](
 	}
 
 	// Update viper root since root dir become rootdir/node/simd
-	client.GetViperFromCmd(cmd).Set(flags.FlagHome, nodeConfig.RootDir)
+	serverv2.GetViperFromCmd(cmd).Set(flags.FlagHome, nodeConfig.RootDir)
 
 	cmd.PrintErrf("Successfully initialized %d node directories\n", args.numValidators)
 	return nil