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.

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

refactor: update 29-fee to use runtime.Environment #7617

Merged
merged 99 commits into from
Dec 18, 2024
Merged
Show file tree
Hide file tree
Changes from 92 commits
Commits
Show all changes
99 commits
Select commit Hold shift + click to select a range
a1ef65e
go mod changes
tac0turtle Sep 6, 2024
a0bf113
remove cometabci direct dep
tac0turtle Sep 6, 2024
5a331ed
fix all errors
tac0turtle Sep 8, 2024
6d49de2
appmodule & simapp cleanup
tac0turtle Sep 8, 2024
ad88b3c
08wasm fixes
tac0turtle Sep 8, 2024
fec6f52
get 08-wasm compiling
tac0turtle Sep 8, 2024
fc0f25a
another simapp
tac0turtle Sep 8, 2024
3e5029e
another simapp
tac0turtle Sep 8, 2024
10440c8
pass in environment
tac0turtle Sep 8, 2024
d779d86
fix compilation errors
tac0turtle Sep 8, 2024
2a11f2e
some fixes
tac0turtle Sep 9, 2024
d029e19
build
tac0turtle Sep 9, 2024
c055483
fix other simapps
tac0turtle Sep 9, 2024
26d765e
linting
tac0turtle Sep 9, 2024
2ee5548
remove unsed code
tac0turtle Sep 10, 2024
0832575
Merge branch 'feat/upgrade-sdk-v0.52' into marko/gomod_change
tac0turtle Sep 23, 2024
11e5c51
go mod changes
tac0turtle Sep 23, 2024
db4ab33
add pool module
tac0turtle Sep 23, 2024
da38c64
anothersimapp
tac0turtle Sep 23, 2024
455a2e8
linting fixes
tac0turtle Sep 23, 2024
471123e
protocol pool module accounts
tac0turtle Sep 23, 2024
8c99de3
callback fixes
tac0turtle Sep 23, 2024
c01a5ed
simapp fixes
tac0turtle Sep 23, 2024
16d4530
register interfaces
tac0turtle Sep 24, 2024
ab2191b
fix feeibc
tac0turtle Sep 24, 2024
4a5d564
changes++
tac0turtle Sep 24, 2024
b2978bb
Merge branch 'feat/upgrade-sdk-v0.52' into marko/gomod_change
tac0turtle Sep 24, 2024
97ce6b8
fix missed conflict
tac0turtle Sep 24, 2024
58e6cbe
fix wasm client
tac0turtle Sep 24, 2024
ba0f7ce
linting fixes
tac0turtle Sep 24, 2024
5e94346
Merge branch 'main' into marko/gomod_change
tac0turtle Oct 21, 2024
4af6896
fix tests
tac0turtle Oct 21, 2024
bb85a9a
linting
tac0turtle Oct 21, 2024
9dc1460
fix simapp tests
tac0turtle Oct 21, 2024
a073c5d
erge branch 'main' into marko/gomod_change
tac0turtle Nov 6, 2024
6ef7fc1
fix some tests
tac0turtle Nov 6, 2024
ac74c7d
fix e2e go mod
tac0turtle Nov 6, 2024
85c06e1
go mod changes
tac0turtle Nov 6, 2024
4eb9438
remove grandpa
tac0turtle Nov 6, 2024
e06d2c5
Gomod changes and minor updates (#7549)
alpe Nov 11, 2024
d9d7072
chore: use same tags for all go mods
chatton Nov 18, 2024
452a287
chore: update go mod files, revert callbacks simapp changes
chatton Nov 18, 2024
b24e6aa
chore: fix tendermint client test suite
chatton Nov 18, 2024
b02eb86
chore: fix tests in TestAnteDecoratorCheckTx
chatton Nov 19, 2024
b6e75a8
chore: fix event tests
chatton Nov 19, 2024
a9baeec
chore: fix compiler error in simapp
damiannolan Nov 19, 2024
b54b4b6
deps: update to latest of cosmossdk.io/store main to fix proofs test
damiannolan Nov 19, 2024
61aea60
chore: tidy all
chatton Nov 20, 2024
0eb8205
fix: remove ibcmock module acc from blocked addrs
damiannolan Nov 20, 2024
8c94751
chore: fix proto failures and Gov errors
chatton Nov 20, 2024
386b258
chore: fix ica test
chatton Nov 20, 2024
bfd2454
chore: fix a few compiler errs in 08-wasm
damiannolan Nov 20, 2024
0ec2d48
fix: update ica account already exists test to front run account crea…
damiannolan Nov 20, 2024
37da9f5
chore: fix ica test for address gen
damiannolan Nov 20, 2024
b75b061
Merge pull request #7580 from cosmos/cian/damian/sdk-52
damiannolan Nov 20, 2024
610ff2d
Merge branch 'main' into marko/gomod_change
damiannolan Nov 21, 2024
cec1953
chore: re-add log to returned error
chatton Nov 21, 2024
5f115f4
chore: update go mods
chatton Nov 21, 2024
d7d1713
chore: fixed build errors in wasm app.go
chatton Nov 21, 2024
a195296
chore: cleanup callbacks simapp
damiannolan Nov 21, 2024
47eb259
chore: fixing simulation functions
chatton Nov 21, 2024
6ca4a43
chore: reconfigure simd cmd and fix TestInitCmd
damiannolan Nov 21, 2024
346d83d
feat: adding runtime Environment
damiannolan Nov 21, 2024
29ce5f2
chore: run make lint-fix
damiannolan Nov 21, 2024
7e7d17d
chore: remove duplicate import
damiannolan Nov 21, 2024
7e2f699
chore: rm duplicate import
damiannolan Nov 22, 2024
7cb2468
chore: migrate to env KVStoreService in icacontroller
damiannolan Nov 25, 2024
cb93c24
chore: fix duplicate import
damiannolan Nov 25, 2024
f828f09
chore: rm kv store service
damiannolan Nov 25, 2024
d488054
chore: refactor events to use environment
damiannolan Nov 25, 2024
92ecec1
chore: make lint-fix
damiannolan Nov 25, 2024
4660322
chore: make tidy-all
damiannolan Nov 25, 2024
e267e42
chore: rm msg service router from icacontroller
damiannolan Nov 25, 2024
ab1f3f3
fix: remove 32 bit arm arch from callbacks ci builds
damiannolan Nov 25, 2024
8b67d8d
test: try cache false for callbacks linter
damiannolan Nov 25, 2024
e27966b
chore: pin to updated interchaintest fork
chatton Nov 26, 2024
b6fba89
chore: revert relayer count to 10
chatton Nov 26, 2024
c23234d
chore: continued work on upgrading e2e tests to 0.52
chatton Nov 26, 2024
d83116d
chore: transfer e2e passing
chatton Nov 27, 2024
82c5a66
chore: fix upgrade build errors
chatton Nov 27, 2024
06d40e4
chore: bump interchaintest
chatton Nov 27, 2024
a128c03
chore: update sample config
chatton Nov 27, 2024
55b4fbe
chore: reconfigure protoany to use gogoproto any in favour of codec t…
damiannolan Nov 27, 2024
b92bc67
chore: tidy imports in e2e
damiannolan Nov 27, 2024
f9b7314
fix: address failure in module safe query ica e2e test
damiannolan Dec 2, 2024
94a4685
bump golangci version to 1.60
bznein Dec 2, 2024
4f37cf6
lint: remove duplicate import
damiannolan Dec 2, 2024
0c37e27
refactor: update 29-fee to use runtime.Environment
bznein Dec 3, 2024
5cf7d7e
feat: add runtime Env to icacontroller and fix v0.52 e2e tests (#7587)
damiannolan Dec 6, 2024
593e420
Merge branch 'marko/gomod_change' into bznein/runtime/fee
bznein Dec 6, 2024
6792642
use constants
bznein Dec 6, 2024
eb19424
fix double import
bznein Dec 6, 2024
1abcbe6
fix double import
bznein Dec 6, 2024
6347c8a
Update modules/apps/29-fee/keeper/keeper.go
bznein Dec 6, 2024
46342e4
Merge branch 'main' into bznein/runtime/fee
damiannolan Dec 18, 2024
8ce6009
chore: revert versioned docs, height_test and msg_server_test diffs a…
damiannolan Dec 18, 2024
b776ef5
chore: revert ante
damiannolan Dec 18, 2024
ef54cd5
chore: revert testdata_pulsar diffs
damiannolan Dec 18, 2024
fe200cb
chore: remove UnwrapSDKContext grpc queries
damiannolan Dec 18, 2024
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
11 changes: 6 additions & 5 deletions .github/workflows/callbacks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,14 @@ jobs:
steps:
- uses: actions/setup-go@v5
with:
go-version: '1.22'
go-version: '1.23'
cache: false
- uses: actions/checkout@v4
with:
fetch-depth: 0
- uses: golangci/[email protected]
with:
version: v1.57.2
version: v1.60
only-new-issues: true
args: --timeout 5m
working-directory: modules/apps/callbacks
Expand All @@ -32,12 +33,12 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
go-arch: ['amd64', 'arm', 'arm64']
go-arch: ['amd64', 'arm64']
steps:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: '1.22'
go-version: '1.23'
- name: Build callbacks-module
run: |
cd modules/apps/callbacks
Expand All @@ -49,7 +50,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: '1.22'
go-version: '1.23'
- name: Go Test
run: |
cd modules/apps/callbacks
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e-compatibility-workflow-call.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
repository: cosmos/ibc-go
- uses: actions/setup-go@v5
with:
go-version: '1.22'
go-version: '1.23'
cache-dependency-path: 'e2e/go.sum'
- name: Run e2e Test
run: |
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/e2e-fork.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: '1.22'
go-version: '1.23'
- id: set-matrix
run: |
output=$(go run cmd/build_test_matrix/main.go)
Expand All @@ -45,7 +45,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: '1.22'
go-version: '1.23'
- id: set-matrix
run: |
output=$(go run cmd/build_test_matrix/main.go)
Expand Down Expand Up @@ -76,7 +76,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@v5
with:
go-version: '1.22'
go-version: '1.23'
cache-dependency-path: 'e2e/go.sum'
- name: Run e2e Test
run: |
Expand Down Expand Up @@ -113,7 +113,7 @@ jobs:
# - name: Setup Go
# uses: actions/setup-go@v5
# with:
# go-version: '1.22'
# go-version: '1.23'
# cache-dependency-path: 'e2e/go.sum'
# - name: Run e2e Test
# run: |
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/e2e-test-workflow-call.yml
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ jobs:
repository: cosmos/ibc-go
- uses: actions/setup-go@v5
with:
go-version: '1.22'
go-version: '1.23'
- id: set-matrix
run: |
output=$(go run cmd/build_test_matrix/main.go)
Expand Down Expand Up @@ -243,7 +243,7 @@ jobs:
repository: cosmos/ibc-go
- uses: actions/setup-go@v5
with:
go-version: '1.22'
go-version: '1.23'
cache-dependency-path: 'e2e/go.sum'
- name: Run e2e Test
id: e2e_test
Expand Down Expand Up @@ -299,7 +299,7 @@ jobs:
repository: cosmos/ibc-go
- uses: actions/setup-go@v5
with:
go-version: '1.22'
go-version: '1.23'
cache-dependency-path: 'e2e/go.sum'
- name: Run e2e Test
id: e2e_test
Expand All @@ -313,4 +313,4 @@ jobs:
with:
name: '${{ matrix.entrypoint }}-${{ matrix.test }}'
path: e2e/diagnostics
retention-days: 5
retention-days: 5
2 changes: 1 addition & 1 deletion .github/workflows/e2e-wasm.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: '1.22'
go-version: '1.23'
- id: get-tag
run: |
if [ -z "${{ github.event.pull_request.number }}" ]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: '1.22'
go-version: '1.23'
- id: get-tag
run: |
if [ -z "${{ github.event.pull_request.number }}" ]
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/e2emodule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@ jobs:
steps:
- uses: actions/setup-go@v5
with:
go-version: '1.22'
go-version: '1.23'
cache-dependency-path: 'e2e/go.sum'
- uses: actions/checkout@v4
with:
fetch-depth: 0
- uses: golangci/[email protected]
with:
version: v1.57.2
version: v1.60
only-new-issues: true
args: --timeout 5m
working-directory: e2e/
Expand All @@ -35,7 +35,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: '1.22'
go-version: '1.23'
cache-dependency-path: 'e2e/go.sum'
- name: Go Test
run: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/golangci-feature.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ jobs:
steps:
- uses: actions/setup-go@v5
with:
go-version: '1.22'
go-version: '1.23'
- uses: actions/checkout@v4
with:
fetch-depth: 0
- name: golangci-lint
uses: golangci/[email protected]
with:
version: v1.57.2
version: v1.60
only-new-issues: true
args: --timeout 10m
4 changes: 2 additions & 2 deletions .github/workflows/golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ jobs:
steps:
- uses: actions/setup-go@v5
with:
go-version: '1.22'
go-version: '1.23'
- uses: actions/checkout@v4
with:
fetch-depth: 0
- name: golangci-lint
uses: golangci/[email protected]
with:
version: v1.57.2
version: v1.60
only-new-issues: true
args: --timeout 10m
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:

- uses: actions/setup-go@v5
with:
go-version: '1.22'
go-version: '1.23'

- name: Release
uses: goreleaser/goreleaser-action@v6
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: '1.22'
go-version: '1.23'
- uses: technote-space/[email protected]
id: git_diff
with:
Expand Down Expand Up @@ -58,7 +58,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: '1.22'
go-version: '1.23'
- name: Create a file with all the pkgs
run: go list ./... | grep -v e2e > pkgs.txt
- name: Split pkgs into 4 files
Expand Down Expand Up @@ -92,7 +92,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: '1.22'
go-version: '1.23'
- uses: technote-space/[email protected]
with:
PATTERNS: |
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/wasm-client.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ jobs:
steps:
- uses: actions/setup-go@v5
with:
go-version: '1.22'
go-version: '1.23'
- uses: actions/checkout@v4
with:
fetch-depth: 0
- uses: golangci/[email protected]
with:
version: v1.57.2
version: v1.60
only-new-issues: true
args: --timeout 10m
working-directory: modules/light-clients/08-wasm
Expand All @@ -36,7 +36,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: '1.22'
go-version: '1.23'
# Install cross compiler for ARM64. Export CC env variable.
- name: Install compiler for arm64.
run: |
Expand All @@ -55,7 +55,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: '1.22'
go-version: '1.23'
- name: Go Test
run: |
cd modules/light-clients/08-wasm
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.22-alpine3.20 as builder
FROM golang:1.23.2-alpine as builder
ARG IBC_GO_VERSION

RUN set -eux; apk add --no-cache git libusb-dev linux-headers gcc musl-dev make;
Expand Down
2 changes: 1 addition & 1 deletion docs/docs/03-light-clients/01-developer-guide/09-setup.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ func (AppModuleBasic) RegisterLegacyAminoCodec(*codec.LegacyAmino) {}

// RegisterInterfaces registers module concrete types into protobuf Any. This allows core IBC
// to unmarshal tendermint light client types.
func (AppModuleBasic) RegisterInterfaces(registry codectypes.InterfaceRegistry) {
func (AppModuleBasic) RegisterInterfaces(registry coreregistry.InterfaceRegistrar) {
RegisterInterfaces(registry)
}

Expand Down
2 changes: 1 addition & 1 deletion docs/docs/03-light-clients/04-wasm/05-governance.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
...
"github.com/cosmos/cosmos-sdk/runtime"
authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
govtypes "cosmossdk.io/x/gov/types"

ibcwasmkeeper "github.com/cosmos/ibc-go/modules/light-clients/08-wasm/keeper"
ibcwasmtypes "github.com/cosmos/ibc-go/modules/light-clients/08-wasm/types"
Expand Down
2 changes: 1 addition & 1 deletion docs/docs/05-migrations/06-v4-to-v5.md
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,7 @@ The `MockEmptyAcknowledgement` type has been renamed to `EmptyAcknowledgement` (

The `TestingApp` interface in `testing` has gone through some modifications:

- The return type of the function `GetStakingKeeper` is not the concrete type `stakingkeeper.Keeper` anymore (where `stakingkeeper` is an import alias for `"github.com/cosmos/cosmos-sdk/x/staking/keeper"`), but it has been changed to the interface `ibctestingtypes.StakingKeeper` (where `ibctestingtypes` is an import alias for `""github.com/cosmos/ibc-go/v5/testing/types"`). See this [PR](https://github.com/cosmos/ibc-go/pull/2028) for more details. The `StakingKeeper` interface is defined as:
- The return type of the function `GetStakingKeeper` is not the concrete type `stakingkeeper.Keeper` anymore (where `stakingkeeper` is an import alias for `"cosmossdk.io/x/staking/keeper"`), but it has been changed to the interface `ibctestingtypes.StakingKeeper` (where `ibctestingtypes` is an import alias for `""github.com/cosmos/ibc-go/v5/testing/types"`). See this [PR](https://github.com/cosmos/ibc-go/pull/2028) for more details. The `StakingKeeper` interface is defined as:

```go
type StakingKeeper interface {
Expand Down
1 change: 1 addition & 0 deletions docs/tutorials/01-fee/04-wire-feeibc-mod.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ Next, we need to add `fee` module to the module basic manager and define its acc
stakingtypes.BondedPoolName: {authtypes.Burner, authtypes.Staking},
stakingtypes.NotBondedPoolName: {authtypes.Burner, authtypes.Staking},
govtypes.ModuleName: {authtypes.Burner},
pooltypes.ModuleName: nil,
ibctransfertypes.ModuleName: {authtypes.Minter, authtypes.Burner},
// plus-diff-line
+ ibcfeetypes.ModuleName: nil,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,7 @@ The `MockEmptyAcknowledgement` type has been renamed to `EmptyAcknowledgement` (

The `TestingApp` interface in `testing` has gone through some modifications:

- The return type of the function `GetStakingKeeper` is not the concrete type `stakingkeeper.Keeper` anymore (where `stakingkeeper` is an import alias for `"github.com/cosmos/cosmos-sdk/x/staking/keeper"`), but it has been changed to the interface `ibctestingtypes.StakingKeeper` (where `ibctestingtypes` is an import alias for `""github.com/cosmos/ibc-go/v5/testing/types"`). See this [PR](https://github.com/cosmos/ibc-go/pull/2028) for more details. The `StakingKeeper` interface is defined as:
- The return type of the function `GetStakingKeeper` is not the concrete type `stakingkeeper.Keeper` anymore (where `stakingkeeper` is an import alias for `"cosmossdk.io/x/staking/keeper"`), but it has been changed to the interface `ibctestingtypes.StakingKeeper` (where `ibctestingtypes` is an import alias for `""github.com/cosmos/ibc-go/v5/testing/types"`). See this [PR](https://github.com/cosmos/ibc-go/pull/2028) for more details. The `StakingKeeper` interface is defined as:

```go
type StakingKeeper interface {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ func (AppModuleBasic) RegisterLegacyAminoCodec(*codec.LegacyAmino) {}

// RegisterInterfaces registers module concrete types into protobuf Any. This allows core IBC
// to unmarshal tendermint light client types.
func (AppModuleBasic) RegisterInterfaces(registry codectypes.InterfaceRegistry) {
func (AppModuleBasic) RegisterInterfaces(registry coreregistry.InterfaceRegistrar) {
RegisterInterfaces(registry)
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
...
"github.com/cosmos/cosmos-sdk/runtime"
authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
govtypes "cosmossdk.io/x/gov/types"

ibcwasmkeeper "github.com/cosmos/ibc-go/modules/light-clients/08-wasm/keeper"
ibcwasmtypes "github.com/cosmos/ibc-go/modules/light-clients/08-wasm/types"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,7 @@ The `MockEmptyAcknowledgement` type has been renamed to `EmptyAcknowledgement` (

The `TestingApp` interface in `testing` has gone through some modifications:

- The return type of the function `GetStakingKeeper` is not the concrete type `stakingkeeper.Keeper` anymore (where `stakingkeeper` is an import alias for `"github.com/cosmos/cosmos-sdk/x/staking/keeper"`), but it has been changed to the interface `ibctestingtypes.StakingKeeper` (where `ibctestingtypes` is an import alias for `""github.com/cosmos/ibc-go/v5/testing/types"`). See this [PR](https://github.com/cosmos/ibc-go/pull/2028) for more details. The `StakingKeeper` interface is defined as:
- The return type of the function `GetStakingKeeper` is not the concrete type `stakingkeeper.Keeper` anymore (where `stakingkeeper` is an import alias for `"cosmossdk.io/x/staking/keeper"`), but it has been changed to the interface `ibctestingtypes.StakingKeeper` (where `ibctestingtypes` is an import alias for `""github.com/cosmos/ibc-go/v5/testing/types"`). See this [PR](https://github.com/cosmos/ibc-go/pull/2028) for more details. The `StakingKeeper` interface is defined as:

```go
type StakingKeeper interface {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ func (AppModuleBasic) RegisterLegacyAminoCodec(*codec.LegacyAmino) {}

// RegisterInterfaces registers module concrete types into protobuf Any. This allows core IBC
// to unmarshal tendermint light client types.
func (AppModuleBasic) RegisterInterfaces(registry codectypes.InterfaceRegistry) {
func (AppModuleBasic) RegisterInterfaces(registry coreregistry.InterfaceRegistrar) {
RegisterInterfaces(registry)
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
...
"github.com/cosmos/cosmos-sdk/runtime"
authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
govtypes "cosmossdk.io/x/gov/types"

ibcwasmkeeper "github.com/cosmos/ibc-go/modules/light-clients/08-wasm/keeper"
ibcwasmtypes "github.com/cosmos/ibc-go/modules/light-clients/08-wasm/types"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,7 @@ The `MockEmptyAcknowledgement` type has been renamed to `EmptyAcknowledgement` (

The `TestingApp` interface in `testing` has gone through some modifications:

- The return type of the function `GetStakingKeeper` is not the concrete type `stakingkeeper.Keeper` anymore (where `stakingkeeper` is an import alias for `"github.com/cosmos/cosmos-sdk/x/staking/keeper"`), but it has been changed to the interface `ibctestingtypes.StakingKeeper` (where `ibctestingtypes` is an import alias for `""github.com/cosmos/ibc-go/v5/testing/types"`). See this [PR](https://github.com/cosmos/ibc-go/pull/2028) for more details. The `StakingKeeper` interface is defined as:
- The return type of the function `GetStakingKeeper` is not the concrete type `stakingkeeper.Keeper` anymore (where `stakingkeeper` is an import alias for `"cosmossdk.io/x/staking/keeper"`), but it has been changed to the interface `ibctestingtypes.StakingKeeper` (where `ibctestingtypes` is an import alias for `""github.com/cosmos/ibc-go/v5/testing/types"`). See this [PR](https://github.com/cosmos/ibc-go/pull/2028) for more details. The `StakingKeeper` interface is defined as:

```go
type StakingKeeper interface {
Expand Down
5 changes: 3 additions & 2 deletions e2e/dockerutil/dockerutil.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
"path"

dockertypes "github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/container"
"github.com/docker/docker/api/types/filters"
dockerclient "github.com/docker/docker/client"
)
Expand All @@ -18,7 +19,7 @@ const testLabel = "ibc-test"
// note: the test suite name must be passed as the chains are created in SetupSuite which will label
// them with the name of the test suite rather than the test.
func GetTestContainers(ctx context.Context, suiteName string, dc *dockerclient.Client) ([]dockertypes.Container, error) {
testContainers, err := dc.ContainerList(ctx, dockertypes.ContainerListOptions{
testContainers, err := dc.ContainerList(ctx, container.ListOptions{
All: true,
Filters: filters.NewArgs(
// see: https://github.com/strangelove-ventures/interchaintest/blob/0bdc194c2aa11aa32479f32b19e1c50304301981/internal/dockerutil/setup.go#L31-L36
Expand All @@ -35,7 +36,7 @@ func GetTestContainers(ctx context.Context, suiteName string, dc *dockerclient.C

// GetContainerLogs returns the logs of a container as a byte array.
func GetContainerLogs(ctx context.Context, dc *dockerclient.Client, containerName string) ([]byte, error) {
readCloser, err := dc.ContainerLogs(ctx, containerName, dockertypes.ContainerLogsOptions{
readCloser, err := dc.ContainerLogs(ctx, containerName, container.LogsOptions{
ShowStdout: true,
ShowStderr: true,
})
Expand Down
Loading
Loading