move endblock logic to keeper

Author: RogerKSI

x/feeds/abci.go

@@ -1,39 +1,12 @@
 package feeds
 
 import (
-	"fmt"
-
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
 	"github.com/bandprotocol/chain/v2/x/feeds/keeper"
-	"github.com/bandprotocol/chain/v2/x/feeds/types"
 )
 
 // HandleEndBlock is a handler function for the EndBlock ABCI request.
 func HandleEndBlock(ctx sdk.Context, k keeper.Keeper) {
-	feeds := k.GetSupportedFeedsByPower(ctx)
-	for _, feed := range feeds {
-		price, err := k.CalculatePrice(ctx, feed)
-		if err != nil {
-			ctx.EventManager().EmitEvent(
-				sdk.NewEvent(
-					types.EventTypeCalculatePriceFailed,
-					sdk.NewAttribute(types.AttributeKeySignalID, feed.SignalID),
-					sdk.NewAttribute(types.AttributeKeyErrorMessage, err.Error()),
-				),
-			)
-			continue
-		}
-
-		k.SetPrice(ctx, price)
-
-		ctx.EventManager().EmitEvent(
-			sdk.NewEvent(
-				types.EventTypeUpdatePrice,
-				sdk.NewAttribute(types.AttributeKeySignalID, price.SignalID),
-				sdk.NewAttribute(types.AttributeKeyPrice, fmt.Sprintf("%d", price.Price)),
-				sdk.NewAttribute(types.AttributeKeyTimestamp, fmt.Sprintf("%d", price.Timestamp)),
-			),
-		)
-	}
+	k.CalculatePrices(ctx)
 }

x/feeds/keeper/keeper_price.go

@@ -1,6 +1,8 @@
 package keeper
 
 import (
+	"fmt"
+
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
 
@@ -63,6 +65,35 @@ func (k Keeper) DeletePrice(ctx sdk.Context, signalID string) {
 	ctx.KVStore(k.storeKey).Delete(types.PriceStoreKey(signalID))
 }
 
+// CalculatePrices calculates final prices for all supported feeds.
+func (k Keeper) CalculatePrices(ctx sdk.Context) {
+	feeds := k.GetSupportedFeedsByPower(ctx)
+	for _, feed := range feeds {
+		price, err := k.CalculatePrice(ctx, feed)
+		if err != nil {
+			ctx.EventManager().EmitEvent(
+				sdk.NewEvent(
+					types.EventTypeCalculatePriceFailed,
+					sdk.NewAttribute(types.AttributeKeySignalID, feed.SignalID),
+					sdk.NewAttribute(types.AttributeKeyErrorMessage, err.Error()),
+				),
+			)
+			continue
+		}
+
+		k.SetPrice(ctx, price)
+
+		ctx.EventManager().EmitEvent(
+			sdk.NewEvent(
+				types.EventTypeUpdatePrice,
+				sdk.NewAttribute(types.AttributeKeySignalID, price.SignalID),
+				sdk.NewAttribute(types.AttributeKeyPrice, fmt.Sprintf("%d", price.Price)),
+				sdk.NewAttribute(types.AttributeKeyTimestamp, fmt.Sprintf("%d", price.Timestamp)),
+			),
+		)
+	}
+}
+
 // CalculatePrice calculates final price from price-validator and punish validators those did not report.
 func (k Keeper) CalculatePrice(ctx sdk.Context, feed types.Feed) (types.Price, error) {
 	var priceFeedInfos []types.PriceFeedInfo