Address code rabbit suggestions.

dydxprotocol · Nov 28, 2023 · f82c8a1 · f82c8a1
1 parent 77a5255
commit f82c8a1
Show file tree

Hide file tree

Showing 28 changed files with 16 additions and 72 deletions.
diff --git a/indexer/services/ender/__tests__/handlers/asset-handler.test.ts b/indexer/services/ender/__tests__/handlers/asset-handler.test.ts
@@ -1,4 +1,3 @@
-import { stats } from '@dydxprotocol-indexer/base';
 import {
   AssetCreateEventV1,
   IndexerTendermintBlock,
@@ -41,9 +40,6 @@ describe('assetHandler', () => {
   beforeAll(async () => {
     await dbHelpers.migrate();
     await createPostgresFunctions();
-    jest.spyOn(stats, 'increment');
-    jest.spyOn(stats, 'timing');
-    jest.spyOn(stats, 'gauge');
   });
 
   beforeEach(async () => {

diff --git a/indexer/services/ender/__tests__/handlers/funding-handler.test.ts b/indexer/services/ender/__tests__/handlers/funding-handler.test.ts
@@ -1,4 +1,3 @@
-import { stats } from '@dydxprotocol-indexer/base';
 import {
   FundingEventV1,
   FundingEventV1_Type,
@@ -47,9 +46,6 @@ describe('fundingHandler', () => {
   beforeAll(async () => {
     await dbHelpers.migrate();
     await createPostgresFunctions();
-    jest.spyOn(stats, 'increment');
-    jest.spyOn(stats, 'timing');
-    jest.spyOn(stats, 'gauge');
   });
 
   beforeEach(async () => {

diff --git a/indexer/services/ender/__tests__/handlers/liquidity-tier-handler.test.ts b/indexer/services/ender/__tests__/handlers/liquidity-tier-handler.test.ts
@@ -1,4 +1,3 @@
-import { stats } from '@dydxprotocol-indexer/base';
 import {
   IndexerTendermintBlock,
   IndexerTendermintEvent,
@@ -44,9 +43,6 @@ describe('liquidityTierHandler', () => {
   beforeAll(async () => {
     await dbHelpers.migrate();
     await createPostgresFunctions();
-    jest.spyOn(stats, 'increment');
-    jest.spyOn(stats, 'timing');
-    jest.spyOn(stats, 'gauge');
   });
 
   beforeEach(async () => {

diff --git a/indexer/services/ender/__tests__/handlers/order-fills/liquidation-handler.test.ts b/indexer/services/ender/__tests__/handlers/order-fills/liquidation-handler.test.ts
@@ -1,6 +1,4 @@
-import {
-  logger, stats,
-} from '@dydxprotocol-indexer/base';
+import { logger } from '@dydxprotocol-indexer/base';
 import {
   IndexerTendermintBlock, IndexerTendermintEvent, Timestamp,
   LiquidationOrderV1,
@@ -91,9 +89,6 @@ describe('LiquidationHandler', () => {
   beforeAll(async () => {
     await dbHelpers.migrate();
     await createPostgresFunctions();
-    jest.spyOn(stats, 'increment');
-    jest.spyOn(stats, 'timing');
-    jest.spyOn(stats, 'gauge');
   });
 
   beforeEach(async () => {

diff --git a/indexer/services/ender/__tests__/handlers/order-fills/order-handler.test.ts b/indexer/services/ender/__tests__/handlers/order-fills/order-handler.test.ts
@@ -1,4 +1,4 @@
-import { logger, stats } from '@dydxprotocol-indexer/base';
+import { logger } from '@dydxprotocol-indexer/base';
 import {
   IndexerOrder,
   IndexerOrder_Side,
@@ -92,9 +92,6 @@ describe('OrderHandler', () => {
   beforeAll(async () => {
     await dbHelpers.migrate();
     await createPostgresFunctions();
-    jest.spyOn(stats, 'increment');
-    jest.spyOn(stats, 'timing');
-    jest.spyOn(stats, 'gauge');
   });
 
   beforeEach(async () => {

diff --git a/indexer/services/ender/__tests__/handlers/perpetual-market-handler.test.ts b/indexer/services/ender/__tests__/handlers/perpetual-market-handler.test.ts
@@ -1,4 +1,3 @@
-import { stats } from '@dydxprotocol-indexer/base';
 import {
   PerpetualMarketCreateEventV1,
   IndexerTendermintBlock,
@@ -45,9 +44,6 @@ describe('perpetualMarketHandler', () => {
   beforeAll(async () => {
     await dbHelpers.migrate();
     await createPostgresFunctions();
-    jest.spyOn(stats, 'increment');
-    jest.spyOn(stats, 'timing');
-    jest.spyOn(stats, 'gauge');
   });
 
   beforeEach(async () => {

diff --git a/...vices/ender/__tests__/handlers/stateful-order/conditional-order-placement-handler.test.ts b/...vices/ender/__tests__/handlers/stateful-order/conditional-order-placement-handler.test.ts
@@ -38,7 +38,6 @@ import {
   expectOrderSubaccountKafkaMessage,
 } from '../../helpers/indexer-proto-helpers';
 import { getPrice, getSize, getTriggerPrice } from '../../../src/lib/helper';
-import { stats } from '@dydxprotocol-indexer/base';
 import { STATEFUL_ORDER_ORDER_FILL_EVENT_TYPE } from '../../../src/constants';
 import { ORDER_FLAG_CONDITIONAL } from '@dydxprotocol-indexer/v4-proto-parser';
 import Long from 'long';
@@ -50,9 +49,6 @@ describe('conditionalOrderPlacementHandler', () => {
   beforeAll(async () => {
     await dbHelpers.migrate();
     await createPostgresFunctions();
-    jest.spyOn(stats, 'increment');
-    jest.spyOn(stats, 'timing');
-    jest.spyOn(stats, 'gauge');
   });
 
   beforeEach(async () => {

diff --git a/...vices/ender/__tests__/handlers/stateful-order/conditional-order-triggered-handler.test.ts b/...vices/ender/__tests__/handlers/stateful-order/conditional-order-triggered-handler.test.ts
@@ -32,7 +32,6 @@ import {
   createIndexerTendermintEvent,
   expectVulcanKafkaMessage,
 } from '../../helpers/indexer-proto-helpers';
-import { stats } from '@dydxprotocol-indexer/base';
 import { STATEFUL_ORDER_ORDER_FILL_EVENT_TYPE } from '../../../src/constants';
 import { producer } from '@dydxprotocol-indexer/kafka';
 import { ORDER_FLAG_CONDITIONAL } from '@dydxprotocol-indexer/v4-proto-parser';
@@ -44,9 +43,6 @@ describe('conditionalOrderTriggeredHandler', () => {
   beforeAll(async () => {
     await dbHelpers.migrate();
     await createPostgresFunctions();
-    jest.spyOn(stats, 'increment');
-    jest.spyOn(stats, 'timing');
-    jest.spyOn(stats, 'gauge');
   });
 
   beforeEach(async () => {

diff --git a/...services/ender/__tests__/handlers/stateful-order/stateful-order-placement-handler.test.ts b/...services/ender/__tests__/handlers/stateful-order/stateful-order-placement-handler.test.ts
@@ -40,7 +40,6 @@ import {
 } from '../../helpers/indexer-proto-helpers';
 import { StatefulOrderPlacementHandler } from '../../../src/handlers/stateful-order/stateful-order-placement-handler';
 import { getPrice, getSize } from '../../../src/lib/helper';
-import { stats } from '@dydxprotocol-indexer/base';
 import { STATEFUL_ORDER_ORDER_FILL_EVENT_TYPE } from '../../../src/constants';
 import { producer } from '@dydxprotocol-indexer/kafka';
 import { ORDER_FLAG_LONG_TERM } from '@dydxprotocol-indexer/v4-proto-parser';
@@ -50,9 +49,6 @@ describe('statefulOrderPlacementHandler', () => {
   beforeAll(async () => {
     await dbHelpers.migrate();
     await createPostgresFunctions();
-    jest.spyOn(stats, 'increment');
-    jest.spyOn(stats, 'timing');
-    jest.spyOn(stats, 'gauge');
   });
 
   beforeEach(async () => {

diff --git a/...r/services/ender/__tests__/handlers/stateful-order/stateful-order-removal-handler.test.ts b/...r/services/ender/__tests__/handlers/stateful-order/stateful-order-removal-handler.test.ts
@@ -31,7 +31,6 @@ import {
   expectVulcanKafkaMessage,
 } from '../../helpers/indexer-proto-helpers';
 import { StatefulOrderRemovalHandler } from '../../../src/handlers/stateful-order/stateful-order-removal-handler';
-import { stats } from '@dydxprotocol-indexer/base';
 import { STATEFUL_ORDER_ORDER_FILL_EVENT_TYPE } from '../../../src/constants';
 import { producer } from '@dydxprotocol-indexer/kafka';
 import { createPostgresFunctions } from '../../../src/helpers/postgres/postgres-functions';
@@ -40,9 +39,6 @@ describe('statefulOrderRemovalHandler', () => {
   beforeAll(async () => {
     await dbHelpers.migrate();
     await createPostgresFunctions();
-    jest.spyOn(stats, 'increment');
-    jest.spyOn(stats, 'timing');
-    jest.spyOn(stats, 'gauge');
   });
 
   beforeEach(async () => {

diff --git a/indexer/services/ender/__tests__/handlers/subaccount-update-handler.test.ts b/indexer/services/ender/__tests__/handlers/subaccount-update-handler.test.ts
@@ -1,4 +1,3 @@
-import { stats } from '@dydxprotocol-indexer/base';
 import {
   IndexerTendermintBlock,
   IndexerTendermintEvent,
@@ -64,9 +63,6 @@ describe('subaccountUpdateHandler', () => {
   beforeAll(async () => {
     await dbHelpers.migrate();
     await createPostgresFunctions();
-    jest.spyOn(stats, 'increment');
-    jest.spyOn(stats, 'timing');
-    jest.spyOn(stats, 'gauge');
   });
 
   beforeEach(async () => {

diff --git a/indexer/services/ender/__tests__/handlers/transfer-handler.test.ts b/indexer/services/ender/__tests__/handlers/transfer-handler.test.ts
@@ -1,7 +1,6 @@
 import {
   logger,
   ParseMessageError,
-  stats,
 } from '@dydxprotocol-indexer/base';
 import {
   IndexerTendermintBlock,
@@ -56,9 +55,6 @@ describe('transferHandler', () => {
   beforeAll(async () => {
     await dbHelpers.migrate();
     await createPostgresFunctions();
-    jest.spyOn(stats, 'increment');
-    jest.spyOn(stats, 'timing');
-    jest.spyOn(stats, 'gauge');
   });
 
   beforeEach(async () => {

diff --git a/indexer/services/ender/__tests__/handlers/update-clob-pair-handler.test.ts b/indexer/services/ender/__tests__/handlers/update-clob-pair-handler.test.ts
@@ -1,4 +1,3 @@
-import { stats } from '@dydxprotocol-indexer/base';
 import {
   PerpetualMarketFromDatabase,
   PerpetualMarketTable,
@@ -38,9 +37,6 @@ describe('update-clob-pair-handler', () => {
   beforeAll(async () => {
     await dbHelpers.migrate();
     await createPostgresFunctions();
-    jest.spyOn(stats, 'increment');
-    jest.spyOn(stats, 'timing');
-    jest.spyOn(stats, 'gauge');
   });
 
   beforeEach(async () => {

diff --git a/indexer/services/ender/__tests__/handlers/update-perpetual-handler.test.ts b/indexer/services/ender/__tests__/handlers/update-perpetual-handler.test.ts
@@ -1,4 +1,3 @@
-import { stats } from '@dydxprotocol-indexer/base';
 import {
   PerpetualMarketFromDatabase,
   PerpetualMarketTable,
@@ -37,9 +36,6 @@ describe('update-perpetual-handler', () => {
   beforeAll(async () => {
     await dbHelpers.migrate();
     await createPostgresFunctions();
-    jest.spyOn(stats, 'increment');
-    jest.spyOn(stats, 'timing');
-    jest.spyOn(stats, 'gauge');
   });
 
   beforeEach(async () => {

diff --git a/indexer/services/ender/src/handlers/asset-handler.ts b/indexer/services/ender/src/handlers/asset-handler.ts
@@ -28,7 +28,7 @@ export class AssetCreationHandler extends Handler<AssetCreateEventV1> {
       { txId: this.txId },
     ).catch((error: Error) => {
       logger.error({
-        at: 'AssetCreationHandler#handleViaSqlFunction',
+        at: 'AssetCreationHandler#internalHandle',
         message: 'Failed to handle AssetCreateEventV1',
         error,
       });

diff --git a/indexer/services/ender/src/handlers/funding-handler.ts b/indexer/services/ender/src/handlers/funding-handler.ts
@@ -65,7 +65,7 @@ export class FundingHandler extends Handler<FundingEventMessage> {
       { txId: this.txId },
     ).catch((error: Error) => {
       logger.error({
-        at: 'FundingHandler#handleViaSqlFunction',
+        at: 'FundingHandler#internalHandle',
         message: 'Failed to handle FundingEventV1',
         error,
       });

diff --git a/indexer/services/ender/src/handlers/liquidity-tier-handler.ts b/indexer/services/ender/src/handlers/liquidity-tier-handler.ts
@@ -32,7 +32,7 @@ export class LiquidityTierHandler extends Handler<LiquidityTierUpsertEventV1> {
       { txId: this.txId },
     ).catch((error: Error) => {
       logger.error({
-        at: 'LiquidityTierHandler#handleViaSqlFunction',
+        at: 'LiquidityTierHandler#internalHandle',
         message: 'Failed to handle LiquidityTierUpsertEventV1',
         error,
       });

diff --git a/indexer/services/ender/src/handlers/markets/market-create-handler.ts b/indexer/services/ender/src/handlers/markets/market-create-handler.ts
@@ -34,7 +34,7 @@ export class MarketCreateHandler extends Handler<MarketEventV1> {
       { txId: this.txId },
     ).catch((error: Error) => {
       logger.error({
-        at: 'MarketCreateHandler#handleViaSqlFunction',
+        at: 'MarketCreateHandler#internalHandle',
         message: 'Failed to handle MarketEventV1',
         error,
       });

diff --git a/indexer/services/ender/src/handlers/markets/market-modify-handler.ts b/indexer/services/ender/src/handlers/markets/market-modify-handler.ts
@@ -31,7 +31,7 @@ export class MarketModifyHandler extends Handler<MarketEventV1> {
       { txId: this.txId },
     ).catch((error: Error) => {
       logger.error({
-        at: 'MarketModifyHandler#handleViaSqlFunction',
+        at: 'MarketModifyHandler#internalHandle',
         message: 'Failed to handle MarketEventV1',
         error,
       });

diff --git a/indexer/services/ender/src/handlers/markets/market-price-update-handler.ts b/indexer/services/ender/src/handlers/markets/market-price-update-handler.ts
@@ -41,7 +41,7 @@ export class MarketPriceUpdateHandler extends Handler<MarketEventV1> {
       { txId: this.txId },
     ).catch((error: Error) => {
       logger.error({
-        at: 'MarketPriceUpdateHandler#handleViaSqlFunction',
+        at: 'MarketPriceUpdateHandler#internalHandle',
         message: 'Failed to handle MarketEventV1',
         error,
       });

diff --git a/indexer/services/ender/src/handlers/order-fills/deleveraging-handler.ts b/indexer/services/ender/src/handlers/order-fills/deleveraging-handler.ts
@@ -65,7 +65,7 @@ export class DeleveragingHandler extends AbstractOrderFillHandler<DeleveragingEv
       { txId: this.txId },
     ).catch((error: Error) => {
       logger.error({
-        at: 'DeleveragingHandler#handleViaSqlFunction',
+        at: 'DeleveragingHandler#internalHandle',
         message: 'Failed to handle DeleveragingEventV1',
         error,
       });

diff --git a/indexer/services/ender/src/handlers/order-fills/liquidation-handler.ts b/indexer/services/ender/src/handlers/order-fills/liquidation-handler.ts
@@ -115,7 +115,7 @@ export class LiquidationHandler extends AbstractOrderFillHandler<OrderFillWithLi
       { txId: this.txId },
     ).catch((error: Error) => {
       logger.error({
-        at: 'liquidationHandler#handleViaSqlFunction',
+        at: 'liquidationHandler#internalHandle',
         message: 'Failed to handle OrderFillEventV1',
         error,
       });

diff --git a/indexer/services/ender/src/handlers/order-fills/order-handler.ts b/indexer/services/ender/src/handlers/order-fills/order-handler.ts
@@ -102,7 +102,7 @@ export class OrderHandler extends AbstractOrderFillHandler<OrderFillWithLiquidit
       { txId: this.txId },
     ).catch((error: Error) => {
       logger.error({
-        at: 'orderHandler#handleViaSqlFunction',
+        at: 'orderHandler#internalHandle',
         message: 'Failed to handle OrderFillEventV1',
         error,
       });

diff --git a/indexer/services/ender/src/handlers/perpetual-market-handler.ts b/indexer/services/ender/src/handlers/perpetual-market-handler.ts
@@ -28,7 +28,7 @@ export class PerpetualMarketCreationHandler extends Handler<PerpetualMarketCreat
       { txId: this.txId },
     ).catch((error: Error) => {
       logger.error({
-        at: 'PerpetualMarketCreationHandler#handleViaSqlFunction',
+        at: 'PerpetualMarketCreationHandler#internalHandle',
         message: 'Failed to handle PerpetualMarketCreateEventV1',
         error,
       });

diff --git a/indexer/services/ender/src/handlers/subaccount-update-handler.ts b/indexer/services/ender/src/handlers/subaccount-update-handler.ts
@@ -53,7 +53,7 @@ export class SubaccountUpdateHandler extends Handler<SubaccountUpdate> {
     { txId: this.txId },
     ).catch((error: Error) => {
       logger.error({
-        at: 'subaccountUpdateHandler#handleViaSqlFunction',
+        at: 'subaccountUpdateHandler#internalHandle',
         message: 'Failed to handle SubaccountUpdateEventV1',
         error,
       });

diff --git a/indexer/services/ender/src/handlers/transfer-handler.ts b/indexer/services/ender/src/handlers/transfer-handler.ts
@@ -41,7 +41,7 @@ export class TransferHandler extends Handler<TransferEventV1> {
       { txId: this.txId },
     ).catch((error: Error) => {
       logger.error({
-        at: 'TransferHandler#handleViaSqlFunction',
+        at: 'TransferHandler#internalHandle',
         message: 'Failed to handle TransferEventV1',
         error,
       });

diff --git a/indexer/services/ender/src/handlers/update-clob-pair-handler.ts b/indexer/services/ender/src/handlers/update-clob-pair-handler.ts
@@ -29,7 +29,7 @@ export class UpdateClobPairHandler extends Handler<UpdateClobPairEventV1> {
       { txId: this.txId },
     ).catch((error: Error) => {
       logger.error({
-        at: 'UpdateClobPairHandler#handleViaSqlFunction',
+        at: 'UpdateClobPairHandler#internalHandle',
         message: 'Failed to handle UpdateClobPairEventV1',
         error,
       });

diff --git a/indexer/services/ender/src/handlers/update-perpetual-handler.ts b/indexer/services/ender/src/handlers/update-perpetual-handler.ts
@@ -29,7 +29,7 @@ export class UpdatePerpetualHandler extends Handler<UpdatePerpetualEventV1> {
       { txId: this.txId },
     ).catch((error: Error) => {
       logger.error({
-        at: 'UpdatePerpetualHandler#handleViaSqlFunction',
+        at: 'UpdatePerpetualHandler#internalHandle',
         message: 'Failed to handle UpdatePerpetualEventV1',
         error,
       });