handle error for ExecuteParamUpdate

ojo-network · Oct 23, 2023 · 2d53c86 · 2d53c86
1 parent 90646aa
commit 2d53c86
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/x/oracle/abci.go b/x/oracle/abci.go
@@ -19,7 +19,9 @@ func EndBlocker(ctx sdk.Context, k keeper.Keeper) error {
 	plans := k.GetParamUpdatePlans(ctx)
 	for _, plan := range plans {
 		if plan.ShouldExecute(ctx) {
-			k.ExecuteParamUpdatePlan(ctx, plan)
+			if err := k.ExecuteParamUpdatePlan(ctx, plan); err != nil {
+				return err
+			}
 		}
 	}
 

diff --git a/x/oracle/keeper/param_update_plan.go b/x/oracle/keeper/param_update_plan.go
@@ -131,7 +131,7 @@ func (k Keeper) ValidateParamChanges(ctx sdk.Context, keys []string, changes typ
 
 // ExecuteParamUpdatePlan will execute a given param update plan and emit a param
 // update event.
-func (k Keeper) ExecuteParamUpdatePlan(ctx sdk.Context, plan types.ParamUpdatePlan) {
+func (k Keeper) ExecuteParamUpdatePlan(ctx sdk.Context, plan types.ParamUpdatePlan) error {
 	for _, key := range plan.Keys {
 		switch key {
 		case string(types.KeyVotePeriod):
@@ -181,12 +181,12 @@ func (k Keeper) ExecuteParamUpdatePlan(ctx sdk.Context, plan types.ParamUpdatePl
 		}
 	}
 
-	// clear plan from store after executing it
-	k.ClearParamUpdatePlan(ctx, uint64(plan.Height))
-
 	event := sdk.NewEvent(
 		types.EventParamUpdate,
 		sdk.NewAttribute(types.AttributeKeyNotifyPriceFeeder, "1"),
 	)
 	ctx.EventManager().EmitEvent(event)
+
+	// clear plan from store after executing it
+	return k.ClearParamUpdatePlan(ctx, uint64(plan.Height))
 }