change order and update test

Signed-off-by: Chengxuan Xing <[email protected]>

Author: Chengxuan

internal/ethereum/confirmation_reconciler.go

@@ -59,12 +59,6 @@ func (bl *blockListener) reconcileConfirmationsForTransaction(ctx context.Contex
 // compareAndUpdateConfirmationQueue orchestrates the confirmation reconciliation process.
 // It builds new confirmations from the in-memory partial chain and fills gaps in the confirmation queue.
 func (bl *blockListener) compareAndUpdateConfirmationQueue(ctx context.Context, reconcileResult *ffcapi.ConfirmationUpdateResult, txBlockInfo *ffcapi.MinimalBlockInfo, targetConfirmationCount uint64) (*ffcapi.ConfirmationUpdateResult, error) {
-	var err error
-	// Build new confirmations from the in-memory partial chain and get existing confirmations
-	newConfirmationsWithoutTxBlock, lastValidatedBlock, err := bl.buildConfirmationQueueUsingInMemoryPartialChain(ctx, txBlockInfo, targetConfirmationCount)
-	if err != nil {
-		return nil, err
-	}
 
 	// Initialize confirmation map and get existing confirmations
 	// the init must happen after the in-memory partial chain check to avoid
@@ -92,6 +86,13 @@ func (bl *blockListener) compareAndUpdateConfirmationQueue(ctx context.Context,
 		}
 	}
 
+	var err error
+	// Build new confirmations from the in-memory partial chain and get existing confirmations
+	newConfirmationsWithoutTxBlock, lastValidatedBlock, err := bl.buildConfirmationQueueUsingInMemoryPartialChain(ctx, txBlockInfo, targetConfirmationCount)
+	if err != nil {
+		return nil, err
+	}
+
 	// Special case: if targetConfirmationCount is 0, transaction is immediately confirmed
 	if targetConfirmationCount == 0 {
 		reconcileResult.Confirmations = []*ffcapi.MinimalBlockInfo{txBlockInfo}