Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

bump go package to v2 #400

Merged
merged 5 commits into from
Sep 16, 2021
Merged

bump go package to v2 #400

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
864815c
bump go package to v2
colin-axner Sep 13, 2021
bddbc18
fix proto file generation
colin-axner Sep 13, 2021
0e80401
fix links
colin-axner Sep 13, 2021
cd50e81
future proof script
colin-axner Sep 13, 2021
62ee8c3
Merge branch 'main' into colin/389-bump-go-package
colin-axner Sep 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
go 1.15

module github.com/cosmos/ibc-go
module github.com/cosmos/ibc-go/v2

replace github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1

Expand Down
2 changes: 1 addition & 1 deletion modules/apps/transfer/client/cli/query.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"github.com/cosmos/cosmos-sdk/client"
"github.com/cosmos/cosmos-sdk/client/flags"
"github.com/cosmos/cosmos-sdk/version"
"github.com/cosmos/ibc-go/modules/apps/transfer/types"
"github.com/cosmos/ibc-go/v2/modules/apps/transfer/types"
)

// GetCmdQueryDenomTrace defines the command to query a a denomination trace from a given hash.
Expand Down
6 changes: 3 additions & 3 deletions modules/apps/transfer/client/cli/tx.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ import (
"github.com/cosmos/cosmos-sdk/client/tx"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/version"
"github.com/cosmos/ibc-go/modules/apps/transfer/types"
clienttypes "github.com/cosmos/ibc-go/modules/core/02-client/types"
channelutils "github.com/cosmos/ibc-go/modules/core/04-channel/client/utils"
"github.com/cosmos/ibc-go/v2/modules/apps/transfer/types"
clienttypes "github.com/cosmos/ibc-go/v2/modules/core/02-client/types"
channelutils "github.com/cosmos/ibc-go/v2/modules/core/04-channel/client/utils"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion modules/apps/transfer/keeper/encoding.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package keeper

import (
"github.com/cosmos/ibc-go/modules/apps/transfer/types"
"github.com/cosmos/ibc-go/v2/modules/apps/transfer/types"
)

// UnmarshalDenomTrace attempts to decode and return an DenomTrace object from
Expand Down
2 changes: 1 addition & 1 deletion modules/apps/transfer/keeper/genesis.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"

sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/ibc-go/modules/apps/transfer/types"
"github.com/cosmos/ibc-go/v2/modules/apps/transfer/types"
)

// InitGenesis initializes the ibc-transfer state and binds to PortID.
Expand Down
2 changes: 1 addition & 1 deletion modules/apps/transfer/keeper/genesis_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package keeper_test
import (
"fmt"

"github.com/cosmos/ibc-go/modules/apps/transfer/types"
"github.com/cosmos/ibc-go/v2/modules/apps/transfer/types"
)

func (suite *KeeperTestSuite) TestGenesis() {
Expand Down
2 changes: 1 addition & 1 deletion modules/apps/transfer/keeper/grpc_query.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
"github.com/cosmos/cosmos-sdk/types/query"
"github.com/cosmos/ibc-go/modules/apps/transfer/types"
"github.com/cosmos/ibc-go/v2/modules/apps/transfer/types"
)

var _ types.QueryServer = Keeper{}
Expand Down
2 changes: 1 addition & 1 deletion modules/apps/transfer/keeper/grpc_query_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/types/query"
"github.com/cosmos/ibc-go/modules/apps/transfer/types"
"github.com/cosmos/ibc-go/v2/modules/apps/transfer/types"
)

