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

Update IBC-Go to canonical v3.4.0 #632

Merged
merged 26 commits into from
Jan 10, 2023
Merged

Update IBC-Go to canonical v3.4.0 #632

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
3dcffc9
Update gitignore
Dec 26, 2022
e4dc3c3
Add ibc testing folder
Dec 26, 2022
a7e7e18
WIP replacing ibcsim
Dec 26, 2022
0821566
Tests pass
Dec 26, 2022
60f65bd
Update ibc-go dependency
Dec 26, 2022
4519793
Remove TODOs
Dec 26, 2022
aa0d35b
Remove unused code
Dec 26, 2022
582de07
Fixes ibcsim simapp dep
Jan 4, 2023
8a60bab
Remove unneeded simapp code from #632 (#636)
shaspitz Jan 4, 2023
0ca5dce
Merge branch 'main' into glnro/585-canonical-ibc
Jan 6, 2023
fb91d2b
Merge branch 'main' into glnro/585-canonical-ibc
glnro Jan 6, 2023
60ddd77
Fix lint
Jan 6, 2023
a7cb6d0
Update dependencies and linters
Jan 6, 2023
b165d49
Test gosec ignore
Jan 6, 2023
3413ed1
Fix gosec
Jan 6, 2023
ad8e79f
Fix linting
Jan 6, 2023
3f348a9
Update sonarcloud ignore for ibc
Jan 6, 2023
eb543fa
Revert lint change
Jan 6, 2023
7a7644a
Removed unused code
Jan 6, 2023
5690519
Merge branch 'main' into glnro/585-canonical-ibc
glnro Jan 6, 2023
4b6df33
Refactor ibc directory
Jan 8, 2023
bb542f7
Merge branch 'main' into glnro/585-canonical-ibc
glnro Jan 8, 2023
20456d8
Add back gaia tests and add ibc-testing disclosure
Jan 8, 2023
58607b4
Merge branch 'main' into glnro/585-canonical-ibc
glnro Jan 9, 2023
96e9670
Merge branch 'main' into glnro/585-canonical-ibc
shaspitz Jan 9, 2023
bde6a8c
Add README
Jan 10, 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: 2 additions & 0 deletions .github/workflows/codeql.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ on:
branches: [main]
pull_request:
branches: [main]
paths-ignore:
shaspitz marked this conversation as resolved.
Show resolved Hide resolved
- "legacy_ibc_testing"
schedule:
# ┌───────────── minute (0 - 59)
# │ ┌───────────── hour (0 - 23)
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/golangci-lint.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
# working-directory: somedir

# Optional: golangci-lint command line arguments.
args: --timeout=20m
args: --timeout=20m --skip-dirs legacy_ibc_testing

# Optional: show only new issues if it's a pull request. The default value is `false`.
# only-new-issues: true
Expand All @@ -43,4 +43,4 @@ jobs:
# skip-pkg-cache: true

# Optional: if set to true then the action don't cache or restore ~/.cache/go-build.
# skip-build-cache: true
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: can you put the removed newline back?

