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

deps: upgrade to ibc-go/v7 and bump ibctest go mod #372

Merged
merged 2 commits into from
Jan 24, 2023
Merged

deps: upgrade to ibc-go/v7 and bump ibctest go mod #372

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6f3e97e
bumping ibc-go to v7 branch
damiannolan Jan 20, 2023
212edfe
bumping ibctest go mod to v7
damiannolan Jan 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ help: ## Print this help message

.PHONY: ibctest
ibctest: gen ## Build ibctest binary into ./bin
go test -ldflags "-X github.com/strangelove-ventures/ibctest/v6/internal/version.GitSha=$(shell git describe --always --dirty)" -c -o ./bin/ibctest ./cmd/ibctest
go test -ldflags "-X github.com/strangelove-ventures/ibctest/v7/internal/version.GitSha=$(shell git describe --always --dirty)" -c -o ./bin/ibctest ./cmd/ibctest

.PHONY: test
test: ## Run unit tests
Expand Down
4 changes: 2 additions & 2 deletions chain/cosmos/broadcaster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ import (
"github.com/cosmos/cosmos-sdk/types/tx/signing"
authTx "github.com/cosmos/cosmos-sdk/x/auth/tx"
authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
"github.com/strangelove-ventures/ibctest/v6/internal/dockerutil"
"github.com/strangelove-ventures/ibctest/v6/testutil"
"github.com/strangelove-ventures/ibctest/v7/internal/dockerutil"
"github.com/strangelove-ventures/ibctest/v7/testutil"
)

type ClientContextOpt func(clientContext client.Context) client.Context
Expand Down
8 changes: 4 additions & 4 deletions chain/cosmos/chain_node.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ import (
dockerclient "github.com/docker/docker/client"
"github.com/docker/docker/errdefs"
"github.com/docker/go-connections/nat"
"github.com/strangelove-ventures/ibctest/v6/ibc"
"github.com/strangelove-ventures/ibctest/v6/internal/blockdb"
"github.com/strangelove-ventures/ibctest/v6/internal/dockerutil"
"github.com/strangelove-ventures/ibctest/v6/testutil"
"github.com/strangelove-ventures/ibctest/v7/ibc"
"github.com/strangelove-ventures/ibctest/v7/internal/blockdb"
"github.com/strangelove-ventures/ibctest/v7/internal/dockerutil"
"github.com/strangelove-ventures/ibctest/v7/testutil"
tmjson "github.com/tendermint/tendermint/libs/json"
"github.com/tendermint/tendermint/p2p"
rpcclient "github.com/tendermint/tendermint/rpc/client"
Expand Down
6 changes: 3 additions & 3 deletions chain/cosmos/codec.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ import (
"github.com/cosmos/cosmos-sdk/x/upgrade"
upgradeclient "github.com/cosmos/cosmos-sdk/x/upgrade/client"

transfer "github.com/cosmos/ibc-go/v6/modules/apps/transfer"
ibccore "github.com/cosmos/ibc-go/v6/modules/core"
ibctm "github.com/cosmos/ibc-go/v6/modules/light-clients/07-tendermint"
transfer "github.com/cosmos/ibc-go/v7/modules/apps/transfer"
ibccore "github.com/cosmos/ibc-go/v7/modules/core"
ibctm "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint"
)

func DefaultEncoding() testutil.TestEncodingConfig {
Expand Down
12 changes: 6 additions & 6 deletions chain/cosmos/cosmos_chain.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@ import (
"github.com/cosmos/cosmos-sdk/types"
authTx "github.com/cosmos/cosmos-sdk/x/auth/tx"
bankTypes "github.com/cosmos/cosmos-sdk/x/bank/types"
chanTypes "github.com/cosmos/ibc-go/v6/modules/core/04-channel/types"
chanTypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types"
dockertypes "github.com/docker/docker/api/types"
volumetypes "github.com/docker/docker/api/types/volume"
"github.com/docker/docker/client"
"github.com/strangelove-ventures/ibctest/v6/chain/internal/tendermint"
"github.com/strangelove-ventures/ibctest/v6/ibc"
"github.com/strangelove-ventures/ibctest/v6/internal/blockdb"
"github.com/strangelove-ventures/ibctest/v6/internal/dockerutil"
"github.com/strangelove-ventures/ibctest/v6/testutil"
"github.com/strangelove-ventures/ibctest/v7/chain/internal/tendermint"
"github.com/strangelove-ventures/ibctest/v7/ibc"
"github.com/strangelove-ventures/ibctest/v7/internal/blockdb"
"github.com/strangelove-ventures/ibctest/v7/internal/dockerutil"
"github.com/strangelove-ventures/ibctest/v7/testutil"
"go.uber.org/zap"
"golang.org/x/sync/errgroup"
"google.golang.org/grpc"
Expand Down
2 changes: 1 addition & 1 deletion chain/cosmos/node_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"testing"

stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
"github.com/strangelove-ventures/ibctest/v6/chain/cosmos"
"github.com/strangelove-ventures/ibctest/v7/chain/cosmos"
"github.com/stretchr/testify/require"
)

Expand Down
2 changes: 1 addition & 1 deletion chain/cosmos/osmosis.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"path/filepath"
"strings"

"github.com/strangelove-ventures/ibctest/v6/internal/dockerutil"
"github.com/strangelove-ventures/ibctest/v7/internal/dockerutil"
)

// OsmosisPoolParams defines parameters for creating an osmosis gamm liquidity pool
Expand Down
4 changes: 2 additions & 2 deletions chain/cosmos/poll.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"fmt"

codectypes "github.com/cosmos/cosmos-sdk/codec/types"
"github.com/strangelove-ventures/ibctest/v6/ibc"
"github.com/strangelove-ventures/ibctest/v6/testutil"
"github.com/strangelove-ventures/ibctest/v7/ibc"
"github.com/strangelove-ventures/ibctest/v7/testutil"
)

