Skip to content
This repository has been archived by the owner on Feb 23, 2024. It is now read-only.

Commit

Permalink
Merge PR #12: Remove NegotiateAppVersion as it's no longer used in …
Browse files Browse the repository at this point in the history
…ibc-go v3.x
  • Loading branch information
jtieri authored Mar 1, 2022
1 parent 9f74941 commit 7d93620
Showing 1 changed file with 5 additions and 17 deletions.
22 changes: 5 additions & 17 deletions router/module.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,17 @@ import (
"github.com/cosmos/cosmos-sdk/types/module"
simtypes "github.com/cosmos/cosmos-sdk/types/simulation"
capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types"
"github.com/gorilla/mux"
"github.com/grpc-ecosystem/grpc-gateway/runtime"
"github.com/spf13/cobra"
abci "github.com/tendermint/tendermint/abci/types"
transfertypes "github.com/cosmos/ibc-go/v3/modules/apps/transfer/types"
channeltypes "github.com/cosmos/ibc-go/v3/modules/core/04-channel/types"
porttypes "github.com/cosmos/ibc-go/v3/modules/core/05-port/types"
ibcexported "github.com/cosmos/ibc-go/v3/modules/core/exported"
"github.com/gorilla/mux"
"github.com/grpc-ecosystem/grpc-gateway/runtime"
"github.com/spf13/cobra"
"github.com/strangelove-ventures/packet-forward-middleware/router/client/cli"
"github.com/strangelove-ventures/packet-forward-middleware/router/keeper"
"github.com/strangelove-ventures/packet-forward-middleware/router/types"
abci "github.com/tendermint/tendermint/abci/types"
)

var (
Expand Down Expand Up @@ -271,22 +271,10 @@ func (am AppModule) OnAcknowledgementPacket(ctx sdk.Context, packet channeltypes
}

// OnTimeoutPacket implements the IBCModule interface
func (am AppModule) OnTimeoutPacket(ctx sdk.Context, packet channeltypes.Packet, relayer sdk.AccAddress) error {
func (am AppModule) OnTimeoutPacket(ctx sdk.Context, packet channeltypes.Packet, relayer sdk.AccAddress) error {
return am.app.OnTimeoutPacket(ctx, packet, relayer)
}

// NegotiateAppVersion implements the IBCModue interface
func (am AppModule) NegotiateAppVersion(
ctx sdk.Context,
order channeltypes.Order,
connectionID string,
portID string,
counterparty channeltypes.Counterparty,
proposedVersion string,
) (string, error) {
return am.app.NegotiateAppVersion(ctx, order, connectionID, portID, counterparty, proposedVersion)
}

// For now this assumes one hop, should be better parsing
func ParseIncomingTransferField(receiverData string) (thischainaddr sdk.AccAddress, finaldestination, port, channel string, err error) {
sep1 := strings.Split(receiverData, ":")
Expand Down

0 comments on commit 7d93620

Please sign in to comment.