From 4436cd5881ef1a680956df6cd0eacce3e530e760 Mon Sep 17 00:00:00 2001 From: Vladyslav Budichenko Date: Fri, 25 Oct 2024 00:24:14 -0400 Subject: [PATCH] wip: added autocli to test build --- app/app.go | 41 ++++++++++++++++++++++------------------- go.mod | 1 + 2 files changed, 23 insertions(+), 19 deletions(-) diff --git a/app/app.go b/app/app.go index e31aa87fbc..26950a9e22 100644 --- a/app/app.go +++ b/app/app.go @@ -16,6 +16,8 @@ package app import ( + "cosmossdk.io/client/v2/autocli" + "cosmossdk.io/core/appmodule" "cosmossdk.io/x/feegrant" "encoding/json" "fmt" @@ -53,6 +55,7 @@ import ( "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/codec/types" "github.com/cosmos/cosmos-sdk/runtime" + runtimeservices "github.com/cosmos/cosmos-sdk/runtime/services" "github.com/cosmos/cosmos-sdk/server/api" "github.com/cosmos/cosmos-sdk/server/config" servertypes "github.com/cosmos/cosmos-sdk/server/types" @@ -900,25 +903,25 @@ func (app *EthermintApp) RegisterNodeService(clientCtx client.Context, cfg confi } // AutoCliOpts returns the autocli options for the app. -//func (app *EthermintApp) AutoCliOpts() autocli.AppOptions { -// modules := make(map[string]appmodule.AppModule, 0) -// for _, m := range app.mm.Modules { -// if moduleWithName, ok := m.(module.HasName); ok { -// moduleName := moduleWithName.Name() -// if appModule, ok := moduleWithName.(appmodule.AppModule); ok { -// modules[moduleName] = appModule -// } -// } -// } -// -// return autocli.AppOptions{ -// Modules: modules, -// ModuleOptions: runtimeservices.ExtractAutoCLIOptions(app.mm.Modules), -// AddressCodec: authcodec.NewBech32Codec(sdk.GetConfig().GetBech32AccountAddrPrefix()), -// ValidatorAddressCodec: authcodec.NewBech32Codec(sdk.GetConfig().GetBech32ValidatorAddrPrefix()), -// ConsensusAddressCodec: authcodec.NewBech32Codec(sdk.GetConfig().GetBech32ConsensusAddrPrefix()), -// } -//} +func (app *EthermintApp) AutoCliOpts() autocli.AppOptions { + modules := make(map[string]appmodule.AppModule, 0) + for _, m := range app.mm.Modules { + if moduleWithName, ok := m.(module.HasName); ok { + moduleName := moduleWithName.Name() + if appModule, ok := moduleWithName.(appmodule.AppModule); ok { + modules[moduleName] = appModule + } + } + } + + return autocli.AppOptions{ + Modules: modules, + ModuleOptions: runtimeservices.ExtractAutoCLIOptions(app.mm.Modules), + AddressCodec: authcodec.NewBech32Codec(sdk.GetConfig().GetBech32AccountAddrPrefix()), + ValidatorAddressCodec: authcodec.NewBech32Codec(sdk.GetConfig().GetBech32ValidatorAddrPrefix()), + ConsensusAddressCodec: authcodec.NewBech32Codec(sdk.GetConfig().GetBech32ConsensusAddrPrefix()), + } +} // RegisterSwaggerAPI registers swagger route with API Server func RegisterSwaggerAPI(_ client.Context, rtr *mux.Router) { diff --git a/go.mod b/go.mod index 6e54926409..e8610a6e84 100644 --- a/go.mod +++ b/go.mod @@ -3,6 +3,7 @@ module github.com/evmos/ethermint go 1.21 require ( + cosmossdk.io/client/v2 v2.0.0-beta.3 cosmossdk.io/core v0.11.1 cosmossdk.io/errors v1.0.1 cosmossdk.io/log v1.4.1