// PollForProposalStatus attempts to find a proposal with matching ID and status.
Expand Down
2 changes: 1 addition & 1 deletion chain/cosmos/wallet.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package cosmos

import (
"github.com/cosmos/cosmos-sdk/types"
"github.com/strangelove-ventures/ibctest/v6/ibc"
"github.com/strangelove-ventures/ibctest/v7/ibc"
)

var _ ibc.Wallet = &CosmosWallet{}
Expand Down
6 changes: 3 additions & 3 deletions chain/internal/tendermint/tendermint_node.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ import (
dockerclient "github.com/docker/docker/client"
"github.com/docker/go-connections/nat"
"github.com/hashicorp/go-version"
"github.com/strangelove-ventures/ibctest/v6/ibc"
"github.com/strangelove-ventures/ibctest/v6/internal/dockerutil"
"github.com/strangelove-ventures/ibctest/v6/testutil"
"github.com/strangelove-ventures/ibctest/v7/ibc"
"github.com/strangelove-ventures/ibctest/v7/internal/dockerutil"
"github.com/strangelove-ventures/ibctest/v7/testutil"
tmjson "github.com/tendermint/tendermint/libs/json"
"github.com/tendermint/tendermint/p2p"
rpcclient "github.com/tendermint/tendermint/rpc/client"
Expand Down
4 changes: 2 additions & 2 deletions chain/penumbra/penumbra_app_node.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import (
"github.com/docker/docker/api/types/network"
"github.com/docker/docker/client"
"github.com/docker/go-connections/nat"
"github.com/strangelove-ventures/ibctest/v6/ibc"
"github.com/strangelove-ventures/ibctest/v6/internal/dockerutil"
"github.com/strangelove-ventures/ibctest/v7/ibc"
"github.com/strangelove-ventures/ibctest/v7/internal/dockerutil"
"go.uber.org/zap"
)

Expand Down
8 changes: 4 additions & 4 deletions chain/penumbra/penumbra_chain.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ import (
"github.com/docker/docker/api/types"
volumetypes "github.com/docker/docker/api/types/volume"
"github.com/docker/docker/client"
"github.com/strangelove-ventures/ibctest/v6/chain/internal/tendermint"
"github.com/strangelove-ventures/ibctest/v6/ibc"
"github.com/strangelove-ventures/ibctest/v6/internal/dockerutil"
"github.com/strangelove-ventures/ibctest/v6/testutil"
"github.com/strangelove-ventures/ibctest/v7/chain/internal/tendermint"
"github.com/strangelove-ventures/ibctest/v7/ibc"
"github.com/strangelove-ventures/ibctest/v7/internal/dockerutil"
"github.com/strangelove-ventures/ibctest/v7/testutil"
"go.uber.org/zap"
"golang.org/x/sync/errgroup"
)
Expand Down
2 changes: 1 addition & 1 deletion chain/penumbra/wallet.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package penumbra

import (
"github.com/cosmos/cosmos-sdk/types"
"github.com/strangelove-ventures/ibctest/v6/ibc"
"github.com/strangelove-ventures/ibctest/v7/ibc"
)

var _ ibc.Wallet = &PenumbraWallet{}
Expand Down
2 changes: 1 addition & 1 deletion chain/polkadot/keys_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/centrifuge/go-substrate-rpc-client/v4/signature"
p2pCrypto "github.com/libp2p/go-libp2p-core/crypto"
"github.com/libp2p/go-libp2p-core/peer"
"github.com/strangelove-ventures/ibctest/v6/chain/polkadot"
"github.com/strangelove-ventures/ibctest/v7/chain/polkadot"
"github.com/stretchr/testify/require"
)

