Skip to content

Commit

Permalink
linting fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
tac0turtle committed Sep 23, 2024
1 parent da38c64 commit 455a2e8
Show file tree
Hide file tree
Showing 24 changed files with 47 additions and 51 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/callbacks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
steps:
- uses: actions/setup-go@v5
with:
go-version: '1.22'
go-version: '1.23'
- uses: actions/checkout@v4
with:
fetch-depth: 0
Expand All @@ -37,7 +37,7 @@ jobs:
- 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 +49,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 @@ -43,7 +43,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
4 changes: 2 additions & 2 deletions .github/workflows/e2emodule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ 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:
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
2 changes: 1 addition & 1 deletion .github/workflows/golangci-feature.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
steps:
- uses: actions/setup-go@v5
with:
go-version: '1.22'
go-version: '1.23'
- uses: actions/checkout@v4
with:
fetch-depth: 0
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
steps:
- uses: actions/setup-go@v5
with:
go-version: '1.22'
go-version: '1.23'
- uses: actions/checkout@v4
with:
fetch-depth: 0
Expand Down
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/get-diff-action@v6.1.2
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/get-diff-action@v6.1.2
with:
PATTERNS: |
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/wasm-client.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
steps:
- uses: actions/setup-go@v5
with:
go-version: '1.22'
go-version: '1.23'
- uses: actions/checkout@v4
with:
fetch-depth: 0
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
4 changes: 2 additions & 2 deletions modules/apps/27-interchain-accounts/module.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"github.com/spf13/cobra"

"cosmossdk.io/core/appmodule"
"cosmossdk.io/core/registry"
coreregistry "cosmossdk.io/core/registry"

"github.com/cosmos/cosmos-sdk/client"
"github.com/cosmos/cosmos-sdk/codec"
Expand Down Expand Up @@ -54,7 +54,7 @@ func (AppModule) IsOnePerModuleType() {}
func (AppModule) IsAppModule() {}

// RegisterLegacyAminoCodec implements AppModule.
func (AppModule) RegisterLegacyAminoCodec(cdc registry.AminoRegistrar) {}
func (AppModule) RegisterLegacyAminoCodec(cdc coreregistry.AminoRegistrar) {}

