certusone
/
cosmos-sdk
mirror of https://github.com/certusone/cosmos-sdk.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

remove alias.go from 05-port (#6575)

This commit is contained in:
colin axner 2020-07-02 14:44:08 +02:00 committed by GitHub
parent 8f96ec0585
commit 8ed09e5098
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 19 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
simapp/app.go
View File

@ -50,7 +50,7 @@ import (
ibctransfertypes "github.com/cosmos/cosmos-sdk/x/ibc-transfer/types"
ibcclient "github.com/cosmos/cosmos-sdk/x/ibc/02-client"
ibcclienttypes "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types"
port "github.com/cosmos/cosmos-sdk/x/ibc/05-port"
porttypes "github.com/cosmos/cosmos-sdk/x/ibc/05-port/types"
ibchost "github.com/cosmos/cosmos-sdk/x/ibc/24-host"
ibckeeper "github.com/cosmos/cosmos-sdk/x/ibc/keeper"
"github.com/cosmos/cosmos-sdk/x/mint"
@ -267,7 +267,7 @@ func NewSimApp(
transferModule := transfer.NewAppModule(app.TransferKeeper)
// Create static IBC router, add transfer route, then set and seal it
ibcRouter := port.NewRouter()
ibcRouter := porttypes.NewRouter()
ibcRouter.AddRoute(ibctransfertypes.ModuleName, transferModule)
app.IBCKeeper.SetRouter(ibcRouter)

3
x/ibc-transfer/module.go
View File

@ -26,14 +26,13 @@ import (
"github.com/cosmos/cosmos-sdk/x/ibc-transfer/simulation"
"github.com/cosmos/cosmos-sdk/x/ibc-transfer/types"
channeltypes "github.com/cosmos/cosmos-sdk/x/ibc/04-channel/types"
port "github.com/cosmos/cosmos-sdk/x/ibc/05-port"
porttypes "github.com/cosmos/cosmos-sdk/x/ibc/05-port/types"
host "github.com/cosmos/cosmos-sdk/x/ibc/24-host"
)
var (
_ module.AppModule = AppModule{}
_ port.IBCModule = AppModule{}
_ porttypes.IBCModule = AppModule{}
_ module.AppModuleBasic = AppModuleBasic{}
)

34
x/ibc/05-port/alias.go
View File

@ -1,34 +0,0 @@
package port
// autogenerated code using github.com/rigelrozanski/multitool
// aliases generated for the following subdirectories:
// ALIASGEN: github.com/cosmos/cosmos-sdk/x/ibc/05-port/keeper
// ALIASGEN: github.com/cosmos/cosmos-sdk/x/ibc/05-port/types
import (
"github.com/cosmos/cosmos-sdk/x/ibc/05-port/keeper"
"github.com/cosmos/cosmos-sdk/x/ibc/05-port/types"
)
const (
SubModuleName = types.SubModuleName
StoreKey = types.StoreKey
RouterKey = types.RouterKey
QuerierRoute = types.QuerierRoute
)
var (
// functions aliases
NewKeeper = keeper.NewKeeper
NewRouter = types.NewRouter
ErrPortExists = types.ErrPortExists
ErrPortNotFound = types.ErrPortNotFound
ErrInvalidPort = types.ErrInvalidPort
ErrInvalidRoute = types.ErrInvalidRoute
)
type (
Keeper = keeper.Keeper
Router = types.Router
IBCModule = types.IBCModule
)

20
x/ibc/handler.go
View File

@ -9,7 +9,7 @@ import (
connectiontypes "github.com/cosmos/cosmos-sdk/x/ibc/03-connection/types"
channel "github.com/cosmos/cosmos-sdk/x/ibc/04-channel"
channeltypes "github.com/cosmos/cosmos-sdk/x/ibc/04-channel/types"
port "github.com/cosmos/cosmos-sdk/x/ibc/05-port"
porttypes "github.com/cosmos/cosmos-sdk/x/ibc/05-port/types"
"github.com/cosmos/cosmos-sdk/x/ibc/keeper"
)
@ -54,7 +54,7 @@ func NewHandler(k keeper.Keeper) sdk.Handler {
// Retrieve callbacks from router
cbs, ok := k.Router.GetRoute(module)
if !ok {
return nil, sdkerrors.Wrapf(port.ErrInvalidRoute, "route not found to module: %s", module)
return nil, sdkerrors.Wrapf(porttypes.ErrInvalidRoute, "route not found to module: %s", module)
}
err = cbs.OnChanOpenInit(ctx, msg.Channel.Ordering, msg.Channel.ConnectionHops, msg.PortID, msg.ChannelID, cap, msg.Channel.Counterparty, msg.Channel.Version)
if err != nil {
@ -76,7 +76,7 @@ func NewHandler(k keeper.Keeper) sdk.Handler {
// Retrieve callbacks from router
cbs, ok := k.Router.GetRoute(module)
if !ok {
return nil, sdkerrors.Wrapf(port.ErrInvalidRoute, "route not found to module: %s", module)
return nil, sdkerrors.Wrapf(porttypes.ErrInvalidRoute, "route not found to module: %s", module)
}
err = cbs.OnChanOpenTry(ctx, msg.Channel.Ordering, msg.Channel.ConnectionHops, msg.PortID, msg.ChannelID, cap, msg.Channel.Counterparty, msg.Channel.Version, msg.CounterpartyVersion)
if err != nil {
@ -94,7 +94,7 @@ func NewHandler(k keeper.Keeper) sdk.Handler {
// Retrieve callbacks from router
cbs, ok := k.Router.GetRoute(module)
if !ok {
return nil, sdkerrors.Wrapf(port.ErrInvalidRoute, "route not found to module: %s", module)
return nil, sdkerrors.Wrapf(porttypes.ErrInvalidRoute, "route not found to module: %s", module)
}
err = cbs.OnChanOpenAck(ctx, msg.PortID, msg.ChannelID, msg.CounterpartyVersion)
@ -112,7 +112,7 @@ func NewHandler(k keeper.Keeper) sdk.Handler {
// Retrieve callbacks from router
cbs, ok := k.Router.GetRoute(module)
if !ok {
return nil, sdkerrors.Wrapf(port.ErrInvalidRoute, "route not found to module: %s", module)
return nil, sdkerrors.Wrapf(porttypes.ErrInvalidRoute, "route not found to module: %s", module)
}
err = cbs.OnChanOpenConfirm(ctx, msg.PortID, msg.ChannelID)
@ -130,7 +130,7 @@ func NewHandler(k keeper.Keeper) sdk.Handler {
// Retrieve callbacks from router
cbs, ok := k.Router.GetRoute(module)
if !ok {
return nil, sdkerrors.Wrapf(port.ErrInvalidRoute, "route not found to module: %s", module)
return nil, sdkerrors.Wrapf(porttypes.ErrInvalidRoute, "route not found to module: %s", module)
}
err = cbs.OnChanCloseInit(ctx, msg.PortID, msg.ChannelID)
@ -148,7 +148,7 @@ func NewHandler(k keeper.Keeper) sdk.Handler {
// Retrieve callbacks from router
cbs, ok := k.Router.GetRoute(module)
if !ok {
return nil, sdkerrors.Wrapf(port.ErrInvalidRoute, "route not found to module: %s", module)
return nil, sdkerrors.Wrapf(porttypes.ErrInvalidRoute, "route not found to module: %s", module)
}
err = cbs.OnChanCloseConfirm(ctx, msg.PortID, msg.ChannelID)
@ -168,7 +168,7 @@ func NewHandler(k keeper.Keeper) sdk.Handler {
// Retrieve callbacks from router
cbs, ok := k.Router.GetRoute(module)
if !ok {
return nil, sdkerrors.Wrapf(port.ErrInvalidRoute, "route not found to module: %s", module)
return nil, sdkerrors.Wrapf(porttypes.ErrInvalidRoute, "route not found to module: %s", module)
}
// Perform application logic callback
@ -194,7 +194,7 @@ func NewHandler(k keeper.Keeper) sdk.Handler {
// Retrieve callbacks from router
cbs, ok := k.Router.GetRoute(module)
if !ok {
return nil, sdkerrors.Wrapf(port.ErrInvalidRoute, "route not found to module: %s", module)
return nil, sdkerrors.Wrapf(porttypes.ErrInvalidRoute, "route not found to module: %s", module)
}
// Perform application logic callback
@ -220,7 +220,7 @@ func NewHandler(k keeper.Keeper) sdk.Handler {
// Retrieve callbacks from router
cbs, ok := k.Router.GetRoute(module)
if !ok {
return nil, sdkerrors.Wrapf(port.ErrInvalidRoute, "route not found to module: %s", module)
return nil, sdkerrors.Wrapf(porttypes.ErrInvalidRoute, "route not found to module: %s", module)
}
// Perform application logic callback

11
x/ibc/keeper/keeper.go
View File

@ -8,7 +8,8 @@ import (
clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types"
connectionkeeper "github.com/cosmos/cosmos-sdk/x/ibc/03-connection/keeper"
channelkeeper "github.com/cosmos/cosmos-sdk/x/ibc/04-channel/keeper"
port "github.com/cosmos/cosmos-sdk/x/ibc/05-port"
portkeeper "github.com/cosmos/cosmos-sdk/x/ibc/05-port/keeper"
porttypes "github.com/cosmos/cosmos-sdk/x/ibc/05-port/types"
)
// Keeper defines each ICS keeper for IBC
@ -19,8 +20,8 @@ type Keeper struct {
ClientKeeper clientkeeper.Keeper
ConnectionKeeper connectionkeeper.Keeper
ChannelKeeper channelkeeper.Keeper
PortKeeper port.Keeper
Router *port.Router
PortKeeper portkeeper.Keeper
Router *porttypes.Router
}
// NewKeeper creates a new ibc Keeper
@ -29,7 +30,7 @@ func NewKeeper(
) *Keeper {
clientKeeper := clientkeeper.NewKeeper(aminoCdc, key, stakingKeeper)
connectionKeeper := connectionkeeper.NewKeeper(aminoCdc, cdc, key, clientKeeper)
portKeeper := port.NewKeeper(scopedKeeper)
portKeeper := portkeeper.NewKeeper(scopedKeeper)
channelKeeper := channelkeeper.NewKeeper(cdc, key, clientKeeper, connectionKeeper, portKeeper, scopedKeeper)
return &Keeper{
@ -49,7 +50,7 @@ func (k Keeper) Codecs() (codec.Marshaler, *codec.Codec) {
// SetRouter sets the Router in IBC Keeper and seals it. The method panics if
// there is an existing router that's already sealed.
func (k *Keeper) SetRouter(rtr *port.Router) {
func (k *Keeper) SetRouter(rtr *porttypes.Router) {
if k.Router != nil && k.Router.Sealed() {
panic("cannot reset a sealed router")
}