Skip to content

Commit 8727d71

Browse files
committed
chore: add errorlint and refactor check error
1 parent 0a22b7a commit 8727d71

File tree

27 files changed

+82
-73
lines changed

27 files changed

+82
-73
lines changed

.golangci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ linters:
66
disable-all: true
77
enable:
88
- exportloopref
9+
- errorlint
910
- errcheck
1011
- gci
1112
- goconst

cmd/build_test_matrix/main.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ func getGithubActionMatrixForTests(e2eRootDirectory, testName string, suite stri
9797
fset := token.NewFileSet()
9898
err := filepath.Walk(e2eRootDirectory, func(path string, info fs.FileInfo, err error) error {
9999
if err != nil {
100-
return fmt.Errorf("error walking e2e directory: %s", err)
100+
return fmt.Errorf("error walking e2e directory: %w", err)
101101
}
102102

103103
// only look at test files
@@ -107,12 +107,12 @@ func getGithubActionMatrixForTests(e2eRootDirectory, testName string, suite stri
107107

108108
f, err := parser.ParseFile(fset, path, nil, 0)
109109
if err != nil {
110-
return fmt.Errorf("failed parsing file: %s", err)
110+
return fmt.Errorf("failed parsing file: %w", err)
111111
}
112112

113113
suiteNameForFile, testCases, err := extractSuiteAndTestNames(f)
114114
if err != nil {
115-
return fmt.Errorf("failed extracting test suite name and test cases: %s", err)
115+
return fmt.Errorf("failed extracting test suite name and test cases: %w", err)
116116
}
117117

118118
if testName != "" && contains(testName, testCases) {

docs/docs/03-light-clients/04-wasm/03-integration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ func NewSimApp(
105105
ibcwasmkeeper.NewWasmSnapshotter(app.CommitMultiStore(), &app.WasmClientKeeper),
106106
)
107107
if err != nil {
108-
panic(fmt.Errorf("failed to register snapshot extension: %s", err))
108+
panic(fmt.Errorf("failed to register snapshot extension: %w", err))
109109
}
110110
}
111111
...

docs/versioned_docs/version-v7.4.x/03-light-clients/04-wasm/03-integration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ func NewSimApp(
105105
ibcwasmkeeper.NewWasmSnapshotter(app.CommitMultiStore(), &app.WasmClientKeeper),
106106
)
107107
if err != nil {
108-
panic(fmt.Errorf("failed to register snapshot extension: %s", err))
108+
panic(fmt.Errorf("failed to register snapshot extension: %w", err))
109109
}
110110
}
111111
...

docs/versioned_docs/version-v8.2.x/03-light-clients/04-wasm/03-integration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ func NewSimApp(
105105
ibcwasmkeeper.NewWasmSnapshotter(app.CommitMultiStore(), &app.WasmClientKeeper),
106106
)
107107
if err != nil {
108-
panic(fmt.Errorf("failed to register snapshot extension: %s", err))
108+
panic(fmt.Errorf("failed to register snapshot extension: %w", err))
109109
}
110110
}
111111
...

e2e/dockerutil/dockerutil.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ func GetTestContainers(ctx context.Context, t *testing.T, dc *dockerclient.Clien
2828
),
2929
})
3030
if err != nil {
31-
return nil, fmt.Errorf("failed listing containers: %s", err)
31+
return nil, fmt.Errorf("failed listing containers: %w", err)
3232
}
3333

3434
return testContainers, nil
@@ -41,7 +41,7 @@ func GetContainerLogs(ctx context.Context, dc *dockerclient.Client, containerNam
4141
ShowStderr: true,
4242
})
4343
if err != nil {
44-
return nil, fmt.Errorf("failed reading logs in test cleanup: %s", err)
44+
return nil, fmt.Errorf("failed reading logs in test cleanup: %w", err)
4545
}
4646
return io.ReadAll(readCloser)
4747
}

e2e/testsuite/testconfig.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -683,7 +683,7 @@ func defaultGovv1Beta1ModifyGenesis(version string) func(ibc.ChainConfig, []byte
683683

684684
govModuleBytes, err := json.Marshal(appStateMap[govtypes.ModuleName])
685685
if err != nil {
686-
return nil, fmt.Errorf("failed to extract gov genesis bytes: %s", err)
686+
return nil, fmt.Errorf("failed to extract gov genesis bytes: %w", err)
687687
}
688688

689689
govModuleGenesisBytes, err := modifyGovv1Beta1AppState(chainConfig, govModuleBytes)
@@ -700,7 +700,7 @@ func defaultGovv1Beta1ModifyGenesis(version string) func(ibc.ChainConfig, []byte
700700
if !testvalues.AllowAllClientsWildcardFeatureReleases.IsSupported(version) {
701701
ibcModuleBytes, err := json.Marshal(appStateMap[ibcexported.ModuleName])
702702
if err != nil {
703-
return nil, fmt.Errorf("failed to extract ibc genesis bytes: %s", err)
703+
return nil, fmt.Errorf("failed to extract ibc genesis bytes: %w", err)
704704
}
705705

706706
ibcGenesisBytes, err := modifyClientGenesisAppState(ibcModuleBytes)

e2e/testsuite/testsuite.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -311,10 +311,10 @@ func (s *E2ETestSuite) RecoverRelayerWallets(ctx context.Context, ibcrelayer ibc
311311
chainA, chainB := s.GetChains()
312312

313313
if err := chainA.RecoverKey(ctx, ChainARelayerName, chainARelayerWallet.Mnemonic()); err != nil {
314-
return fmt.Errorf("could not recover relayer wallet on chain A: %s", err)
314+
return fmt.Errorf("could not recover relayer wallet on chain A: %w", err)
315315
}
316316
if err := chainB.RecoverKey(ctx, ChainBRelayerName, chainBRelayerWallet.Mnemonic()); err != nil {
317-
return fmt.Errorf("could not recover relayer wallet on chain B: %s", err)
317+
return fmt.Errorf("could not recover relayer wallet on chain B: %w", err)
318318
}
319319
return nil
320320
}

modules/apps/27-interchain-accounts/controller/keeper/genesis.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ func InitGenesis(ctx sdk.Context, keeper Keeper, state genesistypes.ControllerGe
2121

2222
// use the controller scoped keeper to claim the port capability
2323
if err := keeper.ClaimCapability(ctx, capability, host.PortPath(portID)); err != nil {
24-
panic(fmt.Errorf("could not claim port capability: %v", err))
24+
panic(fmt.Errorf("could not claim port capability: %w", err))
2525
}
2626
}
2727
}

modules/apps/27-interchain-accounts/host/keeper/genesis.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ func InitGenesis(ctx sdk.Context, keeper Keeper, state genesistypes.HostGenesisS
2121

2222
// use the host scoped keeper to claim the port capability
2323
if err := keeper.ClaimCapability(ctx, capability, host.PortPath(state.Port)); err != nil {
24-
panic(fmt.Errorf("could not claim port capability: %v", err))
24+
panic(fmt.Errorf("could not claim port capability: %w", err))
2525
}
2626
}
2727

@@ -34,7 +34,7 @@ func InitGenesis(ctx sdk.Context, keeper Keeper, state genesistypes.HostGenesisS
3434
}
3535

3636
if err := state.Params.Validate(); err != nil {
37-
panic(fmt.Errorf("could not set ica host params at genesis: %v", err))
37+
panic(fmt.Errorf("could not set ica host params at genesis: %w", err))
3838
}
3939
keeper.SetParams(ctx, state.Params)
4040
}

0 commit comments

Comments
 (0)