Merge pull request #371 from Uniswap/allsettled

fix: use allSettled instead so that we dont throw
Uniswap · Aug 28, 2024 · 443eb84 · 443eb84
2 parents cfa10d5 + 96d6366
commit 443eb84
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/lib/constants.ts b/lib/constants.ts
@@ -34,3 +34,6 @@ export const DYNAMO_TABLE_KEY = {
 export const POST_ORDER_ERROR_REASON = {
   INSUFFICIENT_FUNDS: 'Onchain validation failed: InsufficientFunds',
 };
+
+export const WEBHOOK_TIMEOUT_MS = 500;
+export const NOTIFICATION_TIMEOUT_MS = 10;
diff --git a/lib/quoters/WebhookQuoter.ts b/lib/quoters/WebhookQuoter.ts
@@ -5,6 +5,7 @@ import Logger from 'bunyan';
 import { v4 as uuidv4 } from 'uuid';
 
 import { Quoter, QuoterType } from '.';
+import { NOTIFICATION_TIMEOUT_MS, WEBHOOK_TIMEOUT_MS } from '../constants';
 import {
   AnalyticsEvent,
   AnalyticsEventType,
@@ -22,9 +23,6 @@ import { FillerComplianceConfigurationProvider } from '../providers/compliance';
 import { FillerAddressRepository } from '../repositories/filler-address-repository';
 import { timestampInMstoISOString } from '../util/time';
 
-// TODO: shorten, maybe take from env config
-const WEBHOOK_TIMEOUT_MS = 500;
-
 // Quoter which fetches quotes from http endpoints
 // endpoints must return well-formed QuoteResponse JSON
 export class WebhookQuoter implements Quoter {
@@ -60,7 +58,7 @@ export class WebhookQuoter implements Quoter {
     const quotes = await Promise.all(enabledEndpoints.map((e) => this.fetchQuote(e, request)));
 
     // should not await and block
-    Promise.all(disabledEndpoints.map((e) => this.notifyBlock(e)));
+    Promise.allSettled(disabledEndpoints.map((e) => this.notifyBlock(e)));
 
     return quotes.filter((q) => q !== null) as QuoteResponse[];
   }
@@ -310,9 +308,8 @@ export class WebhookQuoter implements Quoter {
   }
 
   private async notifyBlock(status: { webhook: WebhookConfiguration; blockUntil: number }): Promise<void> {
-    const timeoutOverride = status.webhook.overrides?.timeout;
     const axiosConfig = {
-      timeout: timeoutOverride ? Number(timeoutOverride) : WEBHOOK_TIMEOUT_MS,
+      timeout: NOTIFICATION_TIMEOUT_MS,
       ...(!!status.webhook.headers && { headers: status.webhook.headers }),
     };
     try {

diff --git a/test/providers/quoters/WebhookQuoter.test.ts b/test/providers/quoters/WebhookQuoter.test.ts
@@ -2,6 +2,7 @@ import { TradeType } from '@uniswap/sdk-core';
 import axios from 'axios';
 import { BigNumber, ethers } from 'ethers';
 
+import { NOTIFICATION_TIMEOUT_MS } from '../../../lib/constants';
 import { AnalyticsEventType, QuoteRequest, WebhookResponseType } from '../../../lib/entities';
 import { MockWebhookConfigurationProvider, ProtocolVersion } from '../../../lib/providers';
 import { FirehoseLogger } from '../../../lib/providers/analytics';
@@ -262,7 +263,7 @@ describe('WebhookQuoter tests', () => {
         },
         {
           headers: {},
-          timeout: 500,
+          timeout: NOTIFICATION_TIMEOUT_MS,
         }
       );
     });
@@ -306,10 +307,11 @@ describe('WebhookQuoter tests', () => {
         });
 
       await webhookQuoter.quote(request);
+      // blocked
       expect(mockedAxios.post).toBeCalledWith(
         WEBHOOK_URL_ONEINCH,
         { blockUntilTimestamp: expect.any(Number) },
-        { headers: {}, timeout: 500 }
+        { headers: {}, timeout: NOTIFICATION_TIMEOUT_MS }
       );
       expect(mockedAxios.post).toBeCalledWith(
         WEBHOOK_URL_SEARCHER,