Skip to content

Commit 6dc4e70

Browse files
committed
refactor: fix linting
1 parent ef6ad35 commit 6dc4e70

File tree

3 files changed

+15
-21
lines changed

3 files changed

+15
-21
lines changed

x/contractmanager/keeper/failure.go

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,10 @@ func (k Keeper) AddContractFailure(ctx context.Context, address string, sudoPayl
4444
func (k Keeper) GetNextFailureIDKey(ctx context.Context, address string) uint64 {
4545
store := prefix.NewStore(runtime.KVStoreAdapter(k.storeService.OpenKVStore(ctx)), types.GetFailureKeyPrefix(address))
4646
iterator := storetypes.KVStoreReversePrefixIterator(store, []byte{})
47-
defer iterator.Close()
47+
err := iterator.Close()
48+
if err != nil {
49+
k.Logger(ctx).Error(err.Error())
50+
}
4851

4952
if iterator.Valid() {
5053
var val types.Failure
@@ -60,7 +63,10 @@ func (k Keeper) GetNextFailureIDKey(ctx context.Context, address string) uint64
6063
func (k Keeper) GetAllFailures(ctx context.Context) (list []types.Failure) {
6164
store := prefix.NewStore(runtime.KVStoreAdapter(k.storeService.OpenKVStore(ctx)), types.ContractFailuresKey)
6265
iterator := storetypes.KVStorePrefixIterator(store, []byte{})
63-
defer iterator.Close()
66+
err := iterator.Close()
67+
if err != nil {
68+
k.Logger(ctx).Error(err.Error())
69+
}
6470

6571
for ; iterator.Valid(); iterator.Next() {
6672
var val types.Failure

x/feerefunder/keeper/keeper.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,10 @@ func (k Keeper) GetAllFeeInfos(ctx sdk.Context) []types.FeeInfo {
197197
infos := make([]types.FeeInfo, 0)
198198

199199
iterator := storetypes.KVStorePrefixIterator(store, []byte{})
200-
defer iterator.Close()
200+
err := iterator.Close()
201+
if err != nil {
202+
k.Logger(ctx).Error(err.Error())
203+
}
201204

202205
for ; iterator.Valid(); iterator.Next() {
203206
var info types.FeeInfo

x/tax/keeper/params.go

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -38,42 +38,27 @@ func (k Keeper) SetParams(ctx context.Context, params types.Params) error {
3838

3939
// FeeRate returns the fee rate.
4040
func (k Keeper) FeeRate(ctx context.Context) int32 {
41-
store := k.storeService.OpenKVStore(ctx)
42-
43-
b, err := store.Get(types.ParamsKey)
41+
p, err := k.GetParams(ctx)
4442
if err != nil {
4543
return 0
4644
}
47-
48-
var p types.Params
49-
k.cdc.Unmarshal(b, &p)
5045
return p.FeeRate
5146
}
5247

5348
// TreasuryAddress returns the contract address.
5449
func (k Keeper) TreasuryAddress(ctx context.Context) string {
55-
store := k.storeService.OpenKVStore(ctx)
56-
57-
b, err := store.Get(types.ParamsKey)
50+
p, err := k.GetParams(ctx)
5851
if err != nil {
5952
return ""
6053
}
61-
62-
var p types.Params
63-
k.cdc.Unmarshal(b, &p)
6454
return p.TreasuryAddress
6555
}
6656

6757
// BaseDenom returns the base denom.
6858
func (k Keeper) BaseDenom(ctx context.Context) string {
69-
store := k.storeService.OpenKVStore(ctx)
70-
71-
b, err := store.Get(types.ParamsKey)
59+
p, err := k.GetParams(ctx)
7260
if err != nil {
7361
return ""
7462
}
75-
76-
var p types.Params
77-
k.cdc.Unmarshal(b, &p)
7863
return p.BaseDenom
7964
}

0 commit comments

Comments
 (0)