reflect no mo

archway-network · Oct 9, 2023 · 5139235 · 5139235
1 parent 0b21325
commit 5139235
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 11 deletions.
diff --git a/x/rewards/keeper/min_cons_fee.go b/x/rewards/keeper/min_cons_fee.go
@@ -1,8 +1,7 @@
 package keeper
 
 import (
-	"reflect"
-	"strings"
+	"math"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
@@ -17,22 +16,19 @@ func (k Keeper) UpdateMinConsensusFee(ctx sdk.Context, inflationRewards sdk.Coin
 		k.Logger(ctx).Info("Minimum consensus fee update skipped: inflation rewards are zero")
 		return
 	}
+
 	inflationRewardsAmt := sdk.NewDecFromInt(inflationRewards.Amount)
 
 	blockGasLimit := ctx.BlockGasMeter().Limit()
-	if strings.Contains(reflect.TypeOf(ctx.BlockGasMeter()).String(), "infiniteGasMeter") { // Because thisss https://github.com/cosmos/cosmos-sdk/pull/9651
-		blockGasLimit = 0
-	}
-
-	blockGasLimitAsDec := pkg.NewDecFromUint64(blockGasLimit)
-	if blockGasLimitAsDec.IsZero() {
+	if blockGasLimit == math.MaxUint64 { // Because thisss https://github.com/cosmos/cosmos-sdk/pull/9651
 		k.Logger(ctx).Info("Minimum consensus fee update skipped: block gas limit is not set")
 		return
 	}
 
 	txFeeRebateRatio := k.TxFeeRebateRatio(ctx)
 
 	// Calculate
+	blockGasLimitAsDec := pkg.NewDecFromUint64(blockGasLimit)
 	feeAmt := calculateMinConsensusFeeAmt(inflationRewardsAmt, blockGasLimitAsDec, txFeeRebateRatio)
 	if feeAmt.IsZero() || feeAmt.IsNegative() {
 		k.Logger(ctx).Info("Minimum consensus fee update skipped: calculated amount is zero or bellow zero")

diff --git a/x/rewards/keeper/tracking.go b/x/rewards/keeper/tracking.go
@@ -1,8 +1,7 @@
 package keeper
 
 import (
-	"reflect"
-	"strings"
+	"math"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
@@ -22,7 +21,7 @@ func (k Keeper) TrackFeeRebatesRewards(ctx sdk.Context, rewards sdk.Coins) {
 // TrackInflationRewards creates a new inflation reward record for the current block.
 func (k Keeper) TrackInflationRewards(ctx sdk.Context, rewards sdk.Coin) {
 	blockGasLimit := ctx.BlockGasMeter().Limit()
-	if strings.Contains(reflect.TypeOf(ctx.BlockGasMeter()).String(), "infiniteGasMeter") { // Because thisss https://github.com/cosmos/cosmos-sdk/pull/9651
+	if ctx.BlockGasMeter().Limit() == math.MaxUint64 { // Because thisss https://github.com/cosmos/cosmos-sdk/pull/9651
 		blockGasLimit = 0
 	}