Skip to content

Commit

Permalink
chore: update regression test
Browse files Browse the repository at this point in the history
  • Loading branch information
shreyasbhat0 committed Aug 1, 2024
1 parent 147c037 commit f9d7f93
Show file tree
Hide file tree
Showing 3 changed files with 53 additions and 21 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
- name: Setup Golang
uses: actions/setup-go@v3
with:
go-version: 1.20.x
go-version: 1.21.x
# cache: true
- name: Compile Protobuf
run: |
Expand All @@ -44,7 +44,7 @@ jobs:
- name: Setup Golang
uses: actions/setup-go@v3
with:
go-version: 1.20.x
go-version: 1.21.x
# cache: true
- name: Compile Protobuf
run: |
Expand Down
58 changes: 50 additions & 8 deletions app/app_regtest.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@ import (

autocliv1 "cosmossdk.io/api/cosmos/autocli/v1"
reflectionv1 "cosmossdk.io/api/cosmos/reflection/v1"
"cosmossdk.io/client/v2/autocli"
clienthelpers "cosmossdk.io/client/v2/helpers"
"cosmossdk.io/core/appmodule"
"cosmossdk.io/log"
storetypes "cosmossdk.io/store/types"
circuitkeeper "cosmossdk.io/x/circuit/keeper"
Expand All @@ -37,6 +39,7 @@ import (
"github.com/cosmos/cosmos-sdk/codec"
"github.com/cosmos/cosmos-sdk/codec/types"
"github.com/cosmos/cosmos-sdk/runtime"
runtimeservice "github.com/cosmos/cosmos-sdk/runtime/services"
runtimeservices "github.com/cosmos/cosmos-sdk/runtime/services"
"github.com/cosmos/cosmos-sdk/server/api"
"github.com/cosmos/cosmos-sdk/server/config"
Expand Down Expand Up @@ -125,8 +128,28 @@ import (
)

const (
accountAddressPrefix = "arkeo"
Name = "arkeo"
AppName = "arkeo"
)

const (
NodeDir = ".arkeo"
Bech32Prefix = "arkeo"
)

var (

// DefaultNodeHome default home directories for the application daemon
DefaultNodeHome string
)

var (
//Bech32PrefixAccAddr
Bech32PrefixAccAddr = Bech32Prefix
Bech32PrefixAccPub = Bech32Prefix + sdk.PrefixPublic
Bech32PrefixValAddr = Bech32Prefix + sdk.PrefixValidator + sdk.PrefixOperator
Bech32PrefixValPub = Bech32Prefix + sdk.PrefixValidator + sdk.PrefixOperator + sdk.PrefixPublic
Bech32PrefixConsAddr = Bech32Prefix + sdk.PrefixValidator + sdk.PrefixConsensus
Bech32PrefixConsPub = Bech32Prefix + sdk.PrefixValidator + sdk.PrefixConsensus + sdk.PrefixPublic
)

// this line is used by starport scaffolding # stargate/wasm/app/enabledProposals
Expand All @@ -151,9 +174,6 @@ var (
begin = make(chan struct{})
end = make(chan struct{})

// DefaultNodeHome default home directories for the application daemon
DefaultNodeHome string

// ModuleBasics defines the module BasicManager is in charge of setting up basic,
// non-dependant module elements, such as codec registration
// and genesis verification.
Expand Down Expand Up @@ -208,7 +228,7 @@ var (

func init() {
var err error
DefaultNodeHome, err = clienthelpers.GetNodeHomeDirectory("." + Name)
DefaultNodeHome, err = clienthelpers.GetNodeHomeDirectory("." + AppName)
if err != nil {
panic(err)
}
Expand Down Expand Up @@ -285,7 +305,7 @@ type ArkeoApp struct {
}

// New returns a reference to an initialized blockchain app
func New(
func NewArkeoApp(
logger log.Logger,
db dbm.DB,
traceStore io.Writer,
Expand All @@ -304,7 +324,7 @@ func New(
std.RegisterLegacyAminoCodec(cdc)
std.RegisterInterfaces(interfaceRegistry)

bApp := baseapp.NewBaseApp(Name, logger, db, encodingConfig.TxConfig.TxDecoder(), baseAppOptions...)
bApp := baseapp.NewBaseApp(AppName, logger, db, encodingConfig.TxConfig.TxDecoder(), baseAppOptions...)
bApp.SetCommitMultiStoreTracer(traceStore)
bApp.SetVersion(version.Version)
bApp.SetInterfaceRegistry(interfaceRegistry)
Expand Down Expand Up @@ -965,3 +985,25 @@ func (app *ArkeoApp) SimulationManager() *module.SimulationManager {
func (app *ArkeoApp) RegisterNodeService(clientCtx client.Context, cfg config.Config) {
nodeservice.RegisterNodeService(clientCtx, app.GRPCQueryRouter(), cfg)
}

func (app *ArkeoApp) 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: runtimeservice.ExtractAutoCLIOptions(app.mm.Modules),
AddressCodec: authcodec.NewBech32Codec(sdk.GetConfig().GetBech32AccountAddrPrefix()),
ValidatorAddressCodec: authcodec.NewBech32Codec(sdk.GetConfig().GetBech32ValidatorAddrPrefix()),
ConsensusAddressCodec: authcodec.NewBech32Codec(sdk.GetConfig().GetBech32ConsensusAddrPrefix()),
}

}
12 changes: 1 addition & 11 deletions cmd/arkeod/main_regtest.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,10 @@ import (
"github.com/arkeonetwork/arkeo/app"

svrcmd "github.com/cosmos/cosmos-sdk/server/cmd"
// "github.com/ignite/cli/ignite/pkg/cosmoscmd"
// "github.com/ignite/cli/ignite/pkg/xstrings"
)

func main() {
rootCmd, _ := NewRootCmd(
app.Name,
app.AccountAddressPrefix,
app.DefaultNodeHome,
// xstrings.NoDash(app.Name),
app.ModuleBasics,
app.New,
// this line is used by starport scaffolding # root/arguments
)
rootCmd, _ := NewRootCmd()

// for coverage data we need to exit main without allowing the server to call os.Exit

Expand Down

0 comments on commit f9d7f93

Please sign in to comment.