feat: stop supporting interchainqueries module

app/keepers/keepers.go

@@ -81,9 +81,6 @@ import (
 	"github.com/Nolus-Protocol/nolus-core/x/feerefunder"
 	feerefunderkeeper "github.com/Nolus-Protocol/nolus-core/x/feerefunder/keeper"
 	feetypes "github.com/Nolus-Protocol/nolus-core/x/feerefunder/types"
-	"github.com/Nolus-Protocol/nolus-core/x/interchainqueries"
-	interchainquerieskeeper "github.com/Nolus-Protocol/nolus-core/x/interchainqueries/keeper"
-	interchainqueriestypes "github.com/Nolus-Protocol/nolus-core/x/interchainqueries/types"
 	"github.com/Nolus-Protocol/nolus-core/x/interchaintxs"
 	interchaintxskeeper "github.com/Nolus-Protocol/nolus-core/x/interchaintxs/keeper"
 	interchaintxstypes "github.com/Nolus-Protocol/nolus-core/x/interchaintxs/types"
@@ -130,22 +127,20 @@ type AppKeepers struct {
 	TaxKeeper      *taxkeeper.Keeper
 	VestingsKeeper *vestingskeeper.Keeper
 
-	InterchainTxsKeeper     *interchaintxskeeper.Keeper
-	InterchainQueriesKeeper *interchainquerieskeeper.Keeper
-	ContractManagerKeeper   *contractmanagermodulekeeper.Keeper
+	InterchainTxsKeeper   *interchaintxskeeper.Keeper
+	ContractManagerKeeper *contractmanagermodulekeeper.Keeper
 
 	WasmKeeper wasmkeeper.Keeper
 	WasmConfig wasmtypes.WasmConfig
 
 	// Modules
-	ContractManagerModule   contractmanager.AppModule
-	InterchainTxsModule     interchaintxs.AppModule
-	InterchainQueriesModule interchainqueries.AppModule
-	TransferModule          transferSudo.AppModule
-	FeeRefunderModule       feerefunder.AppModule
-	VestingsModule          vestings.AppModule
-	IcaModule               ica.AppModule
-	AuthzModule             authzmodule.AppModule
+	ContractManagerModule contractmanager.AppModule
+	InterchainTxsModule   interchaintxs.AppModule
+	TransferModule        transferSudo.AppModule
+	FeeRefunderModule     feerefunder.AppModule
+	VestingsModule        vestings.AppModule
+	IcaModule             ica.AppModule
+	AuthzModule           authzmodule.AppModule
 }
 
 func (appKeepers *AppKeepers) NewAppKeepers(
@@ -385,19 +380,6 @@ func (appKeepers *AppKeepers) NewAppKeepers(
 
 	appKeepers.IcaModule = ica.NewAppModule(appKeepers.ICAControllerKeeper, appKeepers.ICAHostKeeper)
 
-	appKeepers.InterchainQueriesKeeper = interchainquerieskeeper.NewKeeper(
-		appCodec,
-		appKeepers.keys[interchainqueriestypes.StoreKey],
-		appKeepers.keys[interchainqueriestypes.MemStoreKey],
-		appKeepers.IBCKeeper,
-		appKeepers.BankKeeper,
-		appKeepers.ContractManagerKeeper,
-		interchainquerieskeeper.Verifier{},
-		interchainquerieskeeper.TransactionVerifier{},
-		authtypes.NewModuleAddress(govtypes.ModuleName).String(),
-	)
-	appKeepers.InterchainQueriesModule = interchainqueries.NewAppModule(appCodec, *appKeepers.InterchainQueriesKeeper, appKeepers.AccountKeeper, appKeepers.BankKeeper)
-
 	appKeepers.InterchainTxsKeeper = interchaintxskeeper.NewKeeper(
 		appCodec,
 		appKeepers.keys[interchaintxstypes.StoreKey],
@@ -426,7 +408,6 @@ func (appKeepers *AppKeepers) NewAppKeepers(
 	supportedFeatures := []string{"iterator", "stargate", "staking", "neutron", "migrate", "upgrade", "cosmwasm_1_1", "cosmwasm_1_2", "cosmwasm_1_3", "cosmwasm_1_4", "cosmwasm_2_0", "cosmwasm_2_1"}
 	wasmOpts = append(wasmbinding.RegisterCustomPlugins(
 		appKeepers.InterchainTxsKeeper,
-		appKeepers.InterchainQueriesKeeper,
 		*appKeepers.TransferKeeper,
 		appKeepers.FeeRefunderKeeper,
 		appKeepers.ContractManagerKeeper,
@@ -560,7 +541,6 @@ func initParamsKeeper(
 	paramsKeeper.Subspace(govtypes.ModuleName).WithKeyTable(govv1.ParamKeyTable()) //nolint:staticcheck
 	paramsKeeper.Subspace(feetypes.ModuleName).WithKeyTable(feetypes.ParamKeyTable())
 	paramsKeeper.Subspace(interchaintxstypes.ModuleName).WithKeyTable(interchaintxstypes.ParamKeyTable())
-	paramsKeeper.Subspace(interchainqueriestypes.ModuleName).WithKeyTable(interchainqueriestypes.ParamKeyTable())
 	paramsKeeper.Subspace(vestingstypes.ModuleName)
 
 	return &paramsKeeper

app/keepers/keys.go

@@ -30,7 +30,6 @@ import (
 
 	contractmanagermoduletypes "github.com/Nolus-Protocol/nolus-core/x/contractmanager/types"
 	feerefundertypes "github.com/Nolus-Protocol/nolus-core/x/feerefunder/types"
-	interchainqueriestypes "github.com/Nolus-Protocol/nolus-core/x/interchainqueries/types"
 	interchaintxstypes "github.com/Nolus-Protocol/nolus-core/x/interchaintxs/types"
 )
 
@@ -58,7 +57,6 @@ func (appKeepers *AppKeepers) GenerateKeys() {
 		icacontrollertypes.StoreKey,
 		icahosttypes.StoreKey,
 		capabilitytypes.StoreKey,
-		interchainqueriestypes.StoreKey,
 		contractmanagermoduletypes.StoreKey,
 		interchaintxstypes.StoreKey,
 		wasmtypes.StoreKey,

app/modules.go

@@ -61,27 +61,24 @@ import (
 	contractmanagermoduletypes "github.com/Nolus-Protocol/nolus-core/x/contractmanager/types"
 	"github.com/Nolus-Protocol/nolus-core/x/feerefunder"
 	feetypes "github.com/Nolus-Protocol/nolus-core/x/feerefunder/types"
-	"github.com/Nolus-Protocol/nolus-core/x/interchainqueries"
-	interchainqueriestypes "github.com/Nolus-Protocol/nolus-core/x/interchainqueries/types"
 	"github.com/Nolus-Protocol/nolus-core/x/interchaintxs"
 	interchaintxstypes "github.com/Nolus-Protocol/nolus-core/x/interchaintxs/types"
 	transferSudo "github.com/Nolus-Protocol/nolus-core/x/transfer"
 )
 
 // module account permissions.
 var maccPerms = map[string][]string{
-	authtypes.FeeCollectorName:        nil,
-	distrtypes.ModuleName:             nil,
-	minttypes.ModuleName:              {authtypes.Minter},
-	stakingtypes.BondedPoolName:       {authtypes.Burner, authtypes.Staking},
-	stakingtypes.NotBondedPoolName:    {authtypes.Burner, authtypes.Staking},
-	govtypes.ModuleName:               {authtypes.Burner},
-	ibctransfertypes.ModuleName:       {authtypes.Minter, authtypes.Burner},
-	wasmtypes.ModuleName:              {authtypes.Burner},
-	vestingstypes.ModuleName:          nil,
-	icatypes.ModuleName:               nil,
-	interchainqueriestypes.ModuleName: nil,
-	feetypes.ModuleName:               nil,
+	authtypes.FeeCollectorName:     nil,
+	distrtypes.ModuleName:          nil,
+	minttypes.ModuleName:           {authtypes.Minter},
+	stakingtypes.BondedPoolName:    {authtypes.Burner, authtypes.Staking},
+	stakingtypes.NotBondedPoolName: {authtypes.Burner, authtypes.Staking},
+	govtypes.ModuleName:            {authtypes.Burner},
+	ibctransfertypes.ModuleName:    {authtypes.Minter, authtypes.Burner},
+	wasmtypes.ModuleName:           {authtypes.Burner},
+	vestingstypes.ModuleName:       nil,
+	icatypes.ModuleName:            nil,
+	feetypes.ModuleName:            nil,
 }
 
 // ModuleBasics defines the module BasicManager is in charge of setting up basic,
@@ -114,7 +111,6 @@ var ModuleBasics = module.NewBasicManager(
 	tax.AppModuleBasic{},
 	ica.AppModuleBasic{},
 	interchaintxs.AppModuleBasic{},
-	interchainqueries.AppModuleBasic{},
 	feerefunder.AppModuleBasic{},
 	contractmanager.AppModuleBasic{},
 	authzmodule.AppModuleBasic{},
@@ -157,7 +153,6 @@ func appModules(
 		app.AppKeepers.TransferModule,
 		app.AppKeepers.VestingsModule,
 		app.AppKeepers.IcaModule,
-		app.AppKeepers.InterchainQueriesModule,
 		app.AppKeepers.InterchainTxsModule,
 		app.AppKeepers.FeeRefunderModule,
 		app.AppKeepers.ContractManagerModule,
@@ -191,7 +186,6 @@ func simulationModules(
 		wasm.NewAppModule(appCodec, &app.WasmKeeper, app.StakingKeeper, app.AccountKeeper, app.BankKeeper, app.MsgServiceRouter(), app.GetSubspace(wasmtypes.ModuleName)),
 		ibc.NewAppModule(app.IBCKeeper),
 		app.AppKeepers.TransferModule,
-		app.AppKeepers.InterchainQueriesModule,
 		app.AppKeepers.InterchainTxsModule,
 	}
 }
@@ -231,7 +225,6 @@ func orderBeginBlockers() []string {
 		govtypes.ModuleName,
 		icatypes.ModuleName,
 		interchaintxstypes.ModuleName,
-		interchainqueriestypes.ModuleName,
 		contractmanagermoduletypes.ModuleName,
 		wasmtypes.ModuleName,
 		feetypes.ModuleName,
@@ -262,7 +255,6 @@ func orderEndBlockers() []string {
 		vestingstypes.ModuleName,
 		icatypes.ModuleName,
 		interchaintxstypes.ModuleName,
-		interchainqueriestypes.ModuleName,
 		contractmanagermoduletypes.ModuleName,
 		wasmtypes.ModuleName,
 		feetypes.ModuleName,
@@ -300,7 +292,6 @@ func genesisModuleOrder() []string {
 		upgradetypes.ModuleName,
 		ibctransfertypes.ModuleName,
 		icatypes.ModuleName,
-		interchainqueriestypes.ModuleName,
 		interchaintxstypes.ModuleName,
 		contractmanagermoduletypes.ModuleName,
 		// wasm after ibc transfer

app/sim_test.go

@@ -55,7 +55,6 @@ import (
 
 	contractmanagermoduletypes "github.com/Nolus-Protocol/nolus-core/x/contractmanager/types"
 	feetypes "github.com/Nolus-Protocol/nolus-core/x/feerefunder/types"
-	interchainqueriestypes "github.com/Nolus-Protocol/nolus-core/x/interchainqueries/types"
 	interchaintxstypes "github.com/Nolus-Protocol/nolus-core/x/interchaintxs/types"
 )
 
@@ -321,7 +320,6 @@ func TestAppImportExport(t *testing.T) {
 		{keys[taxmoduletypes.StoreKey], newKeys[taxmoduletypes.StoreKey], [][]byte{}},
 		{keys[interchaintxstypes.StoreKey], newKeys[interchaintxstypes.StoreKey], [][]byte{}},
 		{keys[contractmanagermoduletypes.StoreKey], newKeys[contractmanagermoduletypes.StoreKey], [][]byte{}},
-		{keys[interchainqueriestypes.StoreKey], newKeys[interchainqueriestypes.StoreKey], [][]byte{}},
 		{keys[icacontrollertypes.StoreKey], newKeys[icacontrollertypes.StoreKey], [][]byte{}},
 		{keys[wasmtypes.StoreKey], newKeys[wasmtypes.StoreKey], [][]byte{wasmtypes.TXCounterPrefix}},
 	}