Skip to content

Commit

Permalink
move to v4 namespace
Browse files Browse the repository at this point in the history
  • Loading branch information
@Reecepbcups
Reecepbcups committed Oct 11, 2023
1 parent f23aa3b commit d8a92a2
Show file tree
Hide file tree
Showing 21 changed files with 28 additions and 206 deletions.
9 changes: 0 additions & 9 deletions middleware/packet-forward-middleware/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,22 +143,13 @@ cosmovisor:

mocks: $(MOCKS_DIR)
go install go.uber.org/mock/[email protected]
<<<<<<< HEAD
mockgen -package=mock -destination=./test/mock/transfer_keeper.go $(GOMOD)/router/types TransferKeeper
mockgen -package=mock -destination=./test/mock/channel_keeper.go $(GOMOD)/router/types ChannelKeeper
mockgen -package=mock -destination=./test/mock/distribution_keeper.go $(GOMOD)/router/types DistributionKeeper
mockgen -package=mock -destination=./test/mock/bank_keeper.go $(GOMOD)/router/types BankKeeper
mockgen -package=mock -destination=./test/mock/channel_keeper.go $(GOMOD)/router/types ChannelKeeper
mockgen -package=mock -destination=./test/mock/ics4_wrapper.go github.com/cosmos/ibc-go/v4/modules/core/05-port/types ICS4Wrapper
mockgen -package=mock -destination=./test/mock/ibc_module.go github.com/cosmos/ibc-go/v4/modules/core/05-port/types IBCModule
=======
mockgen -package=mock -destination=./test/mock/transfer_keeper.go $(GOMOD)/packetforward/types TransferKeeper
mockgen -package=mock -destination=./test/mock/distribution_keeper.go $(GOMOD)/packetforward/types DistributionKeeper
mockgen -package=mock -destination=./test/mock/bank_keeper.go $(GOMOD)/packetforward/types BankKeeper
mockgen -package=mock -destination=./test/mock/channel_keeper.go $(GOMOD)/packetforward/types ChannelKeeper
mockgen -package=mock -destination=./test/mock/ics4_wrapper.go github.com/cosmos/ibc-go/v7/modules/core/05-port/types ICS4Wrapper
mockgen -package=mock -destination=./test/mock/ibc_module.go github.com/cosmos/ibc-go/v7/modules/core/05-port/types IBCModule
>>>>>>> 47f2ae0 (rename: `router` -> `packetforward` (#118))

.PHONY: mocks

Expand Down
6 changes: 1 addition & 5 deletions middleware/packet-forward-middleware/packetforward/client/cli/cli.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,7 @@ package cli
import (
"fmt"

<<<<<<< HEAD:middleware/packet-forward-middleware/router/client/cli/cli.go
"github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v4/router/types"
=======
"github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/types"
>>>>>>> 47f2ae0 (rename: `router` -> `packetforward` (#118)):middleware/packet-forward-middleware/packetforward/client/cli/cli.go
"github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v4/packetforward/types"
"github.com/spf13/cobra"

"github.com/cosmos/cosmos-sdk/client"
Expand Down
11 changes: 2 additions & 9 deletions middleware/packet-forward-middleware/packetforward/ibc_middleware.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,8 @@ import (
"time"

"github.com/armon/go-metrics"
<<<<<<< HEAD:middleware/packet-forward-middleware/router/ibc_middleware.go
"github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v4/router/keeper"
"github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v4/router/types"
=======
"github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/keeper"
"github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/types"

errorsmod "cosmossdk.io/errors"
>>>>>>> 47f2ae0 (rename: `router` -> `packetforward` (#118)):middleware/packet-forward-middleware/packetforward/ibc_middleware.go
"github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v4/packetforward/keeper"
"github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v4/packetforward/types"

sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/types/address"
Expand Down
6 changes: 1 addition & 5 deletions middleware/packet-forward-middleware/packetforward/keeper/genesis.go
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
package keeper

import (
<<<<<<< HEAD:middleware/packet-forward-middleware/router/keeper/genesis.go
"github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v4/router/types"
=======
"github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/types"
>>>>>>> 47f2ae0 (rename: `router` -> `packetforward` (#118)):middleware/packet-forward-middleware/packetforward/keeper/genesis.go
"github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v4/packetforward/types"

sdk "github.com/cosmos/cosmos-sdk/types"
)
Expand Down
6 changes: 1 addition & 5 deletions middleware/packet-forward-middleware/packetforward/keeper/grpc_query.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,7 @@ package keeper
import (
"context"

<<<<<<< HEAD:middleware/packet-forward-middleware/router/keeper/grpc_query.go
"github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v4/router/types"
=======
"github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/types"
>>>>>>> 47f2ae0 (rename: `router` -> `packetforward` (#118)):middleware/packet-forward-middleware/packetforward/keeper/grpc_query.go
"github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v4/packetforward/types"

sdk "github.com/cosmos/cosmos-sdk/types"
)
Expand Down
8 changes: 1 addition & 7 deletions middleware/packet-forward-middleware/packetforward/keeper/keeper.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,8 @@ import (
"time"

"github.com/armon/go-metrics"
<<<<<<< HEAD:middleware/packet-forward-middleware/router/keeper/keeper.go
"github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v4/router/types"
"github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v4/packetforward/types"
"github.com/tendermint/tendermint/libs/log"
=======
"github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/types"

errorsmod "cosmossdk.io/errors"
>>>>>>> 47f2ae0 (rename: `router` -> `packetforward` (#118)):middleware/packet-forward-middleware/packetforward/keeper/keeper.go

"github.com/cosmos/cosmos-sdk/codec"
storetypes "github.com/cosmos/cosmos-sdk/store/types"
Expand Down
6 changes: 1 addition & 5 deletions middleware/packet-forward-middleware/packetforward/keeper/params.go
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
package keeper

import (
<<<<<<< HEAD:middleware/packet-forward-middleware/router/keeper/params.go
"github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v4/router/types"
=======
"github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/types"
>>>>>>> 47f2ae0 (rename: `router` -> `packetforward` (#118)):middleware/packet-forward-middleware/packetforward/keeper/params.go
"github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v4/packetforward/types"

sdk "github.com/cosmos/cosmos-sdk/types"
)
Expand Down
12 changes: 3 additions & 9 deletions middleware/packet-forward-middleware/packetforward/module.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,9 @@ import (
"fmt"
"math/rand"

<<<<<<< HEAD:middleware/packet-forward-middleware/router/module.go
"github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v4/router/client/cli"
"github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v4/router/keeper"
"github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v4/router/types"
=======
"github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/client/cli"
"github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/keeper"
"github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/types"
>>>>>>> 47f2ae0 (rename: `router` -> `packetforward` (#118)):middleware/packet-forward-middleware/packetforward/module.go
"github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v4/packetforward/client/cli"
"github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v4/packetforward/keeper"
"github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v4/packetforward/types"
"github.com/gorilla/mux"
"github.com/grpc-ecosystem/grpc-gateway/runtime"
"github.com/spf13/cobra"
Expand Down
10 changes: 2 additions & 8 deletions middleware/packet-forward-middleware/packetforward/module_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,9 @@ import (
"fmt"
"testing"

<<<<<<< HEAD:middleware/packet-forward-middleware/router/module_test.go
"github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v4/router/keeper"
"github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v4/router/types"
"github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v4/packetforward/keeper"
"github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v4/packetforward/types"
"github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v4/test"
=======
"github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/keeper"
"github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/types"
"github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/test"
>>>>>>> 47f2ae0 (rename: `router` -> `packetforward` (#118)):middleware/packet-forward-middleware/packetforward/module_test.go
"github.com/iancoleman/orderedmap"
"github.com/stretchr/testify/require"
"go.uber.org/mock/gomock"
Expand Down
6 changes: 1 addition & 5 deletions middleware/packet-forward-middleware/packetforward/types/forward_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,7 @@ import (
"encoding/json"
"testing"

<<<<<<< HEAD:middleware/packet-forward-middleware/router/types/forward_test.go
"github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v4/router/types"
=======
"github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/types"
>>>>>>> 47f2ae0 (rename: `router` -> `packetforward` (#118)):middleware/packet-forward-middleware/packetforward/types/forward_test.go
"github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v4/packetforward/types"
"github.com/stretchr/testify/require"
)

Expand Down
49 changes: 3 additions & 46 deletions middleware/packet-forward-middleware/packetforward/types/genesis.pb.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

29 changes: 2 additions & 27 deletions middleware/packet-forward-middleware/packetforward/types/query.pb.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 1 addition & 5 deletions middleware/packet-forward-middleware/packetforward/types/query.pb.gw.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 1 addition & 11 deletions middleware/packet-forward-middleware/proto/packetforward/v1/genesis.proto
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,8 @@
syntax = "proto3";
<<<<<<< HEAD:middleware/packet-forward-middleware/proto/router/v1/genesis.proto

package router.v1;
=======
package packetforward.v1;
>>>>>>> 47f2ae0 (rename: `router` -> `packetforward` (#118)):middleware/packet-forward-middleware/proto/packetforward/v1/genesis.proto

option go_package = "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v4/router/types";

<<<<<<< HEAD:middleware/packet-forward-middleware/proto/router/v1/genesis.proto
import "gogoproto/gogo.proto";
=======
option go_package = "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/types";
>>>>>>> 47f2ae0 (rename: `router` -> `packetforward` (#118)):middleware/packet-forward-middleware/proto/packetforward/v1/genesis.proto
option go_package = "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v4/packetforward/types";

// GenesisState defines the packetforward genesis state
message GenesisState {
Expand Down
Loading

0 comments on commit d8a92a2

Please sign in to comment.