Expand Down
4 changes: 2 additions & 2 deletions chain/polkadot/parachain_node.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ import (
"github.com/icza/dyno"
p2pcrypto "github.com/libp2p/go-libp2p-core/crypto"
"github.com/libp2p/go-libp2p-core/peer"
"github.com/strangelove-ventures/ibctest/v6/ibc"
"github.com/strangelove-ventures/ibctest/v6/internal/dockerutil"
"github.com/strangelove-ventures/ibctest/v7/ibc"
"github.com/strangelove-ventures/ibctest/v7/internal/dockerutil"
"go.uber.org/zap"
)

Expand Down
4 changes: 2 additions & 2 deletions chain/polkadot/polkadot_chain.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ import (
"github.com/docker/docker/client"
"github.com/icza/dyno"
p2pcrypto "github.com/libp2p/go-libp2p-core/crypto"
"github.com/strangelove-ventures/ibctest/v6/ibc"
"github.com/strangelove-ventures/ibctest/v6/internal/dockerutil"
"github.com/strangelove-ventures/ibctest/v7/ibc"
"github.com/strangelove-ventures/ibctest/v7/internal/dockerutil"
"go.uber.org/zap"
"golang.org/x/sync/errgroup"
)
Expand Down
4 changes: 2 additions & 2 deletions chain/polkadot/polkadot_chain_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"fmt"
"testing"

ibctest "github.com/strangelove-ventures/ibctest/v6"
"github.com/strangelove-ventures/ibctest/v6/ibc"
ibctest "github.com/strangelove-ventures/ibctest/v7"
"github.com/strangelove-ventures/ibctest/v7/ibc"
"github.com/stretchr/testify/require"
"go.uber.org/zap/zaptest"
)
Expand Down
4 changes: 2 additions & 2 deletions chain/polkadot/relay_chain_node.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import (
"go.uber.org/zap"

"github.com/decred/dcrd/dcrec/secp256k1/v2"
"github.com/strangelove-ventures/ibctest/v6/ibc"
"github.com/strangelove-ventures/ibctest/v6/internal/dockerutil"
"github.com/strangelove-ventures/ibctest/v7/ibc"
"github.com/strangelove-ventures/ibctest/v7/internal/dockerutil"
)

// RelayChainNode defines the properties required for running a polkadot relay chain node.
Expand Down
2 changes: 1 addition & 1 deletion chain/polkadot/tx.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
gsrpc "github.com/centrifuge/go-substrate-rpc-client/v4"
"github.com/centrifuge/go-substrate-rpc-client/v4/signature"
gstypes "github.com/centrifuge/go-substrate-rpc-client/v4/types"
"github.com/strangelove-ventures/ibctest/v6/ibc"
"github.com/strangelove-ventures/ibctest/v7/ibc"
)

