Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .github/workflows/e2e-conformance.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ jobs:
runs-on: ubuntu-latest
steps:
# Install and setup go
- name: Set up Go 1.26.5
- name: Set up Go 1.26.10
uses: actions/setup-go@v6
with:
go-version: '1.26.5'
go-version: '1.26.10'

- name: checkout interchaintest
uses: actions/checkout@v6
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/e2e-cosmos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ jobs:
runs-on: ubuntu-latest
steps:
# Install and setup go
- name: Set up Go 1.26.5
- name: Set up Go 1.26.10
uses: actions/setup-go@v6
with:
go-version: '1.26.5'
go-version: '1.26.10'
cache: false

- name: checkout interchaintest
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/e2e-ibc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ jobs:
runs-on: ubuntu-latest
steps:
# Install and setup go
- name: Set up Go 1.26.5
- name: Set up Go 1.26.10
uses: actions/setup-go@v6
with:
go-version: '1.26.5'
go-version: '1.26.10'
cache: false

- name: checkout interchaintest
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ permissions:
contents: read

env:
GO_VERSION: 1.26.5
GO_VERSION: 1.26.10

jobs:
clippy-lint:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/local-interchain.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ concurrency:
cancel-in-progress: true

env:
GO_VERSION: 1.26.5
GO_VERSION: 1.26.10
NODE_JS_VERSION: v21.x

jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
types: [created]

env:
GO_VERSION: 1.26.5
GO_VERSION: 1.26.10

jobs:
release-static-binary:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/unit-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ jobs:
runs-on: ubuntu-latest
steps:
# Install and setup go
- name: Set up Go 1.26.5
- name: Set up Go 1.26.10
uses: actions/setup-go@v6
with:
go-version: '1.26.5'
go-version: '1.26.10'

- name: checkout interchaintest
uses: actions/checkout@v6
Expand Down
10 changes: 4 additions & 6 deletions Dockerfile.local-interchain
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,14 @@
# docker build . -t local-interchain:local -f Dockerfile.local-interchain
# docker run -it local-interchain:local

FROM golang:1.26.5 AS builder
FROM golang:1.26.10 AS builder

# Set destination for COPY
WORKDIR /app

COPY go.mod go.sum go.work go.work.sum ./
RUN go mod tidy

COPY ./local-interchain ./local-interchain
RUN cd local-interchain && go mod tidy
COPY go.mod go.sum go.work ./
COPY local-interchain/go.mod local-interchain/go.sum ./local-interchain/
RUN go mod download

COPY . ./

Expand Down
12 changes: 12 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,15 @@ default: help
help: ## Print this help message
@echo "Available make commands:"; grep -h -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'

.PHONY: build
build: ## Compile all packages in both modules (interchaintest and local-interchain)
go build ./...
cd local-interchain && go build ./...

.PHONY: docker-build
docker-build: ## Build the local-interchain Docker image (local-interchain:local)
$(DOCKER) build . -t local-interchain:local -f Dockerfile.local-interchain

.PHONY: interchaintest
interchaintest: gen ## Build interchaintest binary into ./bin
go test -ldflags "-X github.com/cosmos/interchaintest/v11/interchaintest.GitSha=$(shell git describe --always --dirty)" -c -o ./bin/interchaintest ./cmd/interchaintest
Expand All @@ -33,6 +42,9 @@ test-ibc-examples: ## Run e2e ibc example tests
test-cosmos-examples: ## Run e2e cosmos example tests
@go test -race -failfast -timeout 30m -v -p 2 ./examples/cosmos

.PHONY: e2e
e2e: test-conformance test-ibc-examples test-cosmos-examples ## Run all e2e test suites (requires Docker)

.PHONY: docker-reset
docker-reset: ## Attempt to delete all running containers. Useful if interchaintest does not exit cleanly.
@docker stop $(shell docker ps -q) &>/dev/null || true
Expand Down
2 changes: 1 addition & 1 deletion chain/cosmos/08-wasm-types/client_message.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package types

import (
"github.com/cosmos/ibc-go/v11/modules/core/exported"
"github.com/lfdt-ibc/ibc-go/v11/modules/core/exported"
)

