refactor: optimize epoch info kvstore calls

osmosis-labs · Jan 17, 2024 · bf777a4 · bf777a4
1 parent 1801752
commit bf777a4
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 12 deletions.
diff --git a/x/feeabs/ante/decorate.go b/x/feeabs/ante/decorate.go
@@ -247,9 +247,8 @@ func (famfd FeeAbstrationMempoolFeeDecorator) AnteHandle(ctx sdk.Context, tx sdk
 		// TODO: Support more fee token in feeRequired for fee-abstraction
 		if feeCoinsNonZeroDenom.Len() == 1 {
 			feeDenom := feeCoinsNonZeroDenom.GetDenomByIndex(0)
-			hasHostChainConfig := famfd.feeabsKeeper.HasHostZoneConfig(ctx, feeDenom)
-			if hasHostChainConfig {
-				hostChainConfig, _ := famfd.feeabsKeeper.GetHostZoneConfig(ctx, feeDenom)
+			hostChainConfig, found := famfd.feeabsKeeper.GetHostZoneConfig(ctx, feeDenom)
+			if found {
 				nativeCoinsFees, err := famfd.feeabsKeeper.CalculateNativeFromIBCCoins(ctx, feeCoins, hostChainConfig)
 				if err != nil {
 					return ctx, sdkerrors.Wrapf(errorstypes.ErrInsufficientFee, "insufficient fees")

diff --git a/x/feeabs/keeper/epoch.go b/x/feeabs/keeper/epoch.go
@@ -18,18 +18,18 @@ func (k Keeper) HasEpochInfo(ctx sdk.Context, identifier string) bool {
 }
 
 // GetEpochInfo returns epoch info by identifier.
-func (k Keeper) GetEpochInfo(ctx sdk.Context, identifier string) types.EpochInfo {
+func (k Keeper) GetEpochInfo(ctx sdk.Context, identifier string) (types.EpochInfo, bool) {
 	epoch := types.EpochInfo{}
 	store := ctx.KVStore(k.storeKey)
 	b := store.Get(append(types.KeyPrefixEpoch, []byte(identifier)...))
 	if b == nil {
-		return epoch
+		return epoch, false
 	}
 	err := proto.Unmarshal(b, &epoch)
 	if err != nil {
 		panic(err)
 	}
-	return epoch
+	return epoch, true
 }
 
 // AddEpochInfo adds a new epoch info. Will return an error if the epoch fails validation,
@@ -41,7 +41,7 @@ func (k Keeper) AddEpochInfo(ctx sdk.Context, epoch types.EpochInfo) error {
 		return err
 	}
 	// Check if identifier already exists
-	if (k.GetEpochInfo(ctx, epoch.Identifier) != types.EpochInfo{}) {
+	if k.HasEpochInfo(ctx, epoch.Identifier) {
 		return fmt.Errorf("epoch with identifier %s already exists", epoch.Identifier)
 	}
 

diff --git a/x/feeabs/keeper/ibc.go b/x/feeabs/keeper/ibc.go
@@ -257,14 +257,12 @@ func (k Keeper) executeTransferMsg(ctx sdk.Context, transferMsg *transfertypes.M
 }
 
 func (k Keeper) handleOsmosisIbcQuery(ctx sdk.Context) error {
-	hasQueryEpochInfo := k.HasEpochInfo(ctx, types.DefaultQueryEpochIdentifier)
-	if !hasQueryEpochInfo {
+	// set startTime for query twap
+	queryTwapEpochInfo, found := k.GetEpochInfo(ctx, types.DefaultQueryEpochIdentifier)
+	if !found {
 		k.Logger(ctx).Error(fmt.Sprintf("Don't have query epoch information: %s", types.DefaultQueryEpochIdentifier))
 		return nil
 	}
-
-	// set startTime for query twap
-	queryTwapEpochInfo := k.GetEpochInfo(ctx, types.DefaultQueryEpochIdentifier)
 	startTime := ctx.BlockTime().Add(-queryTwapEpochInfo.Duration)
 	k.Logger(ctx).Info(fmt.Sprintf("Start time: %v", startTime.Unix()))