move homePath & invCheckPeriod to appOptions

bandprotocol · Aug 11, 2023 · 91a0fe6 · 91a0fe6
1 parent 3bcd237
commit 91a0fe6
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 16 deletions.
diff --git a/app/app.go b/app/app.go
@@ -17,11 +17,13 @@ import (
 	tmos "github.com/cometbft/cometbft/libs/os"
 	"github.com/cosmos/cosmos-sdk/baseapp"
 	"github.com/cosmos/cosmos-sdk/client"
+	"github.com/cosmos/cosmos-sdk/client/flags"
 	"github.com/cosmos/cosmos-sdk/client/grpc/tmservice"
 	"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"
 	"github.com/cosmos/cosmos-sdk/server/api"
 	"github.com/cosmos/cosmos-sdk/server/config"
 	servertypes "github.com/cosmos/cosmos-sdk/server/types"
@@ -200,8 +202,6 @@ type BandApp struct {
 	appCodec          codec.Codec
 	interfaceRegistry types.InterfaceRegistry
 
-	invCheckPeriod uint
-
 	// keys to access the substores.
 	keys    map[string]*storetypes.KVStoreKey
 	tkeys   map[string]*storetypes.TransientStoreKey
@@ -241,9 +241,14 @@ func SetBech32AddressPrefixesAndBip44CoinTypeAndSeal(config *sdk.Config) {
 
 // NewBandApp returns a reference to an initialized BandApp.
 func NewBandApp(
-	logger log.Logger, db dbm.DB, traceStore io.Writer, loadLatest bool, skipUpgradeHeights map[int64]bool,
-	homePath string, invCheckPeriod uint, appOpts servertypes.AppOptions,
-	owasmCacheSize uint32, baseAppOptions ...func(*baseapp.BaseApp),
+	logger log.Logger,
+	db dbm.DB,
+	traceStore io.Writer,
+	loadLatest bool,
+	skipUpgradeHeights map[int64]bool,
+	appOpts servertypes.AppOptions,
+	owasmCacheSize uint32,
+	baseAppOptions ...func(*baseapp.BaseApp),
 ) *BandApp {
 	encodingConfig := MakeEncodingConfig()
 
@@ -286,7 +291,6 @@ func NewBandApp(
 		legacyAmino:       legacyAmino,
 		appCodec:          appCodec,
 		interfaceRegistry: interfaceRegistry,
-		invCheckPeriod:    invCheckPeriod,
 		keys:              keys,
 		tkeys:             tkeys,
 		memKeys:           memKeys,
@@ -385,6 +389,8 @@ func NewBandApp(
 		// 0.47 TODO: change to tech council address
 		authtypes.NewModuleAddress(govtypes.ModuleName).String(),
 	)
+
+	invCheckPeriod := cast.ToUint(appOpts.Get(server.FlagInvCheckPeriod))
 	app.CrisisKeeper = crisiskeeper.NewKeeper(
 		appCodec,
 		keys[crisistypes.StoreKey],
@@ -396,6 +402,8 @@ func NewBandApp(
 	)
 
 	app.FeegrantKeeper = feegrantkeeper.NewKeeper(appCodec, keys[feegrant.StoreKey], app.AccountKeeper)
+
+	homePath := cast.ToString(appOpts.Get(flags.FlagHome))
 	app.UpgradeKeeper = upgradekeeper.NewKeeper(
 		skipUpgradeHeights,
 		keys[upgradetypes.StoreKey],

diff --git a/cmd/bandd/cmd/root.go b/cmd/bandd/cmd/root.go
@@ -189,8 +189,6 @@ func newApp(
 
 	bandApp := band.NewBandApp(
 		logger, db, traceStore, true, skipUpgradeHeights,
-		cast.ToString(appOpts.Get(flags.FlagHome)),
-		cast.ToUint(appOpts.Get(server.FlagInvCheckPeriod)),
 		appOpts,
 		cast.ToUint32(appOpts.Get(flagWithOwasmCacheSize)),
 		baseappOptions...,
@@ -219,8 +217,6 @@ func appExport(
 		traceStore,
 		loadLatest,
 		map[int64]bool{},
-		homePath,
-		cast.ToUint(appOpts.Get(server.FlagInvCheckPeriod)),
 		appOpts,
 		cast.ToUint32(appOpts.Get(flagWithOwasmCacheSize)),
 	)

diff --git a/testing/testapp/setup.go b/testing/testapp/setup.go
@@ -12,12 +12,15 @@ import (
 
 	"github.com/cosmos/cosmos-sdk/baseapp"
 	"github.com/cosmos/cosmos-sdk/client"
+	"github.com/cosmos/cosmos-sdk/client/flags"
 	codectypes "github.com/cosmos/cosmos-sdk/codec/types"
 	cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec"
 	"github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1"
 	cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
+	"github.com/cosmos/cosmos-sdk/server"
 	"github.com/cosmos/cosmos-sdk/snapshots"
 	snapshottypes "github.com/cosmos/cosmos-sdk/snapshots/types"
+	simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/simulation"
 	"github.com/cosmos/cosmos-sdk/types/tx/signing"
@@ -220,6 +223,10 @@ func NewTestApp(chainID string, logger log.Logger) *TestingApp {
 	// db := dbm.NewMemDB()
 	db, _ := dbm.NewGoLevelDB("db", dir)
 
+	appOptions := make(simtestutil.AppOptionsMap, 0)
+	appOptions[flags.FlagHome] = dir
+	appOptions[server.FlagInvCheckPeriod] = 0
+
 	snapshotDir := filepath.Join(dir, "data", "snapshots")
 	snapshotDB, err := dbm.NewDB("metadata", dbm.GoLevelDBBackend, snapshotDir)
 	if err != nil {
@@ -242,9 +249,7 @@ func NewTestApp(chainID string, logger log.Logger) *TestingApp {
 			nil,
 			true,
 			map[int64]bool{},
-			dir,
-			0,
-			EmptyAppOptions{},
+			appOptions,
 			100,
 			baseapp.SetSnapshot(snapshotStore, snapshotOptions),
 			baseapp.SetChainID(chainID),
@@ -399,6 +404,10 @@ func setup(withGenesis bool, invCheckPeriod uint, chainID string) (*TestingApp,
 	}
 	db := dbm.NewMemDB()
 
+	appOptions := make(simtestutil.AppOptionsMap, 0)
+	appOptions[flags.FlagHome] = dir
+	appOptions[server.FlagInvCheckPeriod] = 0
+
 	snapshotDir := filepath.Join(dir, "data", "snapshots")
 	snapshotDB, err := dbm.NewDB("metadata", dbm.GoLevelDBBackend, snapshotDir)
 	if err != nil {
@@ -421,9 +430,7 @@ func setup(withGenesis bool, invCheckPeriod uint, chainID string) (*TestingApp,
 			nil,
 			true,
 			map[int64]bool{},
-			dir,
-			0,
-			EmptyAppOptions{},
+			appOptions,
 			0,
 			baseapp.SetSnapshot(snapshotStore, snapshotOptions),
 			baseapp.SetChainID(chainID),