// SendFundsTx sends funds to a wallet using the SubstrateAPI
Expand Down
2 changes: 1 addition & 1 deletion chain/polkadot/wallet.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package polkadot

import (
"github.com/strangelove-ventures/ibctest/v6/ibc"
"github.com/strangelove-ventures/ibctest/v7/ibc"
)

var _ ibc.Wallet = &PolkadotWallet{}
Expand Down
10 changes: 5 additions & 5 deletions chainfactory.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ import (
"strings"
"sync"

"github.com/strangelove-ventures/ibctest/v6/chain/cosmos"
"github.com/strangelove-ventures/ibctest/v6/chain/penumbra"
"github.com/strangelove-ventures/ibctest/v6/chain/polkadot"
"github.com/strangelove-ventures/ibctest/v6/ibc"
"github.com/strangelove-ventures/ibctest/v6/label"
"github.com/strangelove-ventures/ibctest/v7/chain/cosmos"
"github.com/strangelove-ventures/ibctest/v7/chain/penumbra"
"github.com/strangelove-ventures/ibctest/v7/chain/polkadot"
"github.com/strangelove-ventures/ibctest/v7/ibc"
"github.com/strangelove-ventures/ibctest/v7/label"
"go.uber.org/zap"
"gopkg.in/yaml.v3"
)
Expand Down
4 changes: 2 additions & 2 deletions chainset.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"time"

"github.com/docker/docker/client"
"github.com/strangelove-ventures/ibctest/v6/ibc"
"github.com/strangelove-ventures/ibctest/v6/internal/blockdb"
"github.com/strangelove-ventures/ibctest/v7/ibc"
"github.com/strangelove-ventures/ibctest/v7/internal/blockdb"
"go.uber.org/multierr"
"go.uber.org/zap"
"golang.org/x/sync/errgroup"
Expand Down
4 changes: 2 additions & 2 deletions chainspec.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"sync"
"sync/atomic"

"github.com/strangelove-ventures/ibctest/v6/ibc"
"github.com/strangelove-ventures/ibctest/v6/label"
"github.com/strangelove-ventures/ibctest/v7/ibc"
"github.com/strangelove-ventures/ibctest/v7/label"
"go.uber.org/zap"
)

Expand Down
4 changes: 2 additions & 2 deletions chainspec_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"testing"

"github.com/google/go-cmp/cmp"
ibctest "github.com/strangelove-ventures/ibctest/v6"
"github.com/strangelove-ventures/ibctest/v6/ibc"
ibctest "github.com/strangelove-ventures/ibctest/v7"
"github.com/strangelove-ventures/ibctest/v7/ibc"
"github.com/stretchr/testify/require"
"go.uber.org/zap/zaptest"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/ibctest/flags.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"os"
"time"

ibctest "github.com/strangelove-ventures/ibctest/v6"
ibctest "github.com/strangelove-ventures/ibctest/v7"
"go.uber.org/zap"
"go.uber.org/zap/zapcore"
)
Expand Down
16 changes: 8 additions & 8 deletions cmd/ibctest/ibctest_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@ import (
"time"

"github.com/rivo/tview"
ibctest "github.com/strangelove-ventures/ibctest/v6"
"github.com/strangelove-ventures/ibctest/v6/conformance"
"github.com/strangelove-ventures/ibctest/v6/ibc"
"github.com/strangelove-ventures/ibctest/v6/internal/blockdb"
blockdbtui "github.com/strangelove-ventures/ibctest/v6/internal/blockdb/tui"
"github.com/strangelove-ventures/ibctest/v6/internal/version"
"github.com/strangelove-ventures/ibctest/v6/relayer"
"github.com/strangelove-ventures/ibctest/v6/testreporter"
ibctest "github.com/strangelove-ventures/ibctest/v7"
"github.com/strangelove-ventures/ibctest/v7/conformance"
"github.com/strangelove-ventures/ibctest/v7/ibc"
"github.com/strangelove-ventures/ibctest/v7/internal/blockdb"
blockdbtui "github.com/strangelove-ventures/ibctest/v7/internal/blockdb/tui"
"github.com/strangelove-ventures/ibctest/v7/internal/version"
"github.com/strangelove-ventures/ibctest/v7/relayer"
"github.com/strangelove-ventures/ibctest/v7/testreporter"
"go.uber.org/zap"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/ibctest/matrix_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"encoding/json"
"testing"

ibctest "github.com/strangelove-ventures/ibctest/v6"
ibctest "github.com/strangelove-ventures/ibctest/v7"
"github.com/stretchr/testify/require"
"go.uber.org/zap/zaptest"
)
Expand Down
10 changes: 5 additions & 5 deletions conformance/flush.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ import (
"testing"

"github.com/cosmos/cosmos-sdk/types"
ibctest "github.com/strangelove-ventures/ibctest/v6"
"github.com/strangelove-ventures/ibctest/v6/ibc"
"github.com/strangelove-ventures/ibctest/v6/relayer"
"github.com/strangelove-ventures/ibctest/v6/testreporter"
"github.com/strangelove-ventures/ibctest/v6/testutil"
ibctest "github.com/strangelove-ventures/ibctest/v7"
"github.com/strangelove-ventures/ibctest/v7/ibc"
"github.com/strangelove-ventures/ibctest/v7/relayer"
"github.com/strangelove-ventures/ibctest/v7/testreporter"
"github.com/strangelove-ventures/ibctest/v7/testutil"
"github.com/stretchr/testify/require"
)