func (suite *KeeperTestSuite) TestQueryDenomTrace() {
Expand Down
4 changes: 2 additions & 2 deletions modules/apps/transfer/keeper/keeper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (
capabilitykeeper "github.com/cosmos/cosmos-sdk/x/capability/keeper"
capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types"
paramtypes "github.com/cosmos/cosmos-sdk/x/params/types"
"github.com/cosmos/ibc-go/modules/apps/transfer/types"
host "github.com/cosmos/ibc-go/modules/core/24-host"
"github.com/cosmos/ibc-go/v2/modules/apps/transfer/types"
host "github.com/cosmos/ibc-go/v2/modules/core/24-host"
)

// Keeper defines the IBC fungible transfer keeper
Expand Down
4 changes: 2 additions & 2 deletions modules/apps/transfer/keeper/keeper_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (

"github.com/cosmos/cosmos-sdk/baseapp"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/ibc-go/modules/apps/transfer/types"
ibctesting "github.com/cosmos/ibc-go/testing"
"github.com/cosmos/ibc-go/v2/modules/apps/transfer/types"
ibctesting "github.com/cosmos/ibc-go/v2/testing"
)

type KeeperTestSuite struct {
Expand Down
8 changes: 4 additions & 4 deletions modules/apps/transfer/keeper/mbt_relay_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ import (

sdk "github.com/cosmos/cosmos-sdk/types"
sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
"github.com/cosmos/ibc-go/modules/apps/transfer/types"
clienttypes "github.com/cosmos/ibc-go/modules/core/02-client/types"
channeltypes "github.com/cosmos/ibc-go/modules/core/04-channel/types"
ibctesting "github.com/cosmos/ibc-go/testing"
"github.com/cosmos/ibc-go/v2/modules/apps/transfer/types"
clienttypes "github.com/cosmos/ibc-go/v2/modules/core/02-client/types"
channeltypes "github.com/cosmos/ibc-go/v2/modules/core/04-channel/types"
ibctesting "github.com/cosmos/ibc-go/v2/testing"
)

type TlaBalance struct {
Expand Down
2 changes: 1 addition & 1 deletion modules/apps/transfer/keeper/msg_server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"

sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/ibc-go/modules/apps/transfer/types"
"github.com/cosmos/ibc-go/v2/modules/apps/transfer/types"
)

var _ types.MsgServer = Keeper{}
Expand Down
2 changes: 1 addition & 1 deletion modules/apps/transfer/keeper/params.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package keeper

import (
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/ibc-go/modules/apps/transfer/types"
"github.com/cosmos/ibc-go/v2/modules/apps/transfer/types"
)

// GetSendEnabled retrieves the send enabled boolean from the paramstore
Expand Down
2 changes: 1 addition & 1 deletion modules/apps/transfer/keeper/params_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package keeper_test

import "github.com/cosmos/ibc-go/modules/apps/transfer/types"
import "github.com/cosmos/ibc-go/v2/modules/apps/transfer/types"

func (suite *KeeperTestSuite) TestParams() {
expParams := types.DefaultParams()
Expand Down
10 changes: 5 additions & 5 deletions modules/apps/transfer/keeper/relay.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"

"github.com/cosmos/ibc-go/modules/apps/transfer/types"
clienttypes "github.com/cosmos/ibc-go/modules/core/02-client/types"
channeltypes "github.com/cosmos/ibc-go/modules/core/04-channel/types"
host "github.com/cosmos/ibc-go/modules/core/24-host"
coretypes "github.com/cosmos/ibc-go/modules/core/types"
"github.com/cosmos/ibc-go/v2/modules/apps/transfer/types"
clienttypes "github.com/cosmos/ibc-go/v2/modules/core/02-client/types"
channeltypes "github.com/cosmos/ibc-go/v2/modules/core/04-channel/types"
host "github.com/cosmos/ibc-go/v2/modules/core/24-host"
coretypes "github.com/cosmos/ibc-go/v2/modules/core/types"
)

// SendTransfer handles transfer sending logic. There are 2 possible cases:
Expand Down
12 changes: 6 additions & 6 deletions modules/apps/transfer/keeper/relay_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ package keeper_test
import (
"fmt"

"github.com/cosmos/ibc-go/testing/simapp"
"github.com/cosmos/ibc-go/v2/testing/simapp"

sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/ibc-go/modules/apps/transfer/types"
clienttypes "github.com/cosmos/ibc-go/modules/core/02-client/types"
channeltypes "github.com/cosmos/ibc-go/modules/core/04-channel/types"
host "github.com/cosmos/ibc-go/modules/core/24-host"
ibctesting "github.com/cosmos/ibc-go/testing"
"github.com/cosmos/ibc-go/v2/modules/apps/transfer/types"
clienttypes "github.com/cosmos/ibc-go/v2/modules/core/02-client/types"
channeltypes "github.com/cosmos/ibc-go/v2/modules/core/04-channel/types"
host "github.com/cosmos/ibc-go/v2/modules/core/24-host"
ibctesting "github.com/cosmos/ibc-go/v2/testing"
)

// test sending from chainA to chainB using both coin that orignate on
Expand Down
16 changes: 8 additions & 8 deletions modules/apps/transfer/module.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@ import (
"github.com/spf13/cobra"
abci "github.com/tendermint/tendermint/abci/types"

"github.com/cosmos/ibc-go/modules/apps/transfer/client/cli"
"github.com/cosmos/ibc-go/modules/apps/transfer/keeper"
"github.com/cosmos/ibc-go/modules/apps/transfer/simulation"
"github.com/cosmos/ibc-go/modules/apps/transfer/types"
channeltypes "github.com/cosmos/ibc-go/modules/core/04-channel/types"
porttypes "github.com/cosmos/ibc-go/modules/core/05-port/types"
host "github.com/cosmos/ibc-go/modules/core/24-host"
ibcexported "github.com/cosmos/ibc-go/modules/core/exported"
"github.com/cosmos/ibc-go/v2/modules/apps/transfer/client/cli"
"github.com/cosmos/ibc-go/v2/modules/apps/transfer/keeper"
"github.com/cosmos/ibc-go/v2/modules/apps/transfer/simulation"
"github.com/cosmos/ibc-go/v2/modules/apps/transfer/types"
channeltypes "github.com/cosmos/ibc-go/v2/modules/core/04-channel/types"
porttypes "github.com/cosmos/ibc-go/v2/modules/core/05-port/types"
host "github.com/cosmos/ibc-go/v2/modules/core/24-host"
ibcexported "github.com/cosmos/ibc-go/v2/modules/core/exported"
)

var (
Expand Down
8 changes: 4 additions & 4 deletions modules/apps/transfer/module_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ import (
"math"

capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types"
"github.com/cosmos/ibc-go/modules/apps/transfer/types"
channeltypes "github.com/cosmos/ibc-go/modules/core/04-channel/types"
host "github.com/cosmos/ibc-go/modules/core/24-host"
ibctesting "github.com/cosmos/ibc-go/testing"
"github.com/cosmos/ibc-go/v2/modules/apps/transfer/types"
channeltypes "github.com/cosmos/ibc-go/v2/modules/core/04-channel/types"
host "github.com/cosmos/ibc-go/v2/modules/core/24-host"
ibctesting "github.com/cosmos/ibc-go/v2/testing"
)

func (suite *TransferTestSuite) TestOnChanOpenInit() {
Expand Down
2 changes: 1 addition & 1 deletion modules/apps/transfer/simulation/decoder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"fmt"

"github.com/cosmos/cosmos-sdk/types/kv"
"github.com/cosmos/ibc-go/modules/apps/transfer/types"
"github.com/cosmos/ibc-go/v2/modules/apps/transfer/types"
)

// TransferUnmarshaler defines the expected encoding store functions.
Expand Down
6 changes: 3 additions & 3 deletions modules/apps/transfer/simulation/decoder_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import (
"github.com/stretchr/testify/require"

"github.com/cosmos/cosmos-sdk/types/kv"
"github.com/cosmos/ibc-go/modules/apps/transfer/simulation"
"github.com/cosmos/ibc-go/modules/apps/transfer/types"
"github.com/cosmos/ibc-go/testing/simapp"
"github.com/cosmos/ibc-go/v2/modules/apps/transfer/simulation"
"github.com/cosmos/ibc-go/v2/modules/apps/transfer/types"
"github.com/cosmos/ibc-go/v2/testing/simapp"
)

func TestDecodeStore(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion modules/apps/transfer/simulation/genesis.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (

"github.com/cosmos/cosmos-sdk/types/module"
simtypes "github.com/cosmos/cosmos-sdk/types/simulation"
"github.com/cosmos/ibc-go/modules/apps/transfer/types"
"github.com/cosmos/ibc-go/v2/modules/apps/transfer/types"
)

// Simulation parameter constants
Expand Down
4 changes: 2 additions & 2 deletions modules/apps/transfer/simulation/genesis_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (
codectypes "github.com/cosmos/cosmos-sdk/codec/types"
"github.com/cosmos/cosmos-sdk/types/module"
simtypes "github.com/cosmos/cosmos-sdk/types/simulation"
"github.com/cosmos/ibc-go/modules/apps/transfer/simulation"
"github.com/cosmos/ibc-go/modules/apps/transfer/types"
"github.com/cosmos/ibc-go/v2/modules/apps/transfer/simulation"
"github.com/cosmos/ibc-go/v2/modules/apps/transfer/types"
)

// TestRandomizedGenState tests the normal scenario of applying RandomizedGenState.
Expand Down
2 changes: 1 addition & 1 deletion modules/apps/transfer/simulation/params.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"github.com/cosmos/cosmos-sdk/x/simulation"

simtypes "github.com/cosmos/cosmos-sdk/types/simulation"
"github.com/cosmos/ibc-go/modules/apps/transfer/types"
"github.com/cosmos/ibc-go/v2/modules/apps/transfer/types"
)

// ParamChanges defines the parameters that can be modified by param change proposals
Expand Down
2 changes: 1 addition & 1 deletion modules/apps/transfer/simulation/params_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (

"github.com/stretchr/testify/require"

"github.com/cosmos/ibc-go/modules/apps/transfer/simulation"
"github.com/cosmos/ibc-go/v2/modules/apps/transfer/simulation"
)

func TestParamChanges(t *testing.T) {
Expand Down
8 changes: 4 additions & 4 deletions modules/apps/transfer/transfer_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ import (
"github.com/stretchr/testify/suite"

sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/ibc-go/modules/apps/transfer/types"
clienttypes "github.com/cosmos/ibc-go/modules/core/02-client/types"
channeltypes "github.com/cosmos/ibc-go/modules/core/04-channel/types"
ibctesting "github.com/cosmos/ibc-go/testing"
"github.com/cosmos/ibc-go/v2/modules/apps/transfer/types"
clienttypes "github.com/cosmos/ibc-go/v2/modules/core/02-client/types"
channeltypes "github.com/cosmos/ibc-go/v2/modules/core/04-channel/types"
ibctesting "github.com/cosmos/ibc-go/v2/testing"
)

type TransferTestSuite struct {
Expand Down
6 changes: 3 additions & 3 deletions modules/apps/transfer/types/expected_keepers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/x/auth/types"
capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types"
connectiontypes "github.com/cosmos/ibc-go/modules/core/03-connection/types"
channeltypes "github.com/cosmos/ibc-go/modules/core/04-channel/types"
ibcexported "github.com/cosmos/ibc-go/modules/core/exported"
connectiontypes "github.com/cosmos/ibc-go/v2/modules/core/03-connection/types"
channeltypes "github.com/cosmos/ibc-go/v2/modules/core/04-channel/types"
ibcexported "github.com/cosmos/ibc-go/v2/modules/core/exported"
)

// AccountKeeper defines the contract required for account APIs.
Expand Down
2 changes: 1 addition & 1 deletion modules/apps/transfer/types/genesis.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package types

import (
host "github.com/cosmos/ibc-go/modules/core/24-host"
host "github.com/cosmos/ibc-go/v2/modules/core/24-host"
)

// NewGenesisState creates a new ibc-transfer GenesisState instance.
Expand Down
12 changes: 6 additions & 6 deletions modules/apps/transfer/types/genesis.pb.go
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion modules/apps/transfer/types/genesis_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

"github.com/stretchr/testify/require"

"github.com/cosmos/ibc-go/modules/apps/transfer/types"
"github.com/cosmos/ibc-go/v2/modules/apps/transfer/types"
)

func TestValidateGenesis(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion modules/apps/transfer/types/keys_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

"github.com/stretchr/testify/require"

"github.com/cosmos/ibc-go/modules/apps/transfer/types"
"github.com/cosmos/ibc-go/v2/modules/apps/transfer/types"
)

// Test that there is domain separation between the port id and the channel id otherwise an
Expand Down
4 changes: 2 additions & 2 deletions modules/apps/transfer/types/msgs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (

sdk "github.com/cosmos/cosmos-sdk/types"
sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
clienttypes "github.com/cosmos/ibc-go/modules/core/02-client/types"
host "github.com/cosmos/ibc-go/modules/core/24-host"
clienttypes "github.com/cosmos/ibc-go/v2/modules/core/02-client/types"
host "github.com/cosmos/ibc-go/v2/modules/core/24-host"
)

// msg types
Expand Down
2 changes: 1 addition & 1 deletion modules/apps/transfer/types/msgs_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (

"github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1"
sdk "github.com/cosmos/cosmos-sdk/types"
clienttypes "github.com/cosmos/ibc-go/modules/core/02-client/types"
clienttypes "github.com/cosmos/ibc-go/v2/modules/core/02-client/types"
)

// define constants used for testing
Expand Down
Loading