Skip to content

Commit

Permalink
fix(simapp/v2): wire swagger in testnet cmd (#23570)
Browse files Browse the repository at this point in the history
  • Loading branch information
julienrbrt authored Jan 31, 2025
1 parent ddf9e18 commit 009bcc3
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 1 deletion.
9 changes: 9 additions & 0 deletions server/v2/api/swagger/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,15 @@ func New[T transaction.Tx](
return s, nil
}

// NewWithConfigOptions creates a new telemetry server with the provided config options.
// It is *not* a fully functional server (since it has been created without dependencies)
// The returned server should only be used to get and set configuration.
func NewWithConfigOptions[T transaction.Tx](opts ...CfgOption) *Server[T] {
return &Server[T]{
cfgOptions: opts,
}
}

// Name returns the server's name
func (s *Server[T]) Name() string {
return ServerName
Expand Down
11 changes: 10 additions & 1 deletion simapp/v2/simdv2/cmd/testnet.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import (
"cosmossdk.io/server/v2/api/grpc"
"cosmossdk.io/server/v2/api/grpcgateway"
"cosmossdk.io/server/v2/api/rest"
"cosmossdk.io/server/v2/api/swagger"
"cosmossdk.io/server/v2/api/telemetry"
"cosmossdk.io/server/v2/cometbft"
"cosmossdk.io/server/v2/store"
Expand Down Expand Up @@ -188,6 +189,7 @@ func initTestnetFiles[T transaction.Tx](
grpcPort = 9090
restPort = 8080
telemetryPort = 7180
swaggerPort = 8090
)
p2pPortStart := 26656

Expand All @@ -199,6 +201,7 @@ func initTestnetFiles[T transaction.Tx](
grpcgatewayConfig := grpcgateway.DefaultConfig()
restConfig := rest.DefaultConfig()
telemetryConfig := telemetry.DefaultConfig()
swaggerConfig := swagger.DefaultConfig()

if args.singleMachine {
portOffset = i
Expand Down Expand Up @@ -228,6 +231,11 @@ func initTestnetFiles[T transaction.Tx](
Enable: true,
Address: fmt.Sprintf("127.0.0.1:%d", telemetryPort+portOffset),
}

swaggerConfig = &swagger.Config{
Enable: true,
Address: fmt.Sprintf("127.0.0.1:%d", swaggerPort+portOffset),
}
}

nodeDirName := fmt.Sprintf("%s%d", args.nodeDirPrefix, i)
Expand Down Expand Up @@ -364,7 +372,8 @@ func initTestnetFiles[T transaction.Tx](
grpcgatewayServer := grpcgateway.NewWithConfigOptions[T](grpcgateway.OverwriteDefaultConfig(grpcgatewayConfig))
restServer := rest.NewWithConfigOptions[T](rest.OverwriteDefaultConfig(restConfig))
telemetryServer := telemetry.NewWithConfigOptions[T](telemetry.OverwriteDefaultConfig(telemetryConfig))
server := serverv2.NewServer[T](serverCfg, cometServer, storeServer, grpcServer, grpcgatewayServer, restServer, telemetryServer)
swaggerServer := swagger.NewWithConfigOptions[T](swagger.OverwriteDefaultConfig(swaggerConfig))
server := serverv2.NewServer[T](serverCfg, cometServer, storeServer, grpcServer, grpcgatewayServer, restServer, telemetryServer, swaggerServer)
err = server.WriteConfig(filepath.Join(nodeDir, "config"))
if err != nil {
return err
Expand Down

0 comments on commit 009bcc3

Please sign in to comment.