misc cleanup

Author: baileympearson

src/sessions.ts

@@ -788,22 +788,11 @@ export class ClientSession
             await this.commitTransaction();
             committed = true;
           } catch (commitError) {
+            // If CSOT is enabled, we repeatedly retry until timeoutMS expires.
+            // If CSOT is not enabled, do we still have time remaining or have we timed out?
             const hasNotTimedOut =
               this.timeoutContext?.csotEnabled() || now() - startTime < MAX_TIMEOUT;
 
-            /**
-             * will the provided backoffMS exceed the withTransaction's deadline?
-             */
-            const willExceedTransactionDeadline = (backoffMS: number) => {
-              return (
-                (this.timeoutContext?.csotEnabled() &&
-                  backoffMS > this.timeoutContext.remainingTimeMS) ||
-                now() + backoffMS > startTime + MAX_TIMEOUT
-              );
-            };
-
-            // If CSOT is enabled, we repeatedly retry until timeoutMS expires.
-            // If CSOT is not enabled, do we still have time remaining or have we timed out?
             if (hasNotTimedOut) {
               if (
                 !isMaxTimeMSExpiredError(commitError) &&
@@ -826,7 +815,12 @@ export class ClientSession
                 const backoffMS =
                   jitter * Math.min(BACKOFF_INITIAL_MS * 1.5 ** retry, BACKOFF_MAX_MS);
 
-                if (willExceedTransactionDeadline(backoffMS)) {
+                const willExceedTransactionDeadline =
+                  (this.timeoutContext?.csotEnabled() &&
+                    backoffMS > this.timeoutContext.remainingTimeMS) ||
+                  now() + backoffMS > startTime + MAX_TIMEOUT;
+
+                if (willExceedTransactionDeadline) {
                   break;
                 }
 
@@ -841,6 +835,7 @@ export class ClientSession
         }
       }
 
+      // @ts-expect-error Result is always defined if we reach here, the for-loop above convinces TS it is not.
       return result;
     } finally {
       this.timeoutContext = null;