From 33f046a0697afdc67aebd5b47ad8c0cc2f863369 Mon Sep 17 00:00:00 2001 From: forcodedancing Date: Mon, 14 Aug 2023 10:58:46 +0800 Subject: [PATCH] format code --- x/payment/keeper/storage_fee_charge.go | 2 +- x/sp/keeper/sp_storage_price.go | 8 ++++---- x/sp/types/keys.go | 2 +- x/storage/keeper/keeper.go | 3 +-- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/x/payment/keeper/storage_fee_charge.go b/x/payment/keeper/storage_fee_charge.go index 07c22d5cd..67c9a0f6b 100644 --- a/x/payment/keeper/storage_fee_charge.go +++ b/x/payment/keeper/storage_fee_charge.go @@ -64,7 +64,7 @@ func (k Keeper) ApplyUserFlowsList(ctx sdk.Context, userFlowsList []types.UserFl if err != nil { return err } - } else { // frozen status, should be called in end block for stop serving (uncharge fee) or for bucket migration (charge fee) + } else { // frozen status, should be called in end block for stop serving (uncharge fee) err = k.applyFrozenUserFlows(ctx, userFlows, from, streamRecord) if err != nil { return err diff --git a/x/sp/keeper/sp_storage_price.go b/x/sp/keeper/sp_storage_price.go index 76e89d245..7d0464a6f 100644 --- a/x/sp/keeper/sp_storage_price.go +++ b/x/sp/keeper/sp_storage_price.go @@ -118,13 +118,13 @@ func (k Keeper) UpdateGlobalSpStorePrice(ctx sdk.Context) error { func (k Keeper) calculateMedian(prices []sdk.Dec) sdk.Dec { l := len(prices) sort.Slice(prices, func(i, j int) bool { return prices[i].LT(prices[j]) }) - var storeMedian sdk.Dec + var median sdk.Dec if l%2 == 0 { - storeMedian = prices[l/2-1].Add(prices[l/2]).QuoInt64(2) + median = prices[l/2-1].Add(prices[l/2]).QuoInt64(2) } else { - storeMedian = prices[l/2] + median = prices[l/2] } - return storeMedian + return median } func (k Keeper) GetGlobalSpStorePriceByTime(ctx sdk.Context, time int64) (val types.GlobalSpStorePrice, err error) { diff --git a/x/sp/types/keys.go b/x/sp/types/keys.go index 717f7d8af..2803cf3fc 100644 --- a/x/sp/types/keys.go +++ b/x/sp/types/keys.go @@ -105,7 +105,7 @@ func SpStoragePriceKey(spId uint32) []byte { } func ParseSpStoragePriceKey(key []byte) (spId uint32) { - spId = binary.BigEndian.Uint32(key[0:4]) + spId = binary.BigEndian.Uint32(key) return } diff --git a/x/storage/keeper/keeper.go b/x/storage/keeper/keeper.go index 5601a2fe5..b67604433 100644 --- a/x/storage/keeper/keeper.go +++ b/x/storage/keeper/keeper.go @@ -4,8 +4,6 @@ import ( "encoding/binary" "fmt" - paymenttypes "github.com/bnb-chain/greenfield/x/payment/types" - "cosmossdk.io/errors" sdkmath "cosmossdk.io/math" "github.com/cometbft/cometbft/libs/log" @@ -19,6 +17,7 @@ import ( gnfdtypes "github.com/bnb-chain/greenfield/types" "github.com/bnb-chain/greenfield/types/common" "github.com/bnb-chain/greenfield/types/resource" + paymenttypes "github.com/bnb-chain/greenfield/x/payment/types" permtypes "github.com/bnb-chain/greenfield/x/permission/types" sptypes "github.com/bnb-chain/greenfield/x/sp/types" "github.com/bnb-chain/greenfield/x/storage/types"