chore(simapp/v2): consensus server isn't command dep

simapp/v2/simdv2/cmd/commands.go

@@ -46,10 +46,7 @@ type CommandDependencies[T transaction.Tx] struct {
 	TxConfig      client.TxConfig
 	ModuleManager *runtimev2.MM[T]
 	SimApp        *simapp.SimApp[T]
-	// could generally be more generic with serverv2.ServerComponent[T]
-	// however, we want to register extra grpc handlers
-	ConsensusServer *cometbft.CometBFTServer[T]
-	ClientContext   client.Context
+	ClientContext client.Context
 }
 
 func InitRootCmd[T transaction.Tx](
@@ -76,16 +73,13 @@ func InitRootCmd[T transaction.Tx](
 
 	// build CLI skeleton for initial config parsing or a client application invocation
 	if deps.SimApp == nil {
-		if deps.ConsensusServer == nil {
-			deps.ConsensusServer = cometbft.NewWithConfigOptions[T](initCometConfig())
-		}
 		return serverv2.AddCommands[T](
 			rootCmd,
 			logger,
 			io.NopCloser(nil),
 			deps.GlobalConfig,
 			initServerConfig(),
-			deps.ConsensusServer,
+			cometbft.NewWithConfigOptions[T](initCometConfig()),
 			&grpcserver.Server[T]{},
 			&serverstore.Server[T]{},
 			&telemetry.Server[T]{},
@@ -108,26 +102,24 @@ func InitRootCmd[T transaction.Tx](
 	}
 
 	// consensus component
-	if deps.ConsensusServer == nil {
-		deps.ConsensusServer, err = cometbft.New(
-			logger,
-			simApp.Name(),
-			simApp.Store(),
-			simApp.App.AppManager,
-			cometbft.AppCodecs[T]{
-				AppCodec:              simApp.AppCodec(),
-				TxCodec:               &client.DefaultTxDecoder[T]{TxConfig: deps.TxConfig},
-				LegacyAmino:           deps.ClientContext.LegacyAmino,
-				ConsensusAddressCodec: deps.ClientContext.ConsensusAddressCodec,
-			},
-			simApp.App.QueryHandlers(),
-			simApp.App.SchemaDecoderResolver(),
-			initCometOptions[T](),
-			deps.GlobalConfig,
-		)
-		if err != nil {
-			return nil, err
-		}
+	consensusServer, err := cometbft.New(
+		logger,
+		simApp.Name(),
+		simApp.Store(),
+		simApp.App.AppManager,
+		cometbft.AppCodecs[T]{
+			AppCodec:              simApp.AppCodec(),
+			TxCodec:               &client.DefaultTxDecoder[T]{TxConfig: deps.TxConfig},
+			LegacyAmino:           deps.ClientContext.LegacyAmino,
+			ConsensusAddressCodec: deps.ClientContext.ConsensusAddressCodec,
+		},
+		simApp.App.QueryHandlers(),
+		simApp.App.SchemaDecoderResolver(),
+		initCometOptions[T](),
+		deps.GlobalConfig,
+	)
+	if err != nil {
+		return nil, err
 	}
 
 	telemetryServer, err := telemetry.New[T](deps.GlobalConfig, logger, sdktelemetry.EnableTelemetry)
@@ -142,7 +134,7 @@ func InitRootCmd[T transaction.Tx](
 		simApp.Query,
 		deps.GlobalConfig,
 		grpcserver.WithExtraGRPCHandlers[T](
-			deps.ConsensusServer.GRPCServiceRegistrar(
+			consensusServer.GRPCServiceRegistrar(
 				deps.ClientContext,
 				deps.GlobalConfig,
 			),
@@ -161,7 +153,7 @@ func InitRootCmd[T transaction.Tx](
 	if err != nil {
 		return nil, err
 	}
-	registerGRPCGatewayRoutes[T](deps, grpcgatewayServer)
+	registerGRPCGatewayRoutes(deps.ClientContext, grpcgatewayServer)
 
 	// wire server commands
 	return serverv2.AddCommands[T](
@@ -170,7 +162,7 @@ func InitRootCmd[T transaction.Tx](
 		simApp,
 		deps.GlobalConfig,
 		initServerConfig(),
-		deps.ConsensusServer,
+		consensusServer,
 		grpcServer,
 		storeComponent,
 		telemetryServer,
@@ -268,14 +260,12 @@ func RootCommandPersistentPreRun(clientCtx client.Context) func(*cobra.Command,
 }
 
 // registerGRPCGatewayRoutes registers the gRPC gateway routes for all modules and other components
-// TODO(@julienrbrt): Eventually, this should removed and directly done within the grpcgateway.Server
-// ref: https://github.com/cosmos/cosmos-sdk/pull/22701#pullrequestreview-2470651390
 func registerGRPCGatewayRoutes[T transaction.Tx](
-	deps CommandDependencies[T],
+	clientContext client.Context,
 	server *grpcgateway.Server[T],
 ) {
 	// those are the extra services that the CometBFT server implements (server/v2/cometbft/grpc.go)
-	cmtservice.RegisterGRPCGatewayRoutes(deps.ClientContext, server.GRPCGatewayRouter)
-	_ = nodeservice.RegisterServiceHandlerClient(context.Background(), server.GRPCGatewayRouter, nodeservice.NewServiceClient(deps.ClientContext))
-	_ = txtypes.RegisterServiceHandlerClient(context.Background(), server.GRPCGatewayRouter, txtypes.NewServiceClient(deps.ClientContext))
+	cmtservice.RegisterGRPCGatewayRoutes(clientContext, server.GRPCGatewayRouter)
+	_ = nodeservice.RegisterServiceHandlerClient(context.Background(), server.GRPCGatewayRouter, nodeservice.NewServiceClient(clientContext))
+	_ = txtypes.RegisterServiceHandlerClient(context.Background(), server.GRPCGatewayRouter, txtypes.NewServiceClient(clientContext))
 }