feat: switch to testutil from chain-sdk

Signed-off-by: Artur Troian <[email protected]>

Author: troian

app/app.go

@@ -48,7 +48,6 @@ import (
 	vestingtypes "github.com/cosmos/cosmos-sdk/x/auth/vesting/types"
 	"github.com/cosmos/cosmos-sdk/x/authz"
 	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
-	"github.com/cosmos/cosmos-sdk/x/crisis"
 	distrtypes "github.com/cosmos/cosmos-sdk/x/distribution/types"
 	genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types"
 	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
@@ -72,8 +71,6 @@ import (
 
 	apptypes "pkg.akt.dev/node/app/types"
 	utypes "pkg.akt.dev/node/upgrades/types"
-	astaking "pkg.akt.dev/node/x/staking"
-
 	// unnamed import of statik for swagger UI support
 	_ "pkg.akt.dev/node/client/docs/statik"
 )
@@ -170,10 +167,6 @@ func NewApp(
 	// because I believe the concept of Routes is going away.
 	app.SetupHooks()
 
-	// NOTE: we may consider parsing `appOpts` inside module constructors. For the moment,
-	// we prefer to be more strict in what arguments the modules expect.
-	skipGenesisInvariants := cast.ToBool(appOpts.Get(crisis.FlagSkipGenesisInvariants))
-
 	// NOTE: All module / keeper changes should happen prior to this module.NewManager line being called.
 	// However, in the event any changes do need to happen after this call, ensure that that keeper
 	// is only passed in its keeper form (not de-ref'd anywhere)
@@ -183,7 +176,7 @@ func NewApp(
 	//
 	// Any time a module requires a keeper de-ref'd that's not its native one,
 	// its code-smell and should probably change. We should get the staking keeper dependencies fixed.
-	modules := appModules(app, encodingConfig, skipGenesisInvariants)
+	modules := appModules(app, encodingConfig)
 
 	app.MM = module.NewManager(modules...)
 
@@ -194,18 +187,16 @@ func NewApp(
 	// NOTE: capability module's begin-blocker must come before any modules using capabilities (e.g. IBC)
 
 	// Upgrades from v0.50.x onwards happen in pre block
-	//app.MM.SetOrderPreBlockers(
-	//	upgradetypes.ModuleName,
-	//	authtypes.ModuleName,
-	//)
+	app.MM.SetOrderPreBlockers(
+		upgradetypes.ModuleName,
+		authtypes.ModuleName,
+	)
 
 	// Tell the app's module manager how to set the order of BeginBlockers, which are run at the beginning of every block.
 	app.MM.SetOrderBeginBlockers(orderBeginBlockers(app.MM.ModuleNames())...)
 
 	app.MM.SetOrderInitGenesis(OrderInitGenesis(app.MM.ModuleNames())...)
 
-	app.MM.RegisterInvariants(app.Keepers.Cosmos.Crisis)
-
 	app.Configurator = module.NewConfigurator(app.AppCodec(), app.MsgServiceRouter(), app.GRPCQueryRouter())
 	err := app.MM.RegisterServices(app.Configurator)
 	if err != nil {
@@ -217,16 +208,6 @@ func NewApp(
 		panic(err)
 	}
 
-	// Override the gov ModuleBasic with all the custom proposal handers, otherwise we lose them in the CLI.
-	//app.ModuleBasics = module.NewBasicManagerFromManager(
-	//	app.MM,
-	//	map[string]module.AppModuleBasic{
-	//		"gov": gov.NewAppModuleBasic(
-	//			[]govclient.ProposalHandler{},
-	//		),
-	//	},
-	//)
-
 	app.sm = module.NewSimulationManager(appSimModules(app, encodingConfig)...)
 	app.sm.RegisterStoreDecoders()
 
@@ -297,7 +278,6 @@ func orderBeginBlockers(_ []string) []string {
 		audittypes.ModuleName,
 		genutiltypes.ModuleName,
 		vestingtypes.ModuleName,
-		//crisistypes.ModuleName,
 		authtypes.ModuleName,
 		authz.ModuleName,
 		taketypes.ModuleName,
@@ -307,7 +287,6 @@ func orderBeginBlockers(_ []string) []string {
 		slashingtypes.ModuleName,
 		evidencetypes.ModuleName,
 		stakingtypes.ModuleName,
-		//astaking.ModuleName,
 		transfertypes.ModuleName,
 		ibchost.ModuleName,
 		feegrant.ModuleName,
@@ -317,10 +296,8 @@ func orderBeginBlockers(_ []string) []string {
 // OrderEndBlockers returns EndBlockers (crisis, govtypes, staking) with no relative order.
 func OrderEndBlockers(_ []string) []string {
 	return []string{
-		//crisistypes.ModuleName,
 		govtypes.ModuleName,
 		stakingtypes.ModuleName,
-		astaking.ModuleName,
 		upgradetypes.ModuleName,
 		capabilitytypes.ModuleName,
 		banktypes.ModuleName,

app/app_configure.go

@@ -9,9 +9,6 @@ import (
 	vestingtypes "github.com/cosmos/cosmos-sdk/x/auth/vesting/types"
 	"github.com/cosmos/cosmos-sdk/x/authz"
 	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
-	capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types"
-
-	//capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types"
 	consensustypes "github.com/cosmos/cosmos-sdk/x/consensus/types"
 	crisistypes "github.com/cosmos/cosmos-sdk/x/crisis/types"
 	distrtypes "github.com/cosmos/cosmos-sdk/x/distribution/types"
@@ -21,7 +18,7 @@ import (
 	paramstypes "github.com/cosmos/cosmos-sdk/x/params/types"
 	slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
-
+	capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types"
 	transfertypes "github.com/cosmos/ibc-go/v8/modules/apps/transfer/types"
 	ibchost "github.com/cosmos/ibc-go/v8/modules/core/exported"
 
@@ -32,11 +29,8 @@ import (
 	"pkg.akt.dev/node/x/cert"
 	"pkg.akt.dev/node/x/deployment"
 	"pkg.akt.dev/node/x/escrow"
-	//agov "pkg.akt.dev/node/x/gov"
-	//"pkg.akt.dev/node/x/inflation"
 	"pkg.akt.dev/node/x/market"
 	"pkg.akt.dev/node/x/provider"
-	astaking "pkg.akt.dev/node/x/staking"
 	"pkg.akt.dev/node/x/take"
 )
 
@@ -49,8 +43,6 @@ func akashModuleBasics() []module.AppModuleBasic {
 		provider.AppModuleBasic{},
 		audit.AppModuleBasic{},
 		cert.AppModuleBasic{},
-		//astaking.AppModuleBasic{},
-		//agov.AppModuleBasic{},
 	}
 }
 
@@ -87,9 +79,6 @@ func OrderInitGenesis(_ []string) []string {
 		deployment.ModuleName,
 		provider.ModuleName,
 		market.ModuleName,
-		//inflation.ModuleName,
-		astaking.ModuleName,
-		//agov.ModuleName,
 		genutiltypes.ModuleName,
 	}
 }

app/app_test.go

@@ -1,42 +1,47 @@
 package app
 
-import (
-	"testing"
-)
-
-func TestAkashApp_Export(t *testing.T) {
-	//app := Setup(
-	//	WithCheckTx(false),
-	//	WithHome(DefaultHome),
-	//	WithGenesis(GenesisStateWithValSet),
-	//)
-	//
-	//_, err := app.ExportAppStateAndValidators(true, []string{}, []string{})
-	//require.NoError(t, err, "ExportAppStateAndValidators should not have an error")
-	//db := dbm.NewMemDB()
-	//app1 := NewApp(log.NewTestLogger(t),
-	//	db, nil, true, 0, map[int64]bool{}, DefaultHome, OptsWithGenesisTime(0))
-	//
-	//for acc := range MacPerms() {
-	//	require.Equal(t, !allowedReceivingModAcc[acc], app1.Keepers.Cosmos.Bank.BlockedAddr(app1.Keepers.Cosmos.Acct.GetModuleAddress(acc)),
-	//		"ensure that blocked addresses are properly set in bank keeper")
-	//}
-	//
-	//genesisState := NewDefaultGenesisState()
-	//stateBytes, err := json.MarshalIndent(genesisState, "", "  ")
-	//require.NoError(t, err)
-	//
-	//// Initialize the chain
-	//app1.InitChain(
-	//	abci.RequestInitChain{
-	//		Validators:    []abci.ValidatorUpdate{},
-	//		AppStateBytes: stateBytes,
-	//	},
-	//)
-	//app1.Commit()
-	//
-	//// Making a new app object with the db, so that initchain hasn't been called
-	//app2 := NewApp(log.NewTMLogger(log.NewSyncWriter(os.Stdout)), db, nil, true, 0, map[int64]bool{}, DefaultHome, OptsWithGenesisTime(0))
-	//_, err = app2.ExportAppStateAndValidators(false, []string{})
-	//require.NoError(t, err, "ExportAppStateAndValidators should not have an error")
-}
+//import (
+//	"os"
+//	"testing"
+//
+//	"cosmossdk.io/log"
+//	dbm "github.com/cosmos/cosmos-db"
+//	"github.com/stretchr/testify/require"
+//)
+//
+//func TestAkashApp_Export(t *testing.T) {
+//	app := Setup(
+//		WithCheckTx(false),
+//		WithHome(DefaultHome),
+//		WithGenesis(GenesisStateWithValSet),
+//	)
+//
+//	_, err := app.ExportAppStateAndValidators(true, []string{}, []string{})
+//	require.NoError(t, err, "ExportAppStateAndValidators should not have an error")
+//	db := dbm.NewMemDB()
+//	app1 := NewApp(log.NewTestLogger(t),
+//		db, nil, true, 0, map[int64]bool{}, DefaultHome, OptsWithGenesisTime(0))
+//
+//	for acc := range MacPerms() {
+//		require.Equal(t, !allowedReceivingModAcc[acc], app1.Keepers.Cosmos.Bank.BlockedAddr(app1.Keepers.Cosmos.Acct.GetModuleAddress(acc)),
+//			"ensure that blocked addresses are properly set in bank keeper")
+//	}
+//
+//	genesisState := NewDefaultGenesisState()
+//	stateBytes, err := json.MarshalIndent(genesisState, "", "  ")
+//	require.NoError(t, err)
+//
+//	// Initialize the chain
+//	app1.InitChain(
+//		abci.RequestInitChain{
+//			Validators:    []abci.ValidatorUpdate{},
+//			AppStateBytes: stateBytes,
+//		},
+//	)
+//	app1.Commit()
+//
+//	// Making a new app object with the db, so that initchain hasn't been called
+//	app2 := NewApp(log.NewTMLogger(log.NewSyncWriter(os.Stdout)), db, nil, true, 0, map[int64]bool{}, DefaultHome, OptsWithGenesisTime(0))
+//	_, err = app2.ExportAppStateAndValidators(false, []string{})
+//	require.NoError(t, err, "ExportAppStateAndValidators should not have an error")
+//}

app/config.go

@@ -48,11 +48,6 @@ var mbasics = module.NewBasicManager(
 		gov.NewAppModuleBasic(
 			[]govclient.ProposalHandler{
 				paramsclient.ProposalHandler,
-				// distrclient.ProposalHandler,
-				//upgradeclient.LegacyProposalHandler,
-				//upgradeclient.LegacyCancelProposalHandler,
-				//ibcclient.UpdateClientProposalHandler,
-				//ibcclient.UpgradeProposalHandler,
 			},
 		),
 		// chain parameters

app/decorators/min_commision.go

@@ -85,9 +85,6 @@ func (app *AkashApp) prepForZeroHeightGenesis(ctx sdk.Context, jailAllowedAddrs
 		allowedAddrsMap[addr] = true
 	}
 
-	/* Just to be safe, assert the invariants on current state. */
-	app.Keepers.Cosmos.Crisis.AssertInvariants(ctx)
-
 	/* Handle fee distribution state. */
 
 	// withdraw all validator commission