Master (#1262)

* clear

* feat: Add everything

* fix: Commenht

x/did/keeper/keeper_test.go

@@ -2,32 +2,35 @@ package keeper_test
 
 import (
 	"testing"
+	"time"
 
-	"cosmossdk.io/core/store"
+	"github.com/stretchr/testify/suite"
+
+	"cosmossdk.io/core/address"
 	"cosmossdk.io/log"
 	storetypes "cosmossdk.io/store/types"
-	nftkeeper "cosmossdk.io/x/nft/keeper"
+
+	cmtproto "github.com/cometbft/cometbft/proto/tendermint/types"
+	sdkaddress "github.com/cosmos/cosmos-sdk/codec/address"
 	"github.com/cosmos/cosmos-sdk/runtime"
-	"github.com/cosmos/cosmos-sdk/testutil"
+	"github.com/cosmos/cosmos-sdk/testutil/integration"
 	simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	moduletestutil "github.com/cosmos/cosmos-sdk/types/module/testutil"
-	authcodec "github.com/cosmos/cosmos-sdk/x/auth/codec"
 	authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper"
 	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
 	bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper"
+	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
 	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
 	mintkeeper "github.com/cosmos/cosmos-sdk/x/mint/keeper"
 	minttypes "github.com/cosmos/cosmos-sdk/x/mint/types"
 	stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
-	"github.com/strangelove-ventures/poa"
-	"github.com/stretchr/testify/require"
-	"github.com/stretchr/testify/suite"
 
-	module "github.com/sonr-io/snrd/x/did"
-	"github.com/sonr-io/snrd/x/did/keeper"
-	"github.com/sonr-io/snrd/x/did/types"
+	"github.com/sonr-io/sonr/app"
+	module "github.com/sonr-io/sonr/x/did"
+	"github.com/sonr-io/sonr/x/did/keeper"
+	"github.com/sonr-io/sonr/x/did/types"
 )
 
 var maccPerms = map[string][]string{
@@ -49,7 +52,6 @@ type testFixture struct {
 
 	accountkeeper authkeeper.AccountKeeper
 	bankkeeper    bankkeeper.BaseKeeper
-	nftKeeper     nftkeeper.Keeper
 	stakingKeeper *stakingkeeper.Keeper
 	mintkeeper    mintkeeper.Keeper
 
@@ -60,7 +62,16 @@ type testFixture struct {
 func SetupTest(t *testing.T) *testFixture {
 	t.Helper()
 	f := new(testFixture)
-	require := require.New(t)
+
+	cfg := sdk.GetConfig() // do not seal, more set later
+	cfg.SetBech32PrefixForAccount(app.Bech32PrefixAccAddr, app.Bech32PrefixAccPub)
+	cfg.SetBech32PrefixForValidator(app.Bech32PrefixValAddr, app.Bech32PrefixValPub)
+	cfg.SetBech32PrefixForConsensusNode(app.Bech32PrefixConsAddr, app.Bech32PrefixConsPub)
+	cfg.SetCoinType(app.CoinType)
+
+	validatorAddressCodec := sdkaddress.NewBech32Codec(app.Bech32PrefixValAddr)
+	accountAddressCodec := sdkaddress.NewBech32Codec(app.Bech32PrefixAccAddr)
+	consensusAddressCodec := sdkaddress.NewBech32Codec(app.Bech32PrefixConsAddr)
 
 	// Base setup
 	logger := log.NewTestLogger(t)
@@ -69,20 +80,40 @@ func SetupTest(t *testing.T) *testFixture {
 	f.govModAddr = authtypes.NewModuleAddress(govtypes.ModuleName).String()
 	f.addrs = simtestutil.CreateIncrementalAccounts(3)
 
-	key := storetypes.NewKVStoreKey(poa.ModuleName)
-	storeService := runtime.NewKVStoreService(key)
-	testCtx := testutil.DefaultContextWithDB(t, key, storetypes.NewTransientStoreKey("transient_test"))
-
-	f.ctx = testCtx.Ctx
+	keys := storetypes.NewKVStoreKeys(
+		authtypes.ModuleName,
+		banktypes.ModuleName,
+		stakingtypes.ModuleName,
+		minttypes.ModuleName,
+		types.ModuleName,
+	)
+	f.ctx = sdk.NewContext(integration.CreateMultiStore(keys, logger), cmtproto.Header{
+		Height: 1,
+		Time:   time.Now(),
+	}, false, logger)
 
 	// Register SDK modules.
-	registerBaseSDKModules(f, encCfg, storeService, logger, require)
+	registerBaseSDKModules(
+		logger,
+		f,
+		encCfg,
+		keys,
+		accountAddressCodec,
+		validatorAddressCodec,
+		consensusAddressCodec,
+	)
 
-	// Setup POA Keeper.
-	f.k = keeper.NewKeeper(encCfg.Codec, storeService, logger, f.govModAddr, f.accountkeeper, f.nftKeeper, f.stakingKeeper)
+	// Setup Keeper.
+	f.k = keeper.NewKeeper(
+		encCfg.Codec,
+		runtime.NewKVStoreService(keys[types.ModuleName]),
+		logger,
+		f.govModAddr,
+		f.accountkeeper,
+	)
 	f.msgServer = keeper.NewMsgServerImpl(f.k)
 	f.queryServer = keeper.NewQuerier(f.k)
-	f.appModule = module.NewAppModule(encCfg.Codec, f.k, f.nftKeeper)
+	f.appModule = module.NewAppModule(encCfg.Codec, f.k)
 
 	return f
 }
@@ -90,31 +121,35 @@ func SetupTest(t *testing.T) *testFixture {
 func registerModuleInterfaces(encCfg moduletestutil.TestEncodingConfig) {
 	authtypes.RegisterInterfaces(encCfg.InterfaceRegistry)
 	stakingtypes.RegisterInterfaces(encCfg.InterfaceRegistry)
+	banktypes.RegisterInterfaces(encCfg.InterfaceRegistry)
+	minttypes.RegisterInterfaces(encCfg.InterfaceRegistry)
 
 	types.RegisterInterfaces(encCfg.InterfaceRegistry)
 }
 
 func registerBaseSDKModules(
+	logger log.Logger,
 	f *testFixture,
 	encCfg moduletestutil.TestEncodingConfig,
-	storeService store.KVStoreService,
-	logger log.Logger,
-	require *require.Assertions,
+	keys map[string]*storetypes.KVStoreKey,
+	ac address.Codec,
+	validator address.Codec,
+	consensus address.Codec,
 ) {
 	registerModuleInterfaces(encCfg)
 
 	// Auth Keeper.
 	f.accountkeeper = authkeeper.NewAccountKeeper(
-		encCfg.Codec, storeService,
+		encCfg.Codec, runtime.NewKVStoreService(keys[authtypes.StoreKey]),
 		authtypes.ProtoBaseAccount,
 		maccPerms,
-		authcodec.NewBech32Codec(sdk.Bech32MainPrefix), sdk.Bech32MainPrefix,
+		ac, app.Bech32PrefixAccAddr,
 		f.govModAddr,
 	)
 
 	// Bank Keeper.
 	f.bankkeeper = bankkeeper.NewBaseKeeper(
-		encCfg.Codec, storeService,
+		encCfg.Codec, runtime.NewKVStoreService(keys[banktypes.StoreKey]),
 		f.accountkeeper,
 		nil,
 		f.govModAddr, logger,
@@ -122,21 +157,16 @@ func registerBaseSDKModules(
 
 	// Staking Keeper.
 	f.stakingKeeper = stakingkeeper.NewKeeper(
-		encCfg.Codec, storeService,
+		encCfg.Codec, runtime.NewKVStoreService(keys[stakingtypes.StoreKey]),
 		f.accountkeeper, f.bankkeeper, f.govModAddr,
-		authcodec.NewBech32Codec(sdk.Bech32PrefixValAddr),
-		authcodec.NewBech32Codec(sdk.Bech32PrefixConsAddr),
+		validator,
+		consensus,
 	)
-	require.NoError(f.stakingKeeper.SetParams(f.ctx, stakingtypes.DefaultParams()))
-	f.accountkeeper.SetModuleAccount(f.ctx, f.stakingKeeper.GetNotBondedPool(f.ctx))
-	f.accountkeeper.SetModuleAccount(f.ctx, f.stakingKeeper.GetBondedPool(f.ctx))
 
 	// Mint Keeper.
 	f.mintkeeper = mintkeeper.NewKeeper(
-		encCfg.Codec, storeService,
+		encCfg.Codec, runtime.NewKVStoreService(keys[minttypes.StoreKey]),
 		f.stakingKeeper, f.accountkeeper, f.bankkeeper,
 		authtypes.FeeCollectorName, f.govModAddr,
 	)
-	f.accountkeeper.SetModuleAccount(f.ctx, f.accountkeeper.GetModuleAccount(f.ctx, minttypes.ModuleName))
-	f.mintkeeper.InitGenesis(f.ctx, f.accountkeeper, minttypes.DefaultGenesisState())
 }