Skip to content

Commit cd755e7

Browse files
committed
fix: rollback error wrapping
1 parent da1dd23 commit cd755e7

12 files changed

Lines changed: 17 additions & 14 deletions

File tree

.golangci.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,15 @@ linters:
4444
- builtin$
4545
- examples$
4646
settings:
47+
errorlint:
48+
errorf: false
4749
cyclop:
4850
max-complexity: 40
4951
gocritic:
5052
disabled-checks:
5153
- ifElseChain
5254
- singleCaseSwitch
55+
- commentFormatting
5356
revive:
5457
rules:
5558
- name: context-as-argument

cmd/akash/cmd/genaccounts.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ contain valid denominations. Accounts may optionally be supplied with vesting pa
6464

6565
info, err := kb.Key(args[0])
6666
if err != nil {
67-
return fmt.Errorf("failed to get address from Keybase: %w", err)
67+
return fmt.Errorf("failed to get address from Keybase: %v", err)
6868
}
6969

7070
addr, err = info.GetAddress()
@@ -75,7 +75,7 @@ contain valid denominations. Accounts may optionally be supplied with vesting pa
7575

7676
coins, err := sdk.ParseCoinsNormalized(args[1])
7777
if err != nil {
78-
return fmt.Errorf("failed to parse coins: %w", err)
78+
return fmt.Errorf("failed to parse coins: %v", err)
7979
}
8080

8181
vestingStart, _ := cmd.Flags().GetInt64(flagVestingStart)
@@ -84,7 +84,7 @@ contain valid denominations. Accounts may optionally be supplied with vesting pa
8484

8585
vestingAmt, err := sdk.ParseCoinsNormalized(vestingAmtStr)
8686
if err != nil {
87-
return fmt.Errorf("failed to parse vesting amount: %w", err)
87+
return fmt.Errorf("failed to parse vesting amount: %v", err)
8888
}
8989

9090
// create concrete account type based on input parameters

util/cli/configs.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,7 @@ func interceptConfigs(rootViper *viper.Viper, customAppTemplate string, customCo
315315
tmcfg.EnsureRoot(rootDir)
316316

317317
if err = conf.ValidateBasic(); err != nil {
318-
return nil, fmt.Errorf("error in config file: %w", err)
318+
return nil, fmt.Errorf("error in config file: %v", err)
319319
}
320320

321321
conf.RPC.PprofListenAddress = "localhost:6060"

util/server/server.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ func ExportCmd(appExporter servertypes.AppExporter, defaultNodeHome string) *cob
135135
)
136136

137137
if err != nil {
138-
return fmt.Errorf("error exporting state: %w", err)
138+
return fmt.Errorf("error exporting state: %v", err)
139139
}
140140

141141
doc, err := tmtypes.GenesisDocFromFile(sctx.Config.GenesisFile())

x/audit/module.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ func (AppModuleBasic) ValidateGenesis(cdc codec.JSONCodec, _ client.TxEncodingCo
7373

7474
err := cdc.UnmarshalJSON(bz, &data)
7575
if err != nil {
76-
return fmt.Errorf("failed to unmarshal %s genesis state: %w", types.ModuleName, err)
76+
return fmt.Errorf("failed to unmarshal %s genesis state: %v", types.ModuleName, err)
7777
}
7878

7979
return ValidateGenesis(&data)

x/cert/module.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ func (AppModuleBasic) ValidateGenesis(cdc codec.JSONCodec, _ client.TxEncodingCo
7777

7878
err := cdc.UnmarshalJSON(bz, &data)
7979
if err != nil {
80-
return fmt.Errorf("failed to unmarshal %s genesis state: %w", types.ModuleName, err)
80+
return fmt.Errorf("failed to unmarshal %s genesis state: %v", types.ModuleName, err)
8181
}
8282

8383
return ValidateGenesis(&data)

x/deployment/handler/handler_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -440,7 +440,7 @@ func TestFundedDeployment(t *testing.T) {
440440
msg.Groups = append(msg.Groups, group.GroupSpec)
441441
}
442442

443-
// owner := sdk.MustAccAddressFromBech32(deployment.ID.Owner)
443+
//owner := sdk.MustAccAddressFromBech32(deployment.ID.Owner)
444444
suite.PrepareMocks(func(ts *state.TestSuite) {
445445
bkeeper := ts.BankKeeper()
446446
bkeeper.

x/deployment/keeper/keeper.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"github.com/cosmos/cosmos-sdk/codec"
88
"github.com/cosmos/cosmos-sdk/telemetry"
99
sdk "github.com/cosmos/cosmos-sdk/types"
10-
v1 "pkg.akt.dev/go/node/deployment/v1"
10+
"pkg.akt.dev/go/node/deployment/v1"
1111
types "pkg.akt.dev/go/node/deployment/v1beta4"
1212
)
1313

@@ -283,7 +283,7 @@ func (k Keeper) OnCloseGroup(ctx sdk.Context, group types.Group, state types.Gro
283283

284284
key, err := GroupKey(GroupStateToPrefix(group.State), group.ID)
285285
if err != nil {
286-
return fmt.Errorf("%w: failed to encode group key", err)
286+
return fmt.Errorf("%s: failed to encode group key", err)
287287
}
288288

289289
store.Set(key, k.cdc.MustMarshal(&group))

x/deployment/module.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ func (AppModuleBasic) ValidateGenesis(cdc codec.JSONCodec, _ client.TxEncodingCo
8484
var data types.GenesisState
8585
err := cdc.UnmarshalJSON(bz, &data)
8686
if err != nil {
87-
return fmt.Errorf("failed to unmarshal %s genesis state: %w", v1.ModuleName, err)
87+
return fmt.Errorf("failed to unmarshal %s genesis state: %v", v1.ModuleName, err)
8888
}
8989
return ValidateGenesis(&data)
9090
}

x/escrow/module.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ func (AppModuleBasic) ValidateGenesis(cdc codec.JSONCodec, _ client.TxEncodingCo
7373

7474
err := cdc.UnmarshalJSON(bz, &data)
7575
if err != nil {
76-
return fmt.Errorf("failed to unmarshal %s genesis state: %w", emodule.ModuleName, err)
76+
return fmt.Errorf("failed to unmarshal %s genesis state: %v", emodule.ModuleName, err)
7777
}
7878

7979
return ValidateGenesis(&data)

0 commit comments

Comments
 (0)