fix(util-retry): remove unnecessary input

aws · May 25, 2023 · 32f0a88 · 32f0a88
1 parent cdbe6a0
commit 32f0a88
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 15 deletions.
diff --git a/packages/util-retry/src/StandardRetryStrategy.spec.ts b/packages/util-retry/src/StandardRetryStrategy.spec.ts
@@ -43,7 +43,6 @@ describe(StandardRetryStrategy.name, () => {
       const retryToken = await retryStrategy.acquireInitialRetryToken(retryTokenScope);
       expect(retryToken).toEqual(
         createDefaultRetryToken({
-          availableCapacity: INITIAL_RETRY_TOKENS,
           retryDelay: DEFAULT_RETRY_DELAY_BASE,
           retryCount: 0,
         })

diff --git a/packages/util-retry/src/StandardRetryStrategy.ts b/packages/util-retry/src/StandardRetryStrategy.ts
@@ -29,7 +29,6 @@ export class StandardRetryStrategy implements RetryStrategyV2 {
 
   public async acquireInitialRetryToken(retryTokenScope: string): Promise<StandardRetryToken> {
     return createDefaultRetryToken({
-      availableCapacity: this.capacity,
       retryDelay: DEFAULT_RETRY_DELAY_BASE,
       retryCount: 0,
     });
@@ -55,10 +54,9 @@ export class StandardRetryStrategy implements RetryStrategyV2 {
       const capacityCost = this.getCapacityCost(errorType);
       this.capacity -= capacityCost;
       return createDefaultRetryToken({
-        availableCapacity: this.capacity,
         retryDelay,
         retryCount: token.getRetryCount() + 1,
-        lastRetryCost: capacityCost,
+        retryCost: capacityCost,
       });
     }
 

diff --git a/packages/util-retry/src/defaultRetryToken.spec.ts b/packages/util-retry/src/defaultRetryToken.spec.ts
@@ -1,4 +1,4 @@
-import { DEFAULT_RETRY_DELAY_BASE, INITIAL_RETRY_TOKENS, MAXIMUM_RETRY_DELAY } from "./constants";
+import { DEFAULT_RETRY_DELAY_BASE, MAXIMUM_RETRY_DELAY } from "./constants";
 import { createDefaultRetryToken } from "./defaultRetryToken";
 
 jest.mock("./defaultRetryBackoffStrategy");
@@ -7,7 +7,6 @@ describe("defaultRetryToken", () => {
   describe("getRetryCost", () => {
     it("is undefined before an error is encountered", () => {
       const retryToken = createDefaultRetryToken({
-        availableCapacity: INITIAL_RETRY_TOKENS,
         retryDelay: DEFAULT_RETRY_DELAY_BASE,
         retryCount: 0,
       });
@@ -16,10 +15,9 @@ describe("defaultRetryToken", () => {
 
     it("returns set value", () => {
       const retryToken = createDefaultRetryToken({
-        availableCapacity: INITIAL_RETRY_TOKENS,
         retryDelay: DEFAULT_RETRY_DELAY_BASE,
         retryCount: 0,
-        lastRetryCost: 25,
+        retryCost: 25,
       });
       expect(retryToken.getRetryCost()).toBe(25);
     });
@@ -29,7 +27,6 @@ describe("defaultRetryToken", () => {
     it("returns amount set when token is created", () => {
       const retryCount = 3;
       const retryToken = createDefaultRetryToken({
-        availableCapacity: INITIAL_RETRY_TOKENS,
         retryDelay: DEFAULT_RETRY_DELAY_BASE,
         retryCount,
       });
@@ -40,7 +37,6 @@ describe("defaultRetryToken", () => {
   describe("getRetryDelay", () => {
     it("returns initial delay", () => {
       const retryToken = createDefaultRetryToken({
-        availableCapacity: INITIAL_RETRY_TOKENS,
         retryDelay: DEFAULT_RETRY_DELAY_BASE,
         retryCount: 0,
       });
@@ -50,7 +46,6 @@ describe("defaultRetryToken", () => {
     describe(`caps retry delay at ${MAXIMUM_RETRY_DELAY / 1000} seconds`, () => {
       it("when value exceeded because of high delayBase", () => {
         const retryToken = createDefaultRetryToken({
-          availableCapacity: INITIAL_RETRY_TOKENS,
           retryDelay: DEFAULT_RETRY_DELAY_BASE * 1000,
           retryCount: 0,
         });

diff --git a/packages/util-retry/src/defaultRetryToken.ts b/packages/util-retry/src/defaultRetryToken.ts
@@ -8,16 +8,15 @@ import { MAXIMUM_RETRY_DELAY } from "./constants";
 export const createDefaultRetryToken = ({
   retryDelay,
   retryCount,
-  lastRetryCost,
+  retryCost,
 }: {
-  availableCapacity: number;
   retryDelay: number;
   retryCount: number;
-  lastRetryCost?: number;
+  retryCost?: number;
 }): StandardRetryToken => {
   const getRetryCount = (): number => retryCount;
   const getRetryDelay = (): number => Math.min(MAXIMUM_RETRY_DELAY, retryDelay);
-  const getRetryCost = (): number | undefined => lastRetryCost;
+  const getRetryCost = (): number | undefined => retryCost;
 
   return {
     getRetryCount,