fix: update unit tests of other modules. refactor x/interchainquery t…

…ests

ibctesting/simapp/simd/cmd/testnet.go

@@ -212,7 +212,6 @@ func InitTestnet(
 			sdk.NewCoin(sdk.DefaultBondDenom, valTokens),
 			stakingtypes.NewDescription(nodeDirName, "", "", "", ""),
 			stakingtypes.NewCommissionRates(sdk.OneDec(), sdk.OneDec(), sdk.OneDec()),
-			sdk.OneInt(),
 		)
 		if err != nil {
 			return err

simapp/app.go

@@ -71,9 +71,8 @@ import (
 	ibc "github.com/cosmos/ibc-go/v6/modules/core"
 	ibchost "github.com/cosmos/ibc-go/v6/modules/core/24-host"
 	ibckeeper "github.com/cosmos/ibc-go/v6/modules/core/keeper"
-	ibctesting "github.com/cosmos/ibc-go/v6/testing"
-	ibctestingtypes "github.com/cosmos/ibc-go/v6/testing/types"
 	"github.com/gorilla/mux"
+	ibctestingtypes "github.com/persistenceOne/persistence-sdk/v2/ibctesting/types"
 	distr "github.com/persistenceOne/persistence-sdk/v2/x/lsnative/distribution"
 	distrclient "github.com/persistenceOne/persistence-sdk/v2/x/lsnative/distribution/client"
 	distrkeeper "github.com/persistenceOne/persistence-sdk/v2/x/lsnative/distribution/keeper"
@@ -159,7 +158,6 @@ var (
 var (
 	_ App                     = (*SimApp)(nil)
 	_ servertypes.Application = (*SimApp)(nil)
-	_ ibctesting.TestingApp   = (*SimApp)(nil)
 )
 
 // SimApp extends an ABCI application, but with most of its parameters exported.

simapp/simd/cmd/genaccounts_test.go

@@ -13,10 +13,10 @@ import (
 	"github.com/cosmos/cosmos-sdk/testutil/testdata"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/module"
-	genutiltest "github.com/cosmos/cosmos-sdk/x/genutil/client/testutil"
 	"github.com/persistenceOne/persistence-sdk/v2/simapp"
 	simcmd "github.com/persistenceOne/persistence-sdk/v2/simapp/simd/cmd"
 	"github.com/persistenceOne/persistence-sdk/v2/x/lsnative/genutil"
+	genutiltest "github.com/persistenceOne/persistence-sdk/v2/x/lsnative/genutil/client/testutil"
 	"github.com/spf13/viper"
 	"github.com/stretchr/testify/require"
 	"github.com/tendermint/tendermint/libs/log"

simapp/simd/cmd/root.go

@@ -20,7 +20,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/x/auth/types"
 	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
 	"github.com/cosmos/cosmos-sdk/x/crisis"
-	genutilcli "github.com/cosmos/cosmos-sdk/x/genutil/client/cli"
+	genutilcli "github.com/persistenceOne/persistence-sdk/v2/x/lsnative/genutil/client/cli"
 	"github.com/spf13/cast"
 	"github.com/spf13/cobra"
 	tmcfg "github.com/tendermint/tendermint/config"

simapp/simd/cmd/testnet_test.go

@@ -9,8 +9,8 @@ import (
 	"github.com/cosmos/cosmos-sdk/client/flags"
 	"github.com/cosmos/cosmos-sdk/server"
 	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
-	genutiltest "github.com/cosmos/cosmos-sdk/x/genutil/client/testutil"
 	"github.com/persistenceOne/persistence-sdk/v2/simapp"
+	genutiltest "github.com/persistenceOne/persistence-sdk/v2/x/lsnative/genutil/client/testutil"
 	genutiltypes "github.com/persistenceOne/persistence-sdk/v2/x/lsnative/genutil/types"
 	"github.com/spf13/viper"
 	"github.com/stretchr/testify/require"

simapp/test_helpers.go

@@ -27,7 +27,7 @@ import (
 	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
 	minttypes "github.com/cosmos/cosmos-sdk/x/mint/types"
 	sdkstaking "github.com/cosmos/cosmos-sdk/x/staking/types"
-	ibctesting "github.com/cosmos/ibc-go/v6/testing"
+	"github.com/persistenceOne/persistence-sdk/v2/ibctesting"
 	"github.com/persistenceOne/persistence-sdk/v2/simapp/helpers"
 	stakingtypes "github.com/persistenceOne/persistence-sdk/v2/x/lsnative/staking/types"
 	"github.com/stretchr/testify/require"

x/interchainquery/genesis_test.go

@@ -4,14 +4,14 @@ import (
 	"testing"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
-	ibctesting "github.com/cosmos/ibc-go/v6/testing"
 	"github.com/stretchr/testify/suite"
 
+	ibctesting "github.com/persistenceOne/persistence-sdk/v2/ibctesting"
 	"github.com/persistenceOne/persistence-sdk/v2/simapp"
 	"github.com/persistenceOne/persistence-sdk/v2/x/interchainquery"
 	"github.com/persistenceOne/persistence-sdk/v2/x/interchainquery/keeper"
 	"github.com/persistenceOne/persistence-sdk/v2/x/interchainquery/types"
+	stakingtypes "github.com/persistenceOne/persistence-sdk/v2/x/lsnative/staking/types"
 )
 
 func init() {

x/interchainquery/keeper/abci_test.go

@@ -2,14 +2,17 @@ package keeper_test
 
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
+	stakingtypes "github.com/persistenceOne/persistence-sdk/v2/x/lsnative/staking/types"
 
+	"github.com/persistenceOne/persistence-sdk/v2/ibctesting"
 	"github.com/persistenceOne/persistence-sdk/v2/x/interchainquery/keeper"
 )
 
 func (suite *KeeperTestSuite) TestEndBlocker() {
+	validators := suite.GetSimApp(suite.chainB).StakingKeeper.GetBondedValidatorsByPower(suite.chainB.GetContext())
+
 	qvr := stakingtypes.QueryValidatorsResponse{
-		Validators: suite.GetSimApp(suite.chainB).StakingKeeper.GetBondedValidatorsByPower(suite.chainB.GetContext()),
+		Validators: ibctesting.SdkValidatorsToValidators(validators),
 	}
 
 	bondedQuery := stakingtypes.QueryValidatorsRequest{Status: stakingtypes.BondStatusBonded}

x/interchainquery/keeper/grpc_query_test.go

@@ -2,7 +2,7 @@ package keeper_test
 
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
+	stakingtypes "github.com/persistenceOne/persistence-sdk/v2/x/lsnative/staking/types"
 
 	icqtypes "github.com/persistenceOne/persistence-sdk/v2/x/interchainquery/types"
 )

x/interchainquery/keeper/keeper_test.go

@@ -4,13 +4,14 @@ import (
 	"testing"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
-	ibctesting "github.com/cosmos/ibc-go/v6/testing"
+	sdkstaking "github.com/cosmos/cosmos-sdk/x/staking/types"
 	"github.com/stretchr/testify/suite"
 
+	"github.com/persistenceOne/persistence-sdk/v2/ibctesting"
 	"github.com/persistenceOne/persistence-sdk/v2/simapp"
 	"github.com/persistenceOne/persistence-sdk/v2/x/interchainquery/keeper"
 	icqtypes "github.com/persistenceOne/persistence-sdk/v2/x/interchainquery/types"
+	stakingtypes "github.com/persistenceOne/persistence-sdk/v2/x/lsnative/staking/types"
 )
 
 const TestOwnerAddress = "cosmos17dtl0mjt3t77kpuhg2edqzjpszulwhgzuj9ljs"
@@ -52,7 +53,7 @@ func (suite *KeeperTestSuite) SetupTest() {
 }
 
 func (suite *KeeperTestSuite) TestMakeRequest() {
-	bondedQuery := stakingtypes.QueryValidatorsRequest{Status: stakingtypes.BondStatusBonded}
+	bondedQuery := stakingtypes.QueryValidatorsRequest{Status: sdkstaking.BondStatusBonded}
 	bz, err := bondedQuery.Marshal()
 	suite.NoError(err)
 
@@ -91,12 +92,13 @@ func (suite *KeeperTestSuite) TestMakeRequest() {
 }
 
 func (suite *KeeperTestSuite) TestSubmitQueryResponse() {
-	bondedQuery := stakingtypes.QueryValidatorsRequest{Status: stakingtypes.BondStatusBonded}
+	bondedQuery := stakingtypes.QueryValidatorsRequest{Status: sdkstaking.BondStatusBonded}
 	bz, err := bondedQuery.Marshal()
 	suite.NoError(err)
 
+	validators := suite.GetSimApp(suite.chainB).StakingKeeper.GetBondedValidatorsByPower(suite.chainB.GetContext())
 	qvr := stakingtypes.QueryValidatorsResponse{
-		Validators: suite.GetSimApp(suite.chainB).StakingKeeper.GetBondedValidatorsByPower(suite.chainB.GetContext()),
+		Validators: ibctesting.SdkValidatorsToValidators(validators),
 	}
 
 	tests := []struct {
@@ -192,12 +194,13 @@ func (suite *KeeperTestSuite) TestSubmitQueryResponse() {
 }
 
 func (suite *KeeperTestSuite) TestDataPoints() {
-	bondedQuery := stakingtypes.QueryValidatorsRequest{Status: stakingtypes.BondStatusBonded}
+	bondedQuery := stakingtypes.QueryValidatorsRequest{Status: sdkstaking.BondStatusBonded}
 	bz, err := bondedQuery.Marshal()
 	suite.NoError(err)
 
+	validators := suite.GetSimApp(suite.chainB).StakingKeeper.GetBondedValidatorsByPower(suite.chainB.GetContext())
 	qvr := stakingtypes.QueryValidatorsResponse{
-		Validators: suite.GetSimApp(suite.chainB).StakingKeeper.GetBondedValidatorsByPower(suite.chainB.GetContext()),
+		Validators: ibctesting.SdkValidatorsToValidators(validators),
 	}
 
 	id := keeper.GenerateQueryHash(suite.path.EndpointB.ConnectionID, suite.chainB.ChainID, "cosmos.staking.v1beta1.Query/Validators", bz, "")

x/interchainquery/keeper/queries_test.go

@@ -2,7 +2,7 @@ package keeper_test
 
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
+	stakingtypes "github.com/persistenceOne/persistence-sdk/v2/x/lsnative/staking/types"
 
 	"github.com/persistenceOne/persistence-sdk/v2/x/interchainquery/keeper"
 )

x/interchainquery/types/msgs_test.go

@@ -3,13 +3,13 @@ package types_test
 import (
 	"testing"
 
-	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
-	ibctesting "github.com/cosmos/ibc-go/v6/testing"
 	"github.com/stretchr/testify/require"
 
+	"github.com/persistenceOne/persistence-sdk/v2/ibctesting"
 	"github.com/persistenceOne/persistence-sdk/v2/simapp"
 	"github.com/persistenceOne/persistence-sdk/v2/x/interchainquery/keeper"
 	"github.com/persistenceOne/persistence-sdk/v2/x/interchainquery/types"
+	stakingtypes "github.com/persistenceOne/persistence-sdk/v2/x/lsnative/staking/types"
 )
 
 const TestOwnerAddress = "cosmos17dtl0mjt3t77kpuhg2edqzjpszulwhgzuj9ljs"
@@ -53,8 +53,9 @@ func TestMsgSubmitQueryResponse(t *testing.T) {
 	bz, err := bondedQuery.Marshal()
 	require.NoError(t, err)
 
+	validators := GetSimApp(chainB).StakingKeeper.GetBondedValidatorsByPower(chainB.GetContext())
 	qvr := stakingtypes.QueryValidatorsResponse{
-		Validators: GetSimApp(chainB).StakingKeeper.GetBondedValidatorsByPower(chainB.GetContext()),
+		Validators: ibctesting.SdkValidatorsToValidators(validators),
 	}
 
 	msg := types.MsgSubmitQueryResponse{

x/oracle/keeper/keeper.go

@@ -9,7 +9,7 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 	paramstypes "github.com/cosmos/cosmos-sdk/x/params/types"
-	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
+	sdkstaking "github.com/cosmos/cosmos-sdk/x/staking/types"
 	gogotypes "github.com/gogo/protobuf/types"
 	"github.com/tendermint/tendermint/libs/log"
 
@@ -143,7 +143,7 @@ func (k Keeper) IterateExchangeRates(ctx sdk.Context, handler func(string, sdk.D
 func (k Keeper) GetFeederDelegation(ctx sdk.Context, operator sdk.ValAddress) (sdk.AccAddress, error) {
 	// check that the given validator exists
 	if val := k.StakingKeeper.Validator(ctx, operator); val == nil || !val.IsBonded() {
-		return nil, sdkerrors.Wrapf(stakingtypes.ErrNoValidatorFound, "validator %s is not active set", operator.String())
+		return nil, sdkerrors.Wrapf(sdkstaking.ErrNoValidatorFound, "validator %s is not active set", operator.String())
 	}
 
 	store := ctx.KVStore(k.storeKey)

x/oracle/keeper/msg_server.go

@@ -5,7 +5,7 @@ import (
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
-	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
+	sdkstaking "github.com/cosmos/cosmos-sdk/x/staking/types"
 
 	"github.com/persistenceOne/persistence-sdk/v2/x/oracle/types"
 )
@@ -159,7 +159,7 @@ func (ms msgServer) DelegateFeedConsent(
 
 	val := ms.StakingKeeper.Validator(ctx, operatorAddr)
 	if val == nil {
-		return nil, sdkerrors.Wrap(stakingtypes.ErrNoValidatorFound, msg.Operator)
+		return nil, sdkerrors.Wrap(sdkstaking.ErrNoValidatorFound, msg.Operator)
 	}
 
 	ms.SetFeederDelegation(ctx, operatorAddr, delegateAddr)

x/oracle/keeper/slash_test.go

@@ -3,8 +3,8 @@ package keeper_test
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"github.com/cosmos/cosmos-sdk/x/staking"
-	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
+	sdkstaking "github.com/cosmos/cosmos-sdk/x/staking/types"
+	"github.com/persistenceOne/persistence-sdk/v2/x/lsnative/staking"
 	"github.com/persistenceOne/persistence-sdk/v2/x/oracle/testutil"
 	"github.com/persistenceOne/persistence-sdk/v2/x/oracle/types"
 )
@@ -38,42 +38,42 @@ func (s *KeeperTestSuite) TestSlashAndResetMissCounters() {
 	s.app.OracleKeeper.SlashAndResetMissCounters(s.ctx)
 	staking.EndBlocker(s.ctx, s.app.StakingKeeper)
 
-	validator, _ := s.app.StakingKeeper.GetValidator(s.ctx, valAddr)
+	validator, _ := s.app.StakingKeeper.GetLiquidValidator(s.ctx, valAddr)
 	s.Require().Equal(amt, validator.GetBondedTokens())
 
 	// Case 2, slash
 	s.app.OracleKeeper.SetMissCounter(s.ctx, valAddr, missCounterSlash)
 	s.app.OracleKeeper.SlashAndResetMissCounters(s.ctx)
 
-	validator, _ = s.app.StakingKeeper.GetValidator(s.ctx, valAddr)
+	validator, _ = s.app.StakingKeeper.GetLiquidValidator(s.ctx, valAddr)
 	s.Require().Equal(amt.Sub(params.SlashFraction.MulInt(amt).TruncateInt()), validator.GetBondedTokens())
 	s.Require().True(validator.Jailed)
 
 	missCounter := app.OracleKeeper.GetMissCounter(ctx, valAddr)
 	s.Require().Zero(missCounter)
 
 	// Case 3, slash unbonded validator
-	validator, _ = s.app.StakingKeeper.GetValidator(s.ctx, valAddr)
-	validator.Status = stakingtypes.Unbonded
+	validator, _ = s.app.StakingKeeper.GetLiquidValidator(s.ctx, valAddr)
+	validator.Status = sdkstaking.Unbonded
 	validator.Jailed = false
 	validator.Tokens = amt
 	s.app.StakingKeeper.SetValidator(s.ctx, validator)
 
 	s.app.OracleKeeper.SetMissCounter(s.ctx, valAddr, missCounterSlash)
 	s.app.OracleKeeper.SlashAndResetMissCounters(s.ctx)
-	validator, _ = s.app.StakingKeeper.GetValidator(s.ctx, valAddr)
+	validator, _ = s.app.StakingKeeper.GetLiquidValidator(s.ctx, valAddr)
 	s.Require().Equal(amt, validator.Tokens)
 	s.Require().False(validator.Jailed)
 
 	// Case 4, slash jailed validator
-	validator, _ = s.app.StakingKeeper.GetValidator(s.ctx, valAddr)
-	validator.Status = stakingtypes.Bonded
+	validator, _ = s.app.StakingKeeper.GetLiquidValidator(s.ctx, valAddr)
+	validator.Status = sdkstaking.Bonded
 	validator.Jailed = true
 	validator.Tokens = amt
 	s.app.StakingKeeper.SetValidator(s.ctx, validator)
 
 	s.app.OracleKeeper.SetMissCounter(s.ctx, valAddr, missCounterSlash)
 	s.app.OracleKeeper.SlashAndResetMissCounters(s.ctx)
-	validator, _ = s.app.StakingKeeper.GetValidator(s.ctx, valAddr)
+	validator, _ = s.app.StakingKeeper.GetLiquidValidator(s.ctx, valAddr)
 	s.Require().Equal(amt, validator.Tokens)
 }

x/oracle/testutil/test_helpers.go

@@ -6,10 +6,10 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper"
 	minttypes "github.com/cosmos/cosmos-sdk/x/mint/types"
-	"github.com/cosmos/cosmos-sdk/x/staking"
-	stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper"
-	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
 	"github.com/persistenceOne/persistence-sdk/v2/simapp"
+	"github.com/persistenceOne/persistence-sdk/v2/x/lsnative/staking"
+	stakingkeeper "github.com/persistenceOne/persistence-sdk/v2/x/lsnative/staking/keeper"
+	stakingtypes "github.com/persistenceOne/persistence-sdk/v2/x/lsnative/staking/types"
 	"github.com/tendermint/tendermint/crypto/secp256k1"
 )
 
@@ -97,7 +97,7 @@ func newTestMsgCreateValidator(address sdk.ValAddress, pubKey cryptotypes.PubKey
 
 	msg, err := stakingtypes.NewMsgCreateValidator(
 		address, pubKey, sdk.NewCoin(sdk.DefaultBondDenom, amt),
-		stakingtypes.Description{}, commission, sdk.OneInt(),
+		stakingtypes.Description{}, commission,
 	)
 	if err != nil {
 		return nil, err

x/oracle/types/expected_keeper.go

@@ -5,14 +5,14 @@ import (
 	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"
+	sdkstaking "github.com/cosmos/cosmos-sdk/x/staking/types"
 )
 
 // StakingKeeper defines the expected interface contract defined by the x/staking
 // module.
 type StakingKeeper interface {
-	Validator(ctx sdk.Context, address sdk.ValAddress) stakingtypes.ValidatorI
-	GetBondedValidatorsByPower(ctx sdk.Context) []stakingtypes.Validator
+	Validator(ctx sdk.Context, address sdk.ValAddress) sdkstaking.ValidatorI
+	GetBondedValidatorsByPower(ctx sdk.Context) []sdkstaking.Validator
 	TotalBondedTokens(sdk.Context) math.Int
 	Slash(sdk.Context, sdk.ConsAddress, int64, int64, sdk.Dec) math.Int
 	Jail(sdk.Context, sdk.ConsAddress)
@@ -24,7 +24,7 @@ type StakingKeeper interface {
 // DistributionKeeper defines the expected interface contract defined by the
 // x/distribution module.
 type DistributionKeeper interface {
-	AllocateTokensToValidator(ctx sdk.Context, val stakingtypes.ValidatorI, tokens sdk.DecCoins)
+	AllocateTokensToValidator(ctx sdk.Context, val sdkstaking.ValidatorI, tokens sdk.DecCoins)
 	GetValidatorOutstandingRewardsCoins(ctx sdk.Context, val sdk.ValAddress) sdk.DecCoins
 }
 

x/oracle/types/utils_test.go

@@ -6,7 +6,7 @@ import (
 
 	cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
+	sdkstaking "github.com/cosmos/cosmos-sdk/x/staking/types"
 	"github.com/tendermint/tendermint/crypto/secp256k1"
 	tmprotocrypto "github.com/tendermint/tendermint/proto/tendermint/crypto"
 )
@@ -40,7 +40,7 @@ func (sk MockStakingKeeper) Validators() []MockValidator {
 	return sk.validators
 }
 
-func (sk MockStakingKeeper) Validator(_ sdk.Context, address sdk.ValAddress) stakingtypes.ValidatorI {
+func (sk MockStakingKeeper) Validator(_ sdk.Context, address sdk.ValAddress) sdkstaking.ValidatorI {
 	for _, validator := range sk.validators {
 		if validator.GetOperator().Equals(address) {
 			return validator
@@ -54,7 +54,7 @@ func (MockStakingKeeper) TotalBondedTokens(sdk.Context) sdk.Int {
 	return sdk.ZeroInt()
 }
 
-func (MockStakingKeeper) GetBondedValidatorsByPower(sdk.Context) []stakingtypes.Validator {
+func (MockStakingKeeper) GetBondedValidatorsByPower(sdk.Context) []sdkstaking.Validator {
 	return nil
 }
 
@@ -101,8 +101,8 @@ func (MockValidator) GetMoniker() string {
 	return ""
 }
 
-func (MockValidator) GetStatus() stakingtypes.BondStatus {
-	return stakingtypes.Bonded
+func (MockValidator) GetStatus() sdkstaking.BondStatus {
+	return sdkstaking.Bonded
 }
 
 func (MockValidator) IsBonded() bool {