Merge pull request #8 from neutron-org/fix/unit-tests

Fix: unit tests

Author: pr0n00gler

app/app.go

@@ -150,6 +150,7 @@ var (
 		authtypes.FeeCollectorName:     nil,
 		distrtypes.ModuleName:          nil,
 		minttypes.ModuleName:           {authtypes.Minter},
+		banktypes.ModuleName:           {authtypes.Minter},
 		stakingtypes.BondedPoolName:    {authtypes.Burner, authtypes.Staking},
 		stakingtypes.NotBondedPoolName: {authtypes.Burner, authtypes.Staking},
 		govtypes.ModuleName:            {authtypes.Burner},
@@ -179,7 +180,7 @@ type App struct {
 	*baseapp.BaseApp
 
 	cdc               *codec.LegacyAmino
-	appCodec          codec.Codec
+	AppCodec          codec.Codec
 	interfaceRegistry types.InterfaceRegistry
 
 	invCheckPeriod uint
@@ -254,6 +255,7 @@ func New(
 		minttypes.StoreKey, distrtypes.StoreKey, slashingtypes.StoreKey,
 		govtypes.StoreKey, paramstypes.StoreKey, ibchost.StoreKey, upgradetypes.StoreKey,
 		evidencetypes.StoreKey, ibctransfertypes.StoreKey, capabilitytypes.StoreKey, feegrant.StoreKey,
+		consensusparamtypes.StoreKey, crisistypes.StoreKey,
 		// this line is used by starport scaffolding # stargate/app/storeKey
 		adminmodulemoduletypes.StoreKey,
 	)
@@ -263,7 +265,7 @@ func New(
 	app := &App{
 		BaseApp:           bApp,
 		cdc:               legacyAmino,
-		appCodec:          appCodec,
+		AppCodec:          appCodec,
 		interfaceRegistry: interfaceRegistry,
 		invCheckPeriod:    invCheckPeriod,
 		keys:              keys,
@@ -427,13 +429,12 @@ func New(
 		AddRoute(upgradetypes.RouterKey, upgrade.NewSoftwareUpgradeProposalHandler(&app.UpgradeKeeper)).
 		AddRoute(ibchost.RouterKey, ibcclient.NewClientProposalHandler(app.IBCKeeper.ClientKeeper))
 
-	adminRouter := baseapp.NewMsgServiceRouter()
 	app.AdminmoduleKeeper = *adminmodulemodulekeeper.NewKeeper(
 		appCodec,
 		keys[adminmodulemoduletypes.StoreKey],
 		keys[adminmodulemoduletypes.MemStoreKey],
 		adminRouterLegacy,
-		adminRouter,
+		app.MsgServiceRouter(),
 		// this allows any type of proposal to be submitted to the admin module (everything is whitelisted)
 		// projects will implement their functions to define what is allowed for admins.
 		func(govv1beta1.Content) bool { return true },
@@ -558,7 +559,7 @@ func New(
 	)
 
 	app.mm.RegisterInvariants(&app.CrisisKeeper)
-	app.configurator = module.NewConfigurator(app.appCodec, app.MsgServiceRouter(), app.GRPCQueryRouter())
+	app.configurator = module.NewConfigurator(app.AppCodec, app.MsgServiceRouter(), app.GRPCQueryRouter())
 	app.mm.RegisterServices(app.configurator)
 
 	// initialize stores
@@ -626,7 +627,7 @@ func (app *App) InitChainer(ctx sdk.Context, req abci.RequestInitChain) abci.Res
 	if err := tmjson.Unmarshal(req.AppStateBytes, &genesisState); err != nil {
 		panic(err)
 	}
-	return app.mm.InitGenesis(ctx, app.appCodec, genesisState)
+	return app.mm.InitGenesis(ctx, app.AppCodec, genesisState)
 }
 
 // LoadHeight loads a particular height

app/export.go

@@ -30,7 +30,7 @@ func (app *App) ExportAppStateAndValidators(
 		app.prepForZeroHeightGenesis(ctx, jailAllowedAddrs)
 	}
 
-	genState := app.mm.ExportGenesisForModules(ctx, app.appCodec, modulesToExport)
+	genState := app.mm.ExportGenesisForModules(ctx, app.AppCodec, modulesToExport)
 	appState, err := json.MarshalIndent(genState, "", "  ")
 	if err != nil {
 		return servertypes.ExportedApp{}, err

app/test_helpers.go

@@ -0,0 +1,138 @@
+package app
+
+import (
+	"encoding/json"
+	"time"
+
+	cometbftdb "github.com/cometbft/cometbft-db"
+	abci "github.com/cometbft/cometbft/abci/types"
+	"github.com/cometbft/cometbft/crypto/secp256k1"
+	"github.com/cometbft/cometbft/libs/log"
+	tmtypes "github.com/cometbft/cometbft/types"
+	codectypes "github.com/cosmos/cosmos-sdk/codec/types"
+	cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec"
+	"github.com/cosmos/cosmos-sdk/testutil/mock"
+	"github.com/cosmos/cosmos-sdk/testutil/sims"
+	sdk "github.com/cosmos/cosmos-sdk/types"
+	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
+	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
+	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
+)
+
+func GenesisStateWithValSet(app *App) GenesisState {
+	privVal := mock.NewPV()
+	pubKey, _ := privVal.GetPubKey()
+	validator := tmtypes.NewValidator(pubKey, 1)
+	valSet := tmtypes.NewValidatorSet([]*tmtypes.Validator{validator})
+
+	// generate genesis account
+	senderPrivKey := secp256k1.GenPrivKey()
+	senderPrivKey.PubKey().Address()
+	acc := authtypes.NewBaseAccountWithAddress(senderPrivKey.PubKey().Address().Bytes())
+
+	//////////////////////
+	balances := []banktypes.Balance{}
+	genesisState := NewDefaultGenesisState(app.AppCodec)
+	genAccs := []authtypes.GenesisAccount{acc}
+	authGenesis := authtypes.NewGenesisState(authtypes.DefaultParams(), genAccs)
+	genesisState[authtypes.ModuleName] = app.AppCodec.MustMarshalJSON(authGenesis)
+
+	validators := make([]stakingtypes.Validator, 0, len(valSet.Validators))
+	delegations := make([]stakingtypes.Delegation, 0, len(valSet.Validators))
+
+	bondAmt := sdk.DefaultPowerReduction
+	initValPowers := []abci.ValidatorUpdate{}
+
+	for _, val := range valSet.Validators {
+		pk, _ := cryptocodec.FromTmPubKeyInterface(val.PubKey)
+		pkAny, _ := codectypes.NewAnyWithValue(pk)
+		validator := stakingtypes.Validator{
+			OperatorAddress:   sdk.ValAddress(val.Address).String(),
+			ConsensusPubkey:   pkAny,
+			Jailed:            false,
+			Status:            stakingtypes.Bonded,
+			Tokens:            bondAmt,
+			DelegatorShares:   sdk.OneDec(),
+			Description:       stakingtypes.Description{},
+			UnbondingHeight:   int64(0),
+			UnbondingTime:     time.Unix(0, 0).UTC(),
+			Commission:        stakingtypes.NewCommission(sdk.ZeroDec(), sdk.ZeroDec(), sdk.ZeroDec()),
+			MinSelfDelegation: sdk.NewInt(0),
+		}
+		validators = append(validators, validator)
+		delegations = append(delegations, stakingtypes.NewDelegation(genAccs[0].GetAddress(), val.Address.Bytes(), sdk.OneDec()))
+
+		// add initial validator powers so consumer InitGenesis runs correctly
+		pub, _ := val.ToProto()
+		initValPowers = append(initValPowers, abci.ValidatorUpdate{
+			Power:  val.VotingPower,
+			PubKey: pub.PubKey,
+		})
+	}
+	// set validators and delegations
+	stakingGenesis := stakingtypes.NewGenesisState(stakingtypes.DefaultParams(), validators, delegations)
+	genesisState[stakingtypes.ModuleName] = app.AppCodec.MustMarshalJSON(stakingGenesis)
+
+	totalSupply := sdk.NewCoins()
+	for _, b := range balances {
+		// add genesis acc tokens to total supply
+		totalSupply = totalSupply.Add(b.Coins...)
+	}
+
+	for range delegations {
+		// add delegated tokens to total supply
+		totalSupply = totalSupply.Add(sdk.NewCoin(sdk.DefaultBondDenom, bondAmt))
+	}
+
+	// add bonded amount to bonded pool module account
+	balances = append(balances, banktypes.Balance{
+		Address: authtypes.NewModuleAddress(stakingtypes.BondedPoolName).String(),
+		Coins:   sdk.Coins{sdk.NewCoin(sdk.DefaultBondDenom, bondAmt)},
+	})
+
+	// update total supply
+	bankGenesis := banktypes.NewGenesisState(
+		banktypes.DefaultGenesisState().Params,
+		balances,
+		totalSupply,
+		[]banktypes.Metadata{},
+		[]banktypes.SendEnabled{},
+	)
+	genesisState[banktypes.ModuleName] = app.AppCodec.MustMarshalJSON(bankGenesis)
+
+	_, err := tmtypes.PB2TM.ValidatorUpdates(initValPowers)
+	if err != nil {
+		panic("failed to get vals")
+	}
+
+	return genesisState
+}
+
+func GetTestApp() *App {
+	db := cometbftdb.NewMemDB()
+	testApp := New(
+		log.NewNopLogger(),
+		db,
+		nil,
+		true,
+		map[int64]bool{},
+		sims.EmptyAppOptions{},
+	)
+
+	genesisState := GenesisStateWithValSet(&testApp)
+	stateBytes, err := json.MarshalIndent(genesisState, "", " ")
+	if err != nil {
+		panic(err)
+	}
+
+	testApp.InitChain(
+		abci.RequestInitChain{
+			ChainId:         "",
+			Validators:      []abci.ValidatorUpdate{},
+			ConsensusParams: sims.DefaultConsensusParams,
+			AppStateBytes:   stateBytes,
+		},
+	)
+
+	return &testApp
+}

x/adminmodule/keeper/keeper_test.go

@@ -2,50 +2,16 @@ package keeper_test
 
 import (
 	"fmt"
-	"testing"
 
-	tmdb "github.com/cometbft/cometbft-db"
-	"github.com/cometbft/cometbft/libs/log"
 	tmproto "github.com/cometbft/cometbft/proto/tendermint/types"
+	"github.com/cosmos/admin-module/app"
 	"github.com/cosmos/admin-module/x/adminmodule/keeper"
-	"github.com/cosmos/admin-module/x/adminmodule/types"
-	"github.com/cosmos/cosmos-sdk/codec"
-	codectypes "github.com/cosmos/cosmos-sdk/codec/types"
-	"github.com/cosmos/cosmos-sdk/store"
-	storetypes "github.com/cosmos/cosmos-sdk/store/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
-	govv1types "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1"
-	"github.com/stretchr/testify/require"
 )
 
-func setupKeeper(t testing.TB) (*keeper.Keeper, sdk.Context) {
-	storeKey := sdk.NewKVStoreKey(types.StoreKey)
-	memStoreKey := storetypes.NewMemoryStoreKey(types.MemStoreKey)
-
-	// TODO Add more routes
-	rtr := govv1types.NewRouter()
-	rtr.AddRoute(govtypes.RouterKey, govv1types.ProposalHandler)
-
-	db := tmdb.NewMemDB()
-	stateStore := store.NewCommitMultiStore(db)
-	stateStore.MountStoreWithDB(storeKey, storetypes.StoreTypeIAVL, db)
-	stateStore.MountStoreWithDB(memStoreKey, storetypes.StoreTypeMemory, nil)
-	require.NoError(t, stateStore.LoadLatestVersion())
-
-	registry := codectypes.NewInterfaceRegistry()
-	//cdc := codec.NewProtoCodec(registry)
-
-	types.RegisterInterfaces(registry)
-	k := keeper.NewKeeper(
-		codec.NewProtoCodec(registry),
-		storeKey,
-		memStoreKey,
-		rtr,
-		func(govv1types.Content) bool { return true },
-	)
-	ctx := sdk.NewContext(stateStore, tmproto.Header{}, false, log.NewNopLogger())
-	return k, ctx
+func setupKeeper() (*keeper.Keeper, sdk.Context) {
+	testApp := app.GetTestApp()
+	return &testApp.AdminmoduleKeeper, testApp.BaseApp.NewContext(false, tmproto.Header{})
 }
 
 // Using for setting admins before tests

x/adminmodule/keeper/msg_server_add_admin_test.go

@@ -9,9 +9,7 @@ import (
 )
 
 func TestAddAdmin(t *testing.T) {
-	// queryClient := suite.queryClient
-	// keeper, ctx := setupKeeper(t)
-	msgServer, ctx, keeper := setupMsgServer(t)
+	msgServer, ctx, keeper := setupMsgServer()
 
 	var (
 		req          *types.QueryAdminsRequest

x/adminmodule/keeper/msg_server_delete_admin_test.go

@@ -9,9 +9,7 @@ import (
 )
 
 func TestDeleteAdmin(t *testing.T) {
-	// queryClient := suite.queryClient
-	// keeper, ctx := setupKeeper(t)
-	msgServer, ctx, keeper := setupMsgServer(t)
+	msgServer, ctx, keeper := setupMsgServer()
 
 	var req *types.QueryAdminsRequest
 

x/adminmodule/keeper/msg_server_test.go

@@ -2,14 +2,13 @@ package keeper_test
 
 import (
 	"context"
-	"testing"
 
 	"github.com/cosmos/admin-module/x/adminmodule/keeper"
 	"github.com/cosmos/admin-module/x/adminmodule/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
 
-func setupMsgServer(t testing.TB) (types.MsgServer, context.Context, *keeper.Keeper) {
-	k, ctx := setupKeeper(t)
+func setupMsgServer() (types.MsgServer, context.Context, *keeper.Keeper) {
+	k, ctx := setupKeeper()
 	return keeper.NewMsgServerImpl(*k), sdk.WrapSDKContext(ctx), k
 }

x/adminmodule/keeper/proposal_archive_legacy_test.go

@@ -0,0 +1,27 @@
+package keeper_test
+
+import (
+	"testing"
+
+	sdk "github.com/cosmos/cosmos-sdk/types"
+	govv1types "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1"
+	"github.com/stretchr/testify/require"
+)
+
+func TestAddToArchiveLegacy(t *testing.T) {
+	_, ctx, keeper := setupMsgServer()
+	keeper.SetProposalIDLegacy(sdk.UnwrapSDKContext(ctx), 1)
+
+	tp := &govv1types.TextProposal{Title: "Test", Description: "Test Description"}
+	proposal, err := keeper.SubmitProposalLegacy(sdk.UnwrapSDKContext(ctx), tp)
+	require.NoError(t, err)
+
+	keeper.AddToArchiveLegacy(sdk.UnwrapSDKContext(ctx), proposal)
+
+	proposals := keeper.GetArchivedProposalsLegacy(sdk.UnwrapSDKContext(ctx))
+	require.True(t, len(proposals) == 1)
+
+	t.Log(tp, proposals[0].GetContent())
+	require.Equal(t, tp, proposals[0].GetContent())
+
+}

x/adminmodule/keeper/proposal_archive_test.go

@@ -3,25 +3,43 @@ package keeper_test
 import (
 	"testing"
 
+	"github.com/cometbft/cometbft/proto/tendermint/types"
+	"github.com/cosmos/admin-module/app"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	govv1types "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1"
+	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
 	"github.com/stretchr/testify/require"
 )
 
 func TestAddToArchive(t *testing.T) {
-	_, ctx, keeper := setupMsgServer(t)
+	testApp := app.GetTestApp()
+	keeper := testApp.AdminmoduleKeeper
+	bankKeeper := testApp.BankKeeper
+
+	acc1 := sdk.AccAddress("acc1")
+	acc2 := sdk.AccAddress("acc2")
+	coins := sdk.NewCoins(sdk.NewInt64Coin("denom", 10))
+
+	ctx := testApp.NewContext(false, types.Header{})
+
 	keeper.SetProposalID(sdk.UnwrapSDKContext(ctx), 1)
 
-	tp := &govv1types.TextProposal{Title: "Test", Description: "Test Description"}
-	proposal, err := keeper.SubmitProposal(sdk.UnwrapSDKContext(ctx), tp)
+	if err := bankKeeper.MintCoins(ctx, banktypes.ModuleName, coins); err != nil {
+		t.Fatal(err.Error())
+	}
+
+	if err := bankKeeper.SendCoinsFromModuleToAccount(ctx, banktypes.ModuleName, acc1, coins); err != nil {
+		t.Fatal(err.Error())
+	}
+
+	msgs := []sdk.Msg{banktypes.NewMsgSend(acc1, acc2, coins)}
+	proposal, err := keeper.SubmitProposal(sdk.UnwrapSDKContext(ctx), msgs)
 	require.NoError(t, err)
 
 	keeper.AddToArchive(sdk.UnwrapSDKContext(ctx), proposal)
 
 	proposals := keeper.GetArchivedProposals(sdk.UnwrapSDKContext(ctx))
-	require.True(t, len(proposals) == 1)
-
-	t.Log(tp, proposals[0].GetContent())
-	require.Equal(t, tp, proposals[0].GetContent())
 
+	require.True(t, len(proposals) == 1)
+	require.Equal(t, 1, len(proposals[0].GetMessages()))
+	require.Equal(t, bankKeeper.GetAllBalances(ctx, sdk.AccAddress("acc2")), coins)
 }