var _ exported.ClientMessage = &ClientMessage{}
Expand Down
4 changes: 2 additions & 2 deletions chain/cosmos/08-wasm-types/client_state.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package types

import (
clienttypes "github.com/cosmos/ibc-go/v11/modules/core/02-client/types" // nolint:staticcheck
"github.com/cosmos/ibc-go/v11/modules/core/exported"
clienttypes "github.com/lfdt-ibc/ibc-go/v11/modules/core/02-client/types" // nolint:staticcheck
"github.com/lfdt-ibc/ibc-go/v11/modules/core/exported"

"github.com/cosmos/cosmos-sdk/codec"
storetypes "github.com/cosmos/cosmos-sdk/store/v2/types"
Expand Down
2 changes: 1 addition & 1 deletion chain/cosmos/08-wasm-types/codec.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package types

import (
"github.com/cosmos/ibc-go/v11/modules/core/exported"
"github.com/lfdt-ibc/ibc-go/v11/modules/core/exported"

codectypes "github.com/cosmos/cosmos-sdk/codec/types"
sdk "github.com/cosmos/cosmos-sdk/types"
Expand Down
2 changes: 1 addition & 1 deletion chain/cosmos/08-wasm-types/consensus_state.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package types

import (
"github.com/cosmos/ibc-go/v11/modules/core/exported"
"github.com/lfdt-ibc/ibc-go/v11/modules/core/exported"
)

var _ exported.ConsensusState = (*ConsensusState)(nil)
Expand Down
2 changes: 1 addition & 1 deletion chain/cosmos/08-wasm-types/wasm.pb.go

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

3 changes: 1 addition & 2 deletions chain/cosmos/chain_node.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,13 @@ import (
"github.com/avast/retry-go/v4"
volumetypes "github.com/docker/docker/api/types/volume"
"github.com/docker/go-connections/nat"
icatypes "github.com/lfdt-ibc/ibc-go/v11/modules/apps/27-interchain-accounts/types"
dockerclient "github.com/moby/moby/client"
"go.uber.org/zap"
"golang.org/x/sync/errgroup"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials/insecure"

icatypes "github.com/cosmos/ibc-go/v11/modules/apps/27-interchain-accounts/types"

"github.com/cosmos/cosmos-sdk/client"
clientflags "github.com/cosmos/cosmos-sdk/client/flags"
"github.com/cosmos/cosmos-sdk/codec"
Expand Down
6 changes: 3 additions & 3 deletions chain/cosmos/codec.go
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package cosmos

import (
transfer "github.com/cosmos/ibc-go/v11/modules/apps/transfer"
ibccore "github.com/cosmos/ibc-go/v11/modules/core"
ibctm "github.com/cosmos/ibc-go/v11/modules/light-clients/07-tendermint"
transfer "github.com/lfdt-ibc/ibc-go/v11/modules/apps/transfer"
ibccore "github.com/lfdt-ibc/ibc-go/v11/modules/core"
ibctm "github.com/lfdt-ibc/ibc-go/v11/modules/light-clients/07-tendermint"

"github.com/cosmos/cosmos-sdk/codec"
codectypes "github.com/cosmos/cosmos-sdk/codec/types"
Expand Down
5 changes: 2 additions & 3 deletions chain/cosmos/cosmos_chain.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,14 @@ import (

dockerimagetypes "github.com/docker/docker/api/types/image"
volumetypes "github.com/docker/docker/api/types/volume"
clienttypes "github.com/lfdt-ibc/ibc-go/v11/modules/core/02-client/types" // nolint:staticcheck
chanTypes "github.com/lfdt-ibc/ibc-go/v11/modules/core/04-channel/types"
"github.com/moby/moby/client"
"go.uber.org/zap"
"golang.org/x/sync/errgroup"

sdkmath "cosmossdk.io/math"

clienttypes "github.com/cosmos/ibc-go/v11/modules/core/02-client/types" // nolint:staticcheck
chanTypes "github.com/cosmos/ibc-go/v11/modules/core/04-channel/types"

"github.com/cosmos/cosmos-sdk/codec"
codectypes "github.com/cosmos/cosmos-sdk/codec/types"
cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec"
Expand Down
2 changes: 1 addition & 1 deletion configuredChains.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -582,7 +582,7 @@ osmosis:
gas-adjustment: 2.0
trusting-period: 336h
images:
- repository: ghcr.io/strangelove-ventures/heighliner/osmosis
- repository: osmolabs/osmosis
uid-gid: 1025:1025
no-host-mount: false

Expand Down
7 changes: 3 additions & 4 deletions conformance/relayersetup.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,12 @@ import (
"fmt"
"testing"

transfertypes "github.com/lfdt-ibc/ibc-go/v11/modules/apps/transfer/types"
conntypes "github.com/lfdt-ibc/ibc-go/v11/modules/core/03-connection/types"
"github.com/lfdt-ibc/ibc-go/v11/modules/core/exported"
"github.com/stretchr/testify/require"
"golang.org/x/sync/errgroup"

transfertypes "github.com/cosmos/ibc-go/v11/modules/apps/transfer/types"
conntypes "github.com/cosmos/ibc-go/v11/modules/core/03-connection/types"
"github.com/cosmos/ibc-go/v11/modules/core/exported"

"github.com/cosmos/interchaintest/v11"
"github.com/cosmos/interchaintest/v11/ibc"
"github.com/cosmos/interchaintest/v11/testreporter"
Expand Down
3 changes: 1 addition & 2 deletions conformance/test.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,13 @@ import (
"testing"
"time"

transfertypes "github.com/lfdt-ibc/ibc-go/v11/modules/apps/transfer/types"
"github.com/moby/moby/client"
"github.com/stretchr/testify/require"
"golang.org/x/sync/errgroup"

"cosmossdk.io/math"

transfertypes "github.com/cosmos/ibc-go/v11/modules/apps/transfer/types"

"github.com/cosmos/interchaintest/v11"
"github.com/cosmos/interchaintest/v11/chain/cosmos"
"github.com/cosmos/interchaintest/v11/dockerutil"
Expand Down
5 changes: 2 additions & 3 deletions examples/ibc/client_recovery_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,13 @@ import (
"testing"
"time"

transfertypes "github.com/lfdt-ibc/ibc-go/v11/modules/apps/transfer/types"
clienttypes "github.com/lfdt-ibc/ibc-go/v11/modules/core/02-client/types"
"github.com/stretchr/testify/require"
"go.uber.org/zap/zaptest"

"cosmossdk.io/math"

transfertypes "github.com/cosmos/ibc-go/v11/modules/apps/transfer/types"
clienttypes "github.com/cosmos/ibc-go/v11/modules/core/02-client/types"

"github.com/cosmos/interchaintest/v11"
"github.com/cosmos/interchaintest/v11/chain/cosmos"
"github.com/cosmos/interchaintest/v11/ibc"
Expand Down
7 changes: 3 additions & 4 deletions examples/ibc/learn_ibc_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,13 @@ import (
"testing"
"time"

transfertypes "github.com/lfdt-ibc/ibc-go/v11/modules/apps/transfer/types"
clienttypes "github.com/lfdt-ibc/ibc-go/v11/modules/core/02-client/types"
"github.com/stretchr/testify/require"
"go.uber.org/zap/zaptest"

"cosmossdk.io/math"

transfertypes "github.com/cosmos/ibc-go/v11/modules/apps/transfer/types"
clienttypes "github.com/cosmos/ibc-go/v11/modules/core/02-client/types"

"github.com/cosmos/interchaintest/v11"
"github.com/cosmos/interchaintest/v11/chain/cosmos"
"github.com/cosmos/interchaintest/v11/ibc"
Expand Down Expand Up @@ -45,7 +44,7 @@ func TestLearn(t *testing.T) {
GasPrices: "0.001uatom",
ModifyGenesis: cosmos.ModifyGenesis(DefaultGenesis),
}},
{Name: "osmosis", Version: "v11.0.0"},
{Name: "osmosis", Version: "11.0.1-alpine"},
})

chains, err := cf.Chains(t.Name())
Expand Down
Loading
Loading