refactor(sequencer): organize ifs in the sequencer loop (#1244)

0xPolygonHermez · Sep 27, 2024 · 5b5cacb · 5b5cacb
1 parent b650ff6
commit 5b5cacb
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/zk/stages/stage_sequence_execute.go b/zk/stages/stage_sequence_execute.go
@@ -325,7 +325,12 @@ func sequencingStageStep(
 					if err != nil {
 						return err
 					}
-				} else if !batchState.isL1Recovery() && !batchState.isResequence() {
+				} else if batchState.isResequence() {
+					batchState.blockState.transactionsForInclusion, err = batchState.resequenceBatchJob.YieldNextBlockTransactions(zktx.DecodeTx)
+					if err != nil {
+						return err
+					}
+				} else if !batchState.isL1Recovery() {
 					var allConditionsOK bool
 					batchState.blockState.transactionsForInclusion, allConditionsOK, err = getNextPoolTransactions(ctx, cfg, executionAt, batchState.forkId, batchState.yieldedTransactions)
 					if err != nil {
@@ -341,11 +346,6 @@ func sequencingStageStep(
 					} else {
 						log.Trace(fmt.Sprintf("[%s] Yielded transactions from the pool", logPrefix), "txCount", len(batchState.blockState.transactionsForInclusion))
 					}
-				} else if batchState.isResequence() {
-					batchState.blockState.transactionsForInclusion, err = batchState.resequenceBatchJob.YieldNextBlockTransactions(zktx.DecodeTx)
-					if err != nil {
-						return err
-					}
 				}
 
 				if len(batchState.blockState.transactionsForInclusion) == 0 {