Merge branch 'main' into issues/1034/feat/claim_morse_supplier

Author: bryanchriswhite

testutil/integration/app.go

@@ -528,7 +528,6 @@ func NewCompleteIntegrationApp(t *testing.T, opts ...IntegrationAppOptionFn) *Ap
 		accountKeeper,
 		bankKeeper,
 		sharedKeeper,
-		gatewayKeeper,
 		applicationKeeper,
 		supplierKeeper,
 	)

testutil/keeper/migration.go

@@ -31,7 +31,6 @@ import (
 type MigrationKeeperConfig struct {
 	bankKeeper     migrationtypes.BankKeeper
 	sharedKeeper   migrationtypes.SharedKeeper
-	gatewayKeeper  migrationtypes.GatewayKeeper
 	appKeeper      migrationtypes.ApplicationKeeper
 	supplierKeeper migrationtypes.SupplierKeeper
 }
@@ -74,7 +73,6 @@ func MigrationKeeper(
 		mockAccountKeeper,
 		cfg.bankKeeper,
 		cfg.sharedKeeper,
-		cfg.gatewayKeeper,
 		cfg.appKeeper,
 		cfg.supplierKeeper,
 	)
@@ -96,13 +94,6 @@ func WithBankKeeper(bankKeeper migrationtypes.BankKeeper) MigrationKeeperOptionF
 	}
 }
 
-// WithGatewayKeeper assigns the given GatewayKeeper to the MigrationKeeperConfig.
-func WithGatewayKeeper(gatewayKeeper migrationtypes.GatewayKeeper) MigrationKeeperOptionFn {
-	return func(cfg *MigrationKeeperConfig) {
-		cfg.gatewayKeeper = gatewayKeeper
-	}
-}
-
 // WithApplicationKeeper assigns the given ApplicationKeeper to the MigrationKeeperConfig.
 func WithApplicationKeeper(appKeeper migrationtypes.ApplicationKeeper) MigrationKeeperOptionFn {
 	return func(cfg *MigrationKeeperConfig) {
@@ -124,6 +115,8 @@ func WithSupplierKeeper(supplierKeeper migrationtypes.SupplierKeeper) MigrationK
 //   - SendCoinsFromModuleToAccount
 //
 // 2. A Mocked shared keeper which responds to the Params method with the default params.
+// 3. A Mocked app keeper.
+// 4. A Mocked supplier keeper.
 func defaultConfigWithMocks(ctrl *gomock.Controller) *MigrationKeeperConfig {
 	mockBankKeeper := mocks.NewMockBankKeeper(ctrl)
 	mockBankKeeper.EXPECT().
@@ -142,14 +135,6 @@ func defaultConfigWithMocks(ctrl *gomock.Controller) *MigrationKeeperConfig {
 		Return(sharedtypes.DefaultParams()).
 		AnyTimes()
 
-	mockGatewayKeeper := mocks.NewMockGatewayKeeper(ctrl)
-	mockGatewayKeeper.EXPECT().
-		GetGateway(gomock.Any(), gomock.Any()).
-		AnyTimes()
-	mockGatewayKeeper.EXPECT().
-		SetGateway(gomock.Any(), gomock.Any()).
-		AnyTimes()
-
 	mockAppKeeper := mocks.NewMockApplicationKeeper(ctrl)
 	mockAppKeeper.EXPECT().
 		GetApplication(gomock.Any(), gomock.Any()).
@@ -169,7 +154,6 @@ func defaultConfigWithMocks(ctrl *gomock.Controller) *MigrationKeeperConfig {
 	return &MigrationKeeperConfig{
 		bankKeeper:     mockBankKeeper,
 		sharedKeeper:   sharedKeeper,
-		gatewayKeeper:  mockGatewayKeeper,
 		appKeeper:      mockAppKeeper,
 		supplierKeeper: mockSupplierKeeper,
 	}

testutil/keeper/tokenomics.go

@@ -535,7 +535,6 @@ func NewTokenomicsModuleKeepers(
 		accountKeeper,
 		bankKeeper,
 		sharedKeeper,
-		gatewayKeeper,
 		appKeeper,
 		supplierKeeper,
 	)

x/migration/keeper/keeper.go

@@ -24,7 +24,6 @@ type (
 		accountKeeper  types.AccountKeeper
 		bankKeeper     types.BankKeeper
 		sharedKeeper   types.SharedKeeper
-		gatewayKeeper  types.GatewayKeeper
 		appKeeper      types.ApplicationKeeper
 		supplierKeeper types.SupplierKeeper
 	}
@@ -38,7 +37,6 @@ func NewKeeper(
 	accountKeeper types.AccountKeeper,
 	bankKeeper types.BankKeeper,
 	sharedKeeper types.SharedKeeper,
-	gatewayKeeper types.GatewayKeeper,
 	appKeeper types.ApplicationKeeper,
 	supplierKeeper types.SupplierKeeper,
 ) Keeper {
@@ -54,7 +52,6 @@ func NewKeeper(
 		accountKeeper:  accountKeeper,
 		bankKeeper:     bankKeeper,
 		sharedKeeper:   sharedKeeper,
-		gatewayKeeper:  gatewayKeeper,
 		appKeeper:      appKeeper,
 		supplierKeeper: supplierKeeper,
 	}

x/migration/module/module.go

@@ -192,7 +192,6 @@ type ModuleInputs struct {
 	AccountKeeper     types.AccountKeeper
 	BankKeeper        types.BankKeeper
 	SharedKeeper      types.SharedKeeper
-	GatewayKeeper     types.GatewayKeeper
 	ApplicationKeeper types.ApplicationKeeper
 	SupplierKeeper    types.SupplierKeeper
 }
@@ -218,7 +217,6 @@ func ProvideModule(in ModuleInputs) ModuleOutputs {
 		in.AccountKeeper,
 		in.BankKeeper,
 		in.SharedKeeper,
-		in.GatewayKeeper,
 		in.ApplicationKeeper,
 		in.SupplierKeeper,
 	)

x/migration/types/expected_keepers.go

@@ -1,4 +1,4 @@
-//go:generate go run go.uber.org/mock/mockgen -destination ../../../testutil/migration/mocks/expected_keepers_mock.go -package mocks . AccountKeeper,BankKeeper,SharedKeeper,GatewayKeeper,ApplicationKeeper,SupplierKeeper
+//go:generate go run go.uber.org/mock/mockgen -destination ../../../testutil/migration/mocks/expected_keepers_mock.go -package mocks . AccountKeeper,BankKeeper,SharedKeeper,ApplicationKeeper,SupplierKeeper
 
 package types
 
@@ -9,7 +9,6 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
 	apptypes "github.com/pokt-network/poktroll/x/application/types"
-	gatewaytypes "github.com/pokt-network/poktroll/x/gateway/types"
 	sharedtypes "github.com/pokt-network/poktroll/x/shared/types"
 	suppliertypes "github.com/pokt-network/poktroll/x/supplier/types"
 )
@@ -28,11 +27,6 @@ type BankKeeper interface {
 	// Methods imported from bank should be defined here
 }
 
-type GatewayKeeper interface {
-	GetGateway(ctx context.Context, address string) (gateway gatewaytypes.Gateway, found bool)
-	SetGateway(ctx context.Context, gateway gatewaytypes.Gateway)
-}
-
 type ApplicationKeeper interface {
 	GetApplication(ctx context.Context, appAddr string) (app apptypes.Application, found bool)
 	SetApplication(ctx context.Context, application apptypes.Application)