Merge branch 'main' into prototype

Uniswap · Feb 12, 2024 · ce42619 · ce42619
2 parents a2e085f + 94362ca
commit ce42619
Show file tree

Hide file tree

Showing 5 changed files with 55 additions and 2 deletions.
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -0,0 +1,28 @@
+name: Lint
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+
+jobs:
+  run-linters:
+    name: lint
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Check out Git repository
+        uses: actions/checkout@v2
+
+      - name: Set up node
+        uses: actions/setup-node@v3
+        with:
+          node-version: 18.x
+          registry-url: https://registry.npmjs.org
+
+      - name: Install dependencies
+        run: yarn install --frozen-lockfile
+
+      - name: Run linters
+        run: yarn lint
diff --git a/lib/handlers/quote/injector.ts b/lib/handlers/quote/injector.ts
@@ -7,8 +7,8 @@ import {
   BETA_COMPLIANCE_S3_KEY,
   BETA_S3_KEY,
   COMPLIANCE_CONFIG_BUCKET,
-  PRODUCTION_S3_KEY,
   PROD_COMPLIANCE_S3_KEY,
+  PRODUCTION_S3_KEY,
   WEBHOOK_CONFIG_BUCKET,
 } from '../../constants';
 import { AWSMetricsLogger, UniswapXParamServiceMetricDimension } from '../../entities/aws-metrics-logger';

diff --git a/lib/providers/analytics/firehose.ts b/lib/providers/analytics/firehose.ts
@@ -1,8 +1,8 @@
 import { FirehoseClient, PutRecordCommand } from '@aws-sdk/client-firehose';
 import { default as Logger } from 'bunyan';
 
-import { IAnalyticsLogger } from '.';
 import { AnalyticsEvent } from '../../entities/analytics-events';
+import { IAnalyticsLogger } from '.';
 
 export class FirehoseLogger implements IAnalyticsLogger {
   private log: Logger;

diff --git a/test/handlers/quote/handler.test.ts b/test/handlers/quote/handler.test.ts
@@ -302,10 +302,16 @@ describe('Quote handler', () => {
           hash: '0xuni',
         },
       ]);
+<<<<<<< HEAD
       const circuitBreakerProvider = new MockCircuitBreakerConfigurationProvider(
         ['0xuni', 'google'],
         FILLER_TIMESTAMPS
       );
+=======
+      const circuitBreakerProvider = new MockCircuitBreakerConfigurationProvider([
+        { hash: '0xuni', fadeRate: 0.02, enabled: true },
+      ]);
+>>>>>>> main
       const quoters = [
         new WebhookQuoter(
           logger,
@@ -359,10 +365,16 @@ describe('Quote handler', () => {
       const webhookProvider = new MockWebhookConfigurationProvider([
         { name: 'uniswap', endpoint: 'https://uniswap.org', headers: {}, hash: '0xuni' },
       ]);
+<<<<<<< HEAD
       const circuitBreakerProvider = new MockCircuitBreakerConfigurationProvider(
         ['0xuni', 'google'],
         FILLER_TIMESTAMPS
       );
+=======
+      const circuitBreakerProvider = new MockCircuitBreakerConfigurationProvider([
+        { hash: '0xuni', fadeRate: 0.02, enabled: true },
+      ]);
+>>>>>>> main
       const quoters = [
         new WebhookQuoter(
           logger,
@@ -394,10 +406,16 @@ describe('Quote handler', () => {
       const webhookProvider = new MockWebhookConfigurationProvider([
         { name: 'uniswap', endpoint: 'https://uniswap.org', headers: {}, hash: '0xuni' },
       ]);
+<<<<<<< HEAD
       const circuitBreakerProvider = new MockCircuitBreakerConfigurationProvider(
         ['0xuni', 'google'],
         FILLER_TIMESTAMPS
       );
+=======
+      const circuitBreakerProvider = new MockCircuitBreakerConfigurationProvider([
+        { hash: '0xuni', fadeRate: 0.02, enabled: true },
+      ]);
+>>>>>>> main
       const quoters = [
         new WebhookQuoter(
           logger,
@@ -603,6 +621,7 @@ describe('Quote handler', () => {
         })
       );
     });
+<<<<<<< HEAD
 
     it('only calls eligible fillers', async () => {
       const webhookProvider = new MockWebhookConfigurationProvider([
@@ -640,5 +659,7 @@ describe('Quote handler', () => {
         expect.anything()
       );
     });
+=======
+>>>>>>> main
   });
 });
diff --git a/test/providers/quoters/WebhookQuoter.test.ts b/test/providers/quoters/WebhookQuoter.test.ts
@@ -177,12 +177,16 @@ describe('WebhookQuoter tests', () => {
         data: quote,
       });
     });
+<<<<<<< HEAD
 
     const cbProvider = new MockCircuitBreakerConfigurationProvider(
       ['0xuni'],
       new Map([['0xuni', { lastPostTimestamp: 100, blockUntilTimestamp: NaN }]])
     );
 
+=======
+    const cbProvider = new MockCircuitBreakerConfigurationProvider([{ hash: '0xuni', fadeRate: 0.05, enabled: true }]);
+>>>>>>> main
     const quoter = new WebhookQuoter(
       logger,
       mockFirehoseLogger,