LaconicNetwork/cosmos-sdk
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

fix(simapp/v2): wire swagger in testnet cmd (#23570)

Browse Source
This commit is contained in:
Julien Robert 2025-01-31 16:34:37 +01:00 committed by GitHub
parent ddf9e18ee4
commit 009bcc38e5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
server/v2/api/swagger/server.go
View File

@ -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

11
simapp/v2/simdv2/cmd/testnet.go
View File

@ -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"
@ -188,6 +189,7 @@ func initTestnetFiles[T transaction.Tx](
grpcPort = 9090
restPort = 8080
telemetryPort = 7180
swaggerPort = 8090
)
p2pPortStart := 26656
@ -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
@ -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)
@ -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