# skip-build-cache: true
2 changes: 1 addition & 1 deletion .github/workflows/gosec.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ jobs:
- name: Run Gosec Security Scanner
uses: securego/gosec@master
with:
args: -exclude-generated ./...
args: -exclude-dir=legacy_ibc_testing ./... -exclude-generated ./...
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@ docs/tla/states/
*.out
vendor/
.vscode
.idea
8 changes: 4 additions & 4 deletions app/consumer-democracy/app.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,8 @@ import (
porttypes "github.com/cosmos/ibc-go/v3/modules/core/05-port/types"
ibchost "github.com/cosmos/ibc-go/v3/modules/core/24-host"
ibckeeper "github.com/cosmos/ibc-go/v3/modules/core/keeper"
ibctesting "github.com/cosmos/ibc-go/v3/testing"
ibctestingcore "github.com/cosmos/interchain-security/legacy_ibc_testing/core"
ibctesting "github.com/cosmos/interchain-security/legacy_ibc_testing/testing"
"github.com/gorilla/mux"
"github.com/rakyll/statik/fs"
"github.com/spf13/cast"
Expand Down Expand Up @@ -108,7 +109,6 @@ import (

// unnamed import of statik for swagger UI support
_ "github.com/cosmos/cosmos-sdk/client/docs/statik"
ibcclienttypes "github.com/cosmos/ibc-go/v3/modules/core/02-client/types"
)

const (
Expand Down Expand Up @@ -394,7 +394,7 @@ func New(

app.GovKeeper = *govKeeper.SetHooks(
ccvgovtypes.NewMultiGovHooks(
// register the governance hooks
// register the governance hooks
),
)

Expand Down Expand Up @@ -813,7 +813,7 @@ func (app *App) GetBaseApp() *baseapp.BaseApp {
}

// GetStakingKeeper implements the TestingApp interface.
func (app *App) GetStakingKeeper() ibcclienttypes.StakingKeeper {
func (app *App) GetStakingKeeper() ibctestingcore.StakingKeeper {
return app.ConsumerKeeper
}

Expand Down
2 changes: 1 addition & 1 deletion app/consumer-democracy/proposals_whitelisting_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package app_test
import (
"testing"

ibctesting "github.com/cosmos/ibc-go/v3/testing"
appConsumer "github.com/cosmos/interchain-security/app/consumer-democracy"
ibctesting "github.com/cosmos/interchain-security/legacy_ibc_testing/testing"
icstestingutils "github.com/cosmos/interchain-security/testutil/ibc_testing"
"github.com/stretchr/testify/require"
)
Expand Down
6 changes: 3 additions & 3 deletions app/consumer/app.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,8 @@ import (
porttypes "github.com/cosmos/ibc-go/v3/modules/core/05-port/types"
ibchost "github.com/cosmos/ibc-go/v3/modules/core/24-host"
ibckeeper "github.com/cosmos/ibc-go/v3/modules/core/keeper"
ibctesting "github.com/cosmos/ibc-go/v3/testing"
ibctestingcore "github.com/cosmos/interchain-security/legacy_ibc_testing/core"
ibctesting "github.com/cosmos/interchain-security/legacy_ibc_testing/testing"
"github.com/gorilla/mux"
"github.com/rakyll/statik/fs"
"github.com/spf13/cast"
Expand All @@ -84,7 +85,6 @@ import (

// unnamed import of statik for swagger UI support
_ "github.com/cosmos/cosmos-sdk/client/docs/statik"
ibcclienttypes "github.com/cosmos/ibc-go/v3/modules/core/02-client/types"
)

const (
Expand Down Expand Up @@ -681,7 +681,7 @@ func (app *App) GetBaseApp() *baseapp.BaseApp {
}

// GetStakingKeeper implements the TestingApp interface.
func (app *App) GetStakingKeeper() ibcclienttypes.StakingKeeper {
func (app *App) GetStakingKeeper() ibctestingcore.StakingKeeper {
return app.ConsumerKeeper
}

Expand Down
5 changes: 3 additions & 2 deletions app/provider/app.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,8 @@ import (
porttypes "github.com/cosmos/ibc-go/v3/modules/core/05-port/types"
ibchost "github.com/cosmos/ibc-go/v3/modules/core/24-host"
ibckeeper "github.com/cosmos/ibc-go/v3/modules/core/keeper"
ibctesting "github.com/cosmos/ibc-go/v3/testing"
ibctestingcore "github.com/cosmos/interchain-security/legacy_ibc_testing/core"
ibctesting "github.com/cosmos/interchain-security/legacy_ibc_testing/testing"

"github.com/gorilla/mux"
"github.com/gravity-devs/liquidity/x/liquidity"
Expand Down Expand Up @@ -834,7 +835,7 @@ func (app *App) GetBaseApp() *baseapp.BaseApp {
}

// GetStakingKeeper implements the TestingApp interface.
func (app *App) GetStakingKeeper() ibcclienttypes.StakingKeeper {
func (app *App) GetStakingKeeper() ibctestingcore.StakingKeeper {
return app.StakingKeeper
}

Expand Down
9 changes: 4 additions & 5 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,12 @@ module github.com/cosmos/interchain-security
go 1.18

require (
github.com/cosmos/cosmos-sdk v0.45.12-0.20221116140330-9c145c827001
github.com/cosmos/gaia/v8 v8.0.0-20221209131454-f73f97517b5b
github.com/cosmos/cosmos-sdk v0.45.11
github.com/cosmos/ibc-go/v3 v3.4.0
github.com/gogo/protobuf v1.3.3
github.com/golang/protobuf v1.5.2
github.com/gorilla/mux v1.8.0
github.com/gravity-devs/liquidity v1.5.1
github.com/gravity-devs/liquidity v1.5.3
github.com/grpc-ecosystem/grpc-gateway v1.16.0
github.com/kylelemons/godebug v1.1.0
github.com/rakyll/statik v0.1.7
Expand All @@ -31,6 +30,7 @@ require (

require (
github.com/confio/ics23/go v0.7.0
github.com/cosmos/gaia/v8 v8.0.0-20230108202408-c3c3586e5ab8
github.com/golang/mock v1.6.0
github.com/oxyno-zeta/gomock-extra-matcher v1.1.0
github.com/regen-network/cosmos-proto v0.3.1
Expand Down Expand Up @@ -70,7 +70,6 @@ require (
github.com/go-kit/kit v0.12.0 // indirect
github.com/go-kit/log v0.2.1 // indirect
github.com/go-logfmt/logfmt v0.5.1 // indirect
github.com/go-playground/validator/v10 v10.4.1 // indirect
github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect
github.com/gogo/gateway v1.1.0 // indirect
github.com/golang/glog v1.0.0 // indirect
Expand Down Expand Up @@ -139,7 +138,7 @@ require (

replace (
github.com/99designs/keyring => github.com/cosmos/keyring v1.1.7-0.20210622111912-ef00f8ac3d76
github.com/cosmos/ibc-go/v3 => github.com/informalsystems/ibc-go/v3 v3.4.1-0.20221202165607-3dc5ba251371
github.com/cosmos/cosmos-sdk => github.com/cosmos/cosmos-sdk v0.45.11-ics
github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1
github.com/stretchr/testify => github.com/stretchr/testify v1.7.1
google.golang.org/grpc => google.golang.org/grpc v1.33.2
Expand Down
Loading