Expand Down
10 changes: 5 additions & 5 deletions conformance/relayersetup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ import (
"fmt"
"testing"

conntypes "github.com/cosmos/ibc-go/v6/modules/core/03-connection/types"
ibctest "github.com/strangelove-ventures/ibctest/v6"
"github.com/strangelove-ventures/ibctest/v6/ibc"
"github.com/strangelove-ventures/ibctest/v6/testreporter"
"github.com/strangelove-ventures/ibctest/v6/testutil"
conntypes "github.com/cosmos/ibc-go/v7/modules/core/03-connection/types"
ibctest "github.com/strangelove-ventures/ibctest/v7"
"github.com/strangelove-ventures/ibctest/v7/ibc"
"github.com/strangelove-ventures/ibctest/v7/testreporter"
"github.com/strangelove-ventures/ibctest/v7/testutil"
"github.com/stretchr/testify/require"
"golang.org/x/sync/errgroup"
)
Expand Down
22 changes: 11 additions & 11 deletions conformance/test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
// import (
// "testing"
//
// "github.com/strangelove-ventures/ibctest/v6/conformance"
// "github.com/strangelove-ventures/ibctest/v6/ibc"
// "github.com/strangelove-ventures/ibctest/v7/conformance"
// "github.com/strangelove-ventures/ibctest/v7/ibc"
// )
//
// func TestMyRelayer(t *testing.T) {
Expand All @@ -35,16 +35,16 @@ import (
"testing"
"time"

transfertypes "github.com/cosmos/ibc-go/v6/modules/apps/transfer/types"
transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types"
"github.com/docker/docker/client"
ibctest "github.com/strangelove-ventures/ibctest/v6"
"github.com/strangelove-ventures/ibctest/v6/chain/cosmos"
"github.com/strangelove-ventures/ibctest/v6/ibc"
"github.com/strangelove-ventures/ibctest/v6/internal/dockerutil"
"github.com/strangelove-ventures/ibctest/v6/label"
"github.com/strangelove-ventures/ibctest/v6/relayer"
"github.com/strangelove-ventures/ibctest/v6/testreporter"
"github.com/strangelove-ventures/ibctest/v6/testutil"
ibctest "github.com/strangelove-ventures/ibctest/v7"
"github.com/strangelove-ventures/ibctest/v7/chain/cosmos"
"github.com/strangelove-ventures/ibctest/v7/ibc"
"github.com/strangelove-ventures/ibctest/v7/internal/dockerutil"
"github.com/strangelove-ventures/ibctest/v7/label"
"github.com/strangelove-ventures/ibctest/v7/relayer"
"github.com/strangelove-ventures/ibctest/v7/testreporter"
"github.com/strangelove-ventures/ibctest/v7/testutil"
"github.com/stretchr/testify/require"
"golang.org/x/sync/errgroup"
)
Expand Down
Loading