// RegisterInterfaces registers module concrete types into protobuf Any
func (AppModule) RegisterInterfaces(registry codectypes.InterfaceRegistry) {
Expand Down
6 changes: 3 additions & 3 deletions modules/apps/callbacks/testing/simapp/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -442,7 +442,7 @@ func NewSimApp(
appCodec, runtime.NewKVStoreService(keys[ibcfeetypes.StoreKey]),
app.IBCKeeper.ChannelKeeper, // may be replaced with IBC middleware
app.IBCKeeper.ChannelKeeper,
app.AccountKeeper, app.BankKeeper,
app.AuthKeeper, app.BankKeeper,
)

// ICA Controller keeper
Expand All @@ -459,7 +459,7 @@ func NewSimApp(
appCodec, runtime.NewKVStoreService(keys[icahosttypes.StoreKey]), app.GetSubspace(icahosttypes.SubModuleName),
app.IBCFeeKeeper, // use ics29 fee as ics4Wrapper in middleware stack
app.IBCKeeper.ChannelKeeper,
app.AccountKeeper, app.MsgServiceRouter(),
app.AuthKeeper, app.MsgServiceRouter(),
app.GRPCQueryRouter(), authtypes.NewModuleAddress(govtypes.ModuleName).String(),
)

Expand All @@ -476,7 +476,7 @@ func NewSimApp(
appCodec, runtime.NewKVStoreService(keys[ibctransfertypes.StoreKey]), app.GetSubspace(ibctransfertypes.ModuleName),
app.IBCFeeKeeper, // ISC4 Wrapper: fee IBC middleware
app.IBCKeeper.ChannelKeeper,
app.AccountKeeper, app.BankKeeper,
app.AuthKeeper, app.BankKeeper,
authtypes.NewModuleAddress(govtypes.ModuleName).String(),
)

Expand Down
2 changes: 1 addition & 1 deletion modules/apps/transfer/keeper/keeper.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ import (
corestore "cosmossdk.io/core/store"
"cosmossdk.io/log"
"cosmossdk.io/math"

"cosmossdk.io/store/prefix"
storetypes "cosmossdk.io/store/types"
banktypes "cosmossdk.io/x/bank/types"

"github.com/cosmos/cosmos-sdk/codec"
"github.com/cosmos/cosmos-sdk/runtime"
sdk "github.com/cosmos/cosmos-sdk/types"
Expand Down
4 changes: 2 additions & 2 deletions modules/apps/transfer/module.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"github.com/spf13/cobra"

"cosmossdk.io/core/appmodule"
"cosmossdk.io/core/registry"
coreregistry "cosmossdk.io/core/registry"

"github.com/cosmos/cosmos-sdk/client"
"github.com/cosmos/cosmos-sdk/codec"
Expand Down Expand Up @@ -51,7 +51,7 @@ func (AppModule) IsOnePerModuleType() {}
func (AppModule) IsAppModule() {}

// RegisterLegacyAminoCodec implements AppModule interface
func (AppModule) RegisterLegacyAminoCodec(cdc registry.AminoRegistrar) {
func (AppModule) RegisterLegacyAminoCodec(cdc coreregistry.AminoRegistrar) {
types.RegisterLegacyAminoCodec(cdc)
}

Expand Down
5 changes: 0 additions & 5 deletions modules/core/04-channel/types/acknowledgement_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,6 @@ import (
ibcerrors "github.com/cosmos/ibc-go/v9/modules/core/errors"
)

const (
gasUsed = uint64(100)
gasWanted = uint64(100)
)

// tests acknowledgement.ValidateBasic and acknowledgement.Acknowledgement
func (suite TypesTestSuite) TestAcknowledgement() { //nolint:govet // this is a test, we are okay with copying locks
testCases := []struct {
Expand Down
1 change: 0 additions & 1 deletion modules/core/genesis_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,6 @@ func (suite *IBCTestSuite) TestExportGenesis() {

err = ibc.InitGenesis(suite.chainA.GetContext(), *suite.chainA.App.GetIBCKeeper(), gs)
suite.Require().NoError(err)

})
}
}
4 changes: 2 additions & 2 deletions modules/core/module.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"github.com/spf13/cobra"

"cosmossdk.io/core/appmodule"
"cosmossdk.io/core/registry"
coreregistry "cosmossdk.io/core/registry"

"github.com/cosmos/cosmos-sdk/client"
"github.com/cosmos/cosmos-sdk/codec"
Expand Down Expand Up @@ -61,7 +61,7 @@ func (AppModule) IsOnePerModuleType() {}
func (AppModule) IsAppModule() {}

// RegisterLegacyAminoCodec does nothing. IBC does not support amino.
func (AppModuleBasic) RegisterLegacyAminoCodec(registry.AminoRegistrar) {}
func (AppModuleBasic) RegisterLegacyAminoCodec(coreregistry.AminoRegistrar) {}

// DefaultGenesis returns default genesis state as raw bytes for the ibc
// module.
Expand Down
4 changes: 2 additions & 2 deletions modules/light-clients/06-solomachine/module.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"github.com/spf13/cobra"

"cosmossdk.io/core/appmodule"
"cosmossdk.io/core/registry"
coreregistry "cosmossdk.io/core/registry"

"github.com/cosmos/cosmos-sdk/client"
"github.com/cosmos/cosmos-sdk/codec"
Expand Down Expand Up @@ -43,7 +43,7 @@ func (AppModule) IsOnePerModuleType() {}
func (AppModule) IsAppModule() {}

// RegisterLegacyAminoCodec performs a no-op. The solo machine client does not support amino.
func (AppModuleBasic) RegisterLegacyAminoCodec(registry.AminoRegistrar) {}
func (AppModuleBasic) RegisterLegacyAminoCodec(coreregistry.AminoRegistrar) {}

// RegisterInterfaces registers module concrete types into protobuf Any. This allows core IBC
// to unmarshal solo machine types.
Expand Down
4 changes: 2 additions & 2 deletions modules/light-clients/07-tendermint/module.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"github.com/spf13/cobra"

"cosmossdk.io/core/appmodule"
"cosmossdk.io/core/registry"
coreregistry "cosmossdk.io/core/registry"

"github.com/cosmos/cosmos-sdk/client"
codectypes "github.com/cosmos/cosmos-sdk/codec/types"
Expand All @@ -29,7 +29,7 @@ func (AppModule) Name() string {
}

// RegisterLegacyAminoCodec performs a no-op. The Tendermint client does not support amino.
func (AppModule) RegisterLegacyAminoCodec(registry.AminoRegistrar) {}
func (AppModule) RegisterLegacyAminoCodec(coreregistry.AminoRegistrar) {}

// RegisterInterfaces registers module concrete types into protobuf Any. This allows core IBC
// to unmarshal tendermint light client types.
Expand Down
7 changes: 4 additions & 3 deletions simapp/export.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,13 @@ import (
slashingtypes "cosmossdk.io/x/slashing/types"
"cosmossdk.io/x/staking"
stakingtypes "cosmossdk.io/x/staking/types"
cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v1"
cmttypes "github.com/cometbft/cometbft/types"
cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec"

cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec"
servertypes "github.com/cosmos/cosmos-sdk/server/types"
sdk "github.com/cosmos/cosmos-sdk/types"

cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v1"
cmttypes "github.com/cometbft/cometbft/types"
)

// ExportAppStateAndValidators exports the state of the application for a genesis
Expand Down
Loading

0 comments on commit 455a2e8

Please sign in to comment.