fix: address review comments - delegate RunWithErrors and rollback listener changes

- RunWithErrors now delegates to RunWithErrorsContext(context.Background(), ...)
  instead of duplicating the retry loop, keeping a single source of truth
- Revert Listener.OnStatus back to RunWithContext as requested by reviewer;
  the repo wants to retry on all error types including unknown status
- Remove TestOnStatus_UnknownStatusTerminatesWithoutRetry which tested the
  reverted behaviour

Signed-off-by: Rama542 <Rama542@users.noreply.github.com>

Author: Rama542

token/services/ttx/finality/listener.go

@@ -93,19 +93,13 @@ func (t *Listener) OnStatus(ctx context.Context, txID string, status int, messag
 	start := time.Now()
 	newCtx, span := t.tracer.Start(ctx, "on_status")
 	defer span.End()
-	if err := t.retryRunner.RunWithErrorsContext(newCtx, func() (bool, error) {
+	if err := t.retryRunner.RunWithContext(newCtx, func() error {
 		err := t.runOnStatus(newCtx, txID, status, message, tokenRequestHash)
 		if err != nil {
 			t.logger.Errorf("finality listener on [%s] failed with error: [%+v], retrying...", txID, err)
-			// An unrecognized status is a permanent error — retrying will never succeed.
-			if status != network.Valid && status != network.Invalid {
-				return true, err
-			}
-
-			return false, err
 		}
 
-		return true, nil
+		return err
 	}); err != nil {
 		t.logger.Errorf("finality listener on [%s] failed with error: [%+v], stop.", txID, err)
 	}

token/services/ttx/finality/listener_test.go

@@ -214,30 +214,6 @@ func TestOnStatus_StatusSetToDeletedForInvalidTx(t *testing.T) {
 		"an Invalid network status should map to Deleted in local storage")
 }
 
-// TestOnStatus_UnknownStatusTerminatesWithoutRetry verifies that an unrecognized
-// network status causes OnStatus to stop immediately without retrying.
-// With RunWithErrorsContext, permanent errors (unknown status) return (true, err)
-// so the retry loop exits after a single attempt.
-func TestOnStatus_UnknownStatusTerminatesWithoutRetry(t *testing.T) {
-	var setCalls atomic.Int32
-	db := &mock.TransactionDB{}
-	db.SetStatusCalls(func(_ context.Context, _ string, _ storage.TxStatus, _ string) error {
-		setCalls.Add(1)
-
-		return nil
-	})
-	l := newTestListener(t, db)
-
-	// Status 99 is not network.Valid or network.Invalid — it hits the default branch
-	// in runOnStatus and returns a permanent error that must not be retried.
-	start := time.Now()
-	l.OnStatus(t.Context(), "tx1", 99, "unknown", nil)
-	elapsed := time.Since(start)
-
-	assert.Equal(t, int32(0), setCalls.Load(), "SetStatus should never be called for an unknown status")
-	assert.Less(t, elapsed, 500*time.Millisecond, "OnStatus should return immediately for permanent errors, not spin through retries")
-}
-
 // TestOnError tests the OnError callback
 func TestOnError(t *testing.T) {
 	ctx := t.Context()

token/services/utils/retry.go

@@ -109,25 +109,7 @@ func (f *retryRunner) RunWithContext(ctx context.Context, runner func() error) e
 // If it returns true, then the error or nil will be returned.
 // If it returns maxTimes false, then it will always return an error: either a join of all errors it encountered or a ErrMaxRetriesExceeded.
 func (f *retryRunner) RunWithErrors(runner func() (bool, error)) error {
-	errs := make([]error, 0)
-	var delay time.Duration
-	for i := 0; f.maxTimes < 0 || i < f.maxTimes; i++ {
-		terminate, err := runner()
-		if terminate {
-			return err
-		}
-		if err != nil {
-			errs = append(errs, err)
-		}
-		delay = f.nextDelay(delay)
-		f.logger.Warnf("Will retry iteration [%d] after a delay of [%v]. %d errors returned so far", i+1, delay, len(errs))
-		time.Sleep(delay)
-	}
-	if len(errs) == 0 {
-		return ErrMaxRetriesExceeded
-	}
-
-	return errors.Join(errs...)
+	return f.RunWithErrorsContext(context.Background(), runner)
 }
 
 // RunWithErrorsContext retries until runner() returns true, ctx is canceled, or maxTimes