chore: cleanup deprecated code

x/incentive/keys.go

@@ -6,12 +6,6 @@ const (
 
 	// StoreKey defines the primary module store key
 	StoreKey = ModuleName
-
-	// StoreKey defines the query route
-	QuerierRoute = ModuleName
-
-	// RouterKey is the message route
-	RouterKey = ModuleName
 )
 
 type (

x/incentive/module/module.go

@@ -122,21 +122,6 @@ func (AppModule) ConsensusVersion() uint64 {
 	return 1
 }
 
-// Deprecated: Route returns the message routing key for the x/incentive module.
-func (am AppModule) Route() sdk.Route {
-	return sdk.Route{}
-}
-
-// QuerierRoute returns the x/incentive module's query routing key.
-func (AppModule) QuerierRoute() string { return incentive.QuerierRoute }
-
-// LegacyQuerierHandler returns a no-op legacy querier.
-func (am AppModule) LegacyQuerierHandler(_ *codec.LegacyAmino) sdk.Querier {
-	return func(sdk.Context, []string, abci.RequestQuery) ([]byte, error) {
-		return nil, fmt.Errorf("legacy querier not supported for the x/%s module", incentive.ModuleName)
-	}
-}
-
 // RegisterServices registers gRPC services.
 func (am AppModule) RegisterServices(cfg module.Configurator) {
 	incentive.RegisterMsgServer(cfg.MsgServer(), keeper.NewMsgServerImpl(am.keeper))
@@ -173,3 +158,9 @@ func (am AppModule) BeginBlock(_ sdk.Context, _ abci.RequestBeginBlock) {}
 func (am AppModule) EndBlock(ctx sdk.Context, _ abci.RequestEndBlock) []abci.ValidatorUpdate {
 	return EndBlocker(ctx, am.keeper)
 }
+
+// DEPRECATED
+
+func (AppModule) LegacyQuerierHandler(*codec.LegacyAmino) sdk.Querier { return nil }
+func (AppModule) QuerierRoute() string                                { return "" }
+func (AppModule) Route() sdk.Route                                    { return sdk.Route{} }

x/incentive/msgs.go

@@ -38,9 +38,9 @@ func (msg MsgClaim) GetSignBytes() []byte {
 }
 
 // Route implements the sdk.Msg interface.
-func (msg MsgClaim) Route() string { return RouterKey }
+func (msg MsgClaim) Route() string { return "" }
 
-// Type implements the sdk.Msg interface.
+// Type implements the LegacyMsg interface.
 func (msg MsgClaim) Type() string { return sdk.MsgTypeURL(&msg) }
 
 func NewMsgBond(account sdk.AccAddress, asset sdk.Coin) *MsgBond {
@@ -64,8 +64,8 @@ func (msg MsgBond) GetSignBytes() []byte {
 	return sdk.MustSortJSON(bz)
 }
 
-// Route implements the sdk.Msg interface.
-func (msg MsgBond) Route() string { return RouterKey }
+// Route implements the LegacyMsg interface.
+func (msg MsgBond) Route() string { return "" }
 
 // Type implements the sdk.Msg interface.
 func (msg MsgBond) Type() string { return sdk.MsgTypeURL(&msg) }
@@ -91,8 +91,8 @@ func (msg MsgBeginUnbonding) GetSignBytes() []byte {
 	return sdk.MustSortJSON(bz)
 }
 
-// Route implements the sdk.Msg interface.
-func (msg MsgBeginUnbonding) Route() string { return RouterKey }
+// Route implements the LegacyMsg interface.
+func (msg MsgBeginUnbonding) Route() string { return "" }
 
 // Type implements the sdk.Msg interface.
 func (msg MsgBeginUnbonding) Type() string { return sdk.MsgTypeURL(&msg) }
@@ -118,8 +118,8 @@ func (msg MsgEmergencyUnbond) GetSignBytes() []byte {
 	return sdk.MustSortJSON(bz)
 }
 
-// Route implements the sdk.Msg interface.
-func (msg MsgEmergencyUnbond) Route() string { return RouterKey }
+// Route implements the LegacyMsg interface.
+func (msg MsgEmergencyUnbond) Route() string { return "" }
 
 // Type implements the sdk.Msg interface.
 func (msg MsgEmergencyUnbond) Type() string { return sdk.MsgTypeURL(&msg) }
@@ -149,8 +149,8 @@ func (msg MsgSponsor) GetSignBytes() []byte {
 	return sdk.MustSortJSON(bz)
 }
 
-// Route implements the sdk.Msg interface.
-func (msg MsgSponsor) Route() string { return RouterKey }
+// Route implements the LegacyMsg interface.
+func (msg MsgSponsor) Route() string { return "" }
 
 // Type implements the sdk.Msg interface.
 func (msg MsgSponsor) Type() string { return sdk.MsgTypeURL(&msg) }
@@ -180,8 +180,8 @@ func (msg MsgGovSetParams) GetSigners() []sdk.AccAddress {
 	return checkers.Signers(msg.Authority)
 }
 
-// Route implements the sdk.Msg interface.
-func (msg MsgGovSetParams) Route() string { return RouterKey }
+// Route implements the LegacyMsg interface.
+func (msg MsgGovSetParams) Route() string { return "" }
 
 // Type implements the sdk.Msg interface.
 func (msg MsgGovSetParams) Type() string { return sdk.MsgTypeURL(&msg) }
@@ -219,8 +219,8 @@ func (msg MsgGovCreatePrograms) GetSigners() []sdk.AccAddress {
 	return checkers.Signers(msg.Authority)
 }
 
-// Route implements the sdk.Msg interface.
-func (msg MsgGovCreatePrograms) Route() string { return RouterKey }
+// Route implements the LegacyMsg interface.
+func (msg MsgGovCreatePrograms) Route() string { return "" }
 
 // Type implements the sdk.Msg interface.
 func (msg MsgGovCreatePrograms) Type() string { return sdk.MsgTypeURL(&msg) }

x/incentive/msgs_test.go

@@ -73,7 +73,6 @@ func TestRoutes(t *testing.T) {
 	}
 
 	for _, msg := range msgs {
-		assert.Equal(t, "incentive", msg.Route())
 		// check for non-empty returns for now
 		assert.Assert(t, len(msg.GetSignBytes()) != 0)
 		// exact match required

x/leverage/module.go

@@ -12,7 +12,6 @@ import (
 	"github.com/cosmos/cosmos-sdk/types/module"
 	simtypes "github.com/cosmos/cosmos-sdk/types/simulation"
 	bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper"
-	"github.com/gorilla/mux"
 	"github.com/grpc-ecosystem/grpc-gateway/runtime"
 	"github.com/spf13/cobra"
 	abci "github.com/tendermint/tendermint/abci/types"
@@ -76,10 +75,6 @@ func (AppModuleBasic) ValidateGenesis(
 	return genState.Validate()
 }
 
-// Deprecated: RegisterRESTRoutes performs a no-op. Querying is delegated to the
-// gRPC service.
-func (AppModuleBasic) RegisterRESTRoutes(_ client.Context, _ *mux.Router) {}
-
 // RegisterGRPCGatewayRoutes registers the gRPC Gateway routes for the x/leverage
 // module.
 func (AppModuleBasic) RegisterGRPCGatewayRoutes(clientCtx client.Context, mux *runtime.ServeMux) {
@@ -125,21 +120,6 @@ func (AppModule) ConsensusVersion() uint64 {
 	return 1
 }
 
-// Deprecated: Route returns the message routing key for the x/leverage module.
-func (am AppModule) Route() sdk.Route {
-	return sdk.Route{}
-}
-
-// QuerierRoute returns the x/leverage module's query routing key.
-func (AppModule) QuerierRoute() string { return types.QuerierRoute }
-
-// LegacyQuerierHandler returns a no-op legacy querier.
-func (am AppModule) LegacyQuerierHandler(*codec.LegacyAmino) sdk.Querier {
-	return func(sdk.Context, []string, abci.RequestQuery) ([]byte, error) {
-		return nil, fmt.Errorf("legacy querier not supported for the x/%s module", types.ModuleName)
-	}
-}
-
 // RegisterServices registers gRPC services.
 func (am AppModule) RegisterServices(cfg module.Configurator) {
 	types.RegisterMsgServer(cfg.MsgServer(), keeper.NewMsgServerImpl(am.keeper))
@@ -188,3 +168,9 @@ func (am AppModule) WeightedOperations(simState module.SimulationState) []simtyp
 func AddModuleInitFlags(startCmd *cobra.Command) {
 	startCmd.Flags().BoolP(types.FlagEnableLiquidatorQuery, "l", false, "enable liquidator query")
 }
+
+// DEPRECATED
+
+func (AppModule) LegacyQuerierHandler(*codec.LegacyAmino) sdk.Querier { return nil }
+func (AppModule) QuerierRoute() string                                { return "" }
+func (AppModule) Route() sdk.Route                                    { return sdk.Route{} }

x/leverage/types/keys.go

@@ -12,12 +12,6 @@ const (
 
 	// StoreKey defines the primary module store key
 	StoreKey = ModuleName
-
-	// RouterKey is the message route
-	RouterKey = ModuleName
-
-	// QuerierRoute defines the module's query routing key
-	QuerierRoute = ModuleName
 )
 
 // KVStore key prefixes

x/leverage/types/proposal.go

@@ -20,7 +20,7 @@ func (msg *MsgGovUpdateRegistry) GetTitle() string { return msg.Title }
 func (msg *MsgGovUpdateRegistry) GetDescription() string { return msg.Description }
 
 // GetDescription returns the routing key of a community pool spend proposal.
-func (msg *MsgGovUpdateRegistry) ProposalRoute() string { return RouterKey }
+func (msg *MsgGovUpdateRegistry) ProposalRoute() string { return ModuleName }
 
 // ProposalType returns the type of a community pool spend proposal.
 func (msg *MsgGovUpdateRegistry) ProposalType() string { return proposalTypeMsgGovUpdateRegistry }

x/oracle/module.go

@@ -12,7 +12,6 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/module"
 	bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper"
-	"github.com/gorilla/mux"
 	"github.com/grpc-ecosystem/grpc-gateway/runtime"
 	"github.com/spf13/cobra"
 	abci "github.com/tendermint/tendermint/abci/types"
@@ -77,10 +76,6 @@ func (AppModuleBasic) ValidateGenesis(
 	return nil
 }
 
-// Deprecated: RegisterRESTRoutes performs a no-op. Querying is delegated to the
-// gRPC service.
-func (AppModuleBasic) RegisterRESTRoutes(client.Context, *mux.Router) {}
-
 // RegisterGRPCGatewayRoutes registers the gRPC Gateway routes for the x/oracle
 // module.
 func (AppModuleBasic) RegisterGRPCGatewayRoutes(clientCtx client.Context, mux *runtime.ServeMux) {
@@ -126,21 +121,6 @@ func (am AppModule) Name() string {
 	return am.AppModuleBasic.Name()
 }
 
-// Deprecated: Route returns the message routing key for the x/oracle module.
-func (am AppModule) Route() sdk.Route {
-	return sdk.Route{}
-}
-
-// QuerierRoute returns the x/oracle module's query routing key.
-func (AppModule) QuerierRoute() string { return types.QuerierRoute }
-
-// LegacyQuerierHandler returns a no-op legacy querier.
-func (am AppModule) LegacyQuerierHandler(*codec.LegacyAmino) sdk.Querier {
-	return func(sdk.Context, []string, abci.RequestQuery) ([]byte, error) {
-		return nil, fmt.Errorf("legacy querier not supported for the x/%s module", types.ModuleName)
-	}
-}
-
 // RegisterServices registers gRPC services.
 func (am AppModule) RegisterServices(cfg module.Configurator) {
 	types.RegisterMsgServer(cfg.MsgServer(), keeper.NewMsgServerImpl(am.keeper))
@@ -213,3 +193,9 @@ func (AppModule) RandomizedParams(*rand.Rand) []simtypes.ParamChange {
 func (am AppModule) RegisterStoreDecoder(sdr sdk.StoreDecoderRegistry) {
 	sdr[types.StoreKey] = simulation.NewDecodeStore(am.cdc)
 }
+
+// DEPRECATED
+
+func (AppModule) LegacyQuerierHandler(*codec.LegacyAmino) sdk.Querier { return nil }
+func (AppModule) QuerierRoute() string                                { return "" }
+func (AppModule) Route() sdk.Route                                    { return sdk.Route{} }

x/oracle/types/keys.go

@@ -14,12 +14,6 @@ const (
 
 	// StoreKey is the string store representation
 	StoreKey = ModuleName
-
-	// RouterKey is the message route for oracle module
-	RouterKey = ModuleName
-
-	// QuerierRoute is the query router key for the oracle module
-	QuerierRoute = ModuleName
 )
 
 // KVStore key prefixes

x/oracle/types/msgs.go

@@ -28,7 +28,7 @@ func NewMsgAggregateExchangeRatePrevote(
 }
 
 // Route implements LegacyMsg interface
-func (msg MsgAggregateExchangeRatePrevote) Route() string { return RouterKey }
+func (msg MsgAggregateExchangeRatePrevote) Route() string { return "" }
 
 // Type implements LegacyMsg interface
 func (msg MsgAggregateExchangeRatePrevote) Type() string { return sdk.MsgTypeURL(&msg) }
@@ -83,7 +83,7 @@ func NewMsgAggregateExchangeRateVote(
 }
 
 // Route implements LegacyMsg interface
-func (msg MsgAggregateExchangeRateVote) Route() string { return RouterKey }
+func (msg MsgAggregateExchangeRateVote) Route() string { return "" }
 
 // Type implements LegacyMsg interface
 func (msg MsgAggregateExchangeRateVote) Type() string { return sdk.MsgTypeURL(&msg) }
@@ -148,7 +148,7 @@ func NewMsgDelegateFeedConsent(operatorAddress sdk.ValAddress, feederAddress sdk
 }
 
 // Route implements LegacyMsg interface
-func (msg MsgDelegateFeedConsent) Route() string { return RouterKey }
+func (msg MsgDelegateFeedConsent) Route() string { return "" }
 
 // Type implements LegacyMsg interface
 func (msg MsgDelegateFeedConsent) Type() string { return sdk.MsgTypeURL(&msg) }

x/ugov/module/module.go

@@ -115,14 +115,6 @@ func (AppModule) ConsensusVersion() uint64 {
 	return 1
 }
 
-// LegacyQuerierHandler implements module.AppModule
-func (AppModule) LegacyQuerierHandler(*codec.LegacyAmino) sdk.Querier {
-	return nil
-}
-
-// QuerierRoute implements module.AppModule
-func (AppModule) QuerierRoute() string { return "" }
-
 // RegisterInvariants implements module.AppModule
 func (AppModule) RegisterInvariants(sdk.InvariantRegistry) {}
 
@@ -132,11 +124,6 @@ func (am AppModule) RegisterServices(cfg module.Configurator) {
 	ugov.RegisterQueryServer(cfg.QueryServer(), keeper.NewQuerier(am.kb))
 }
 
-// Route implements module.AppModule
-func (AppModule) Route() sdk.Route {
-	return sdk.Route{}
-}
-
 // BeginBlock executes all ABCI BeginBlock logic respective to the x/uibc module.
 func (am AppModule) BeginBlock(_ sdk.Context, _ abci.RequestBeginBlock) {}
 
@@ -145,3 +132,9 @@ func (am AppModule) BeginBlock(_ sdk.Context, _ abci.RequestBeginBlock) {}
 func (am AppModule) EndBlock(_ sdk.Context, _ abci.RequestEndBlock) []abci.ValidatorUpdate {
 	return nil
 }
+
+// DEPRECATED
+
+func (AppModule) LegacyQuerierHandler(*codec.LegacyAmino) sdk.Querier { return nil }
+func (AppModule) QuerierRoute() string                                { return "" }
+func (AppModule) Route() sdk.Route                                    { return sdk.Route{} }

x/uibc/module/module.go

@@ -113,14 +113,6 @@ func (AppModule) ConsensusVersion() uint64 {
 	return 1
 }
 
-// LegacyQuerierHandler implements module.AppModule
-func (AppModule) LegacyQuerierHandler(*codec.LegacyAmino) sdk.Querier {
-	return nil
-}
-
-// QuerierRoute implements module.AppModule
-func (AppModule) QuerierRoute() string { return "" }
-
 // RegisterInvariants implements module.AppModule
 func (AppModule) RegisterInvariants(sdk.InvariantRegistry) {}
 
@@ -130,11 +122,6 @@ func (am AppModule) RegisterServices(cfg module.Configurator) {
 	ibctransfer.RegisterQueryServer(cfg.QueryServer(), keeper.NewQuerier(am.kb))
 }
 
-// Route implements module.AppModule
-func (AppModule) Route() sdk.Route {
-	return sdk.Route{}
-}
-
 // BeginBlock executes all ABCI BeginBlock logic respective to the x/uibc module.
 func (am AppModule) BeginBlock(ctx sdk.Context, _ abci.RequestBeginBlock) {
 	BeginBlock(ctx, am.kb.Keeper(&ctx))
@@ -145,3 +132,9 @@ func (am AppModule) BeginBlock(ctx sdk.Context, _ abci.RequestBeginBlock) {
 func (am AppModule) EndBlock(_ sdk.Context, _ abci.RequestEndBlock) []abci.ValidatorUpdate {
 	return EndBlocker()
 }
+
+// DEPRECATED
+
+func (AppModule) LegacyQuerierHandler(*codec.LegacyAmino) sdk.Querier { return nil }
+func (AppModule) QuerierRoute() string                                { return "" }
+func (AppModule) Route() sdk.Route                                    { return sdk.Route{} }