address cmts

dydxprotocol · Nov 9, 2023 · 863c2ee · 863c2ee
1 parent a2a6d12
commit 863c2ee
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 37 deletions.
diff --git a/indexer/services/ender/__tests__/handlers/order-fills/deleveraging-handler.test.ts b/indexer/services/ender/__tests__/handlers/order-fills/deleveraging-handler.test.ts
@@ -41,7 +41,6 @@ import {
 } from '../../helpers/indexer-proto-helpers';
 import { DydxIndexerSubtypes } from '../../../src/lib/types';
 import {
-  DELEVERAGING_EVENT_TYPE,
   MILLIS_IN_NANOS,
   SECONDS_IN_MILLIS,
   SUBACCOUNT_ORDER_FILL_EVENT_TYPE,
@@ -165,14 +164,10 @@ describe('DeleveragingHandler', () => {
     expect(handler.getParallelizationIds()).toEqual([
       `${handler.eventType}_${offsettingSubaccountUuid}_${perpetualMarket!.clobPairId}`,
       `${handler.eventType}_${deleveragedSubaccountUuid}_${perpetualMarket!.clobPairId}`,
-      // To ensure that SubaccountUpdateEvents and OrderFillEvents for the same subaccount are not
-      // processed in parallel
+      // To ensure that SubaccountUpdateEvents, OrderFillEvents, and DeleveragingEvents for
+      // the same subaccount are not processed in parallel
       `${SUBACCOUNT_ORDER_FILL_EVENT_TYPE}_${offsettingSubaccountUuid}`,
       `${SUBACCOUNT_ORDER_FILL_EVENT_TYPE}_${deleveragedSubaccountUuid}`,
-      // To ensure that StatefulOrderEvents and OrderFillEvents for the same order are not
-      // processed in parallel
-      `${DELEVERAGING_EVENT_TYPE}_${offsettingSubaccountUuid}`,
-      `${DELEVERAGING_EVENT_TYPE}_${deleveragedSubaccountUuid}`,
     ]);
   });
 
@@ -298,13 +293,8 @@ describe('DeleveragingHandler', () => {
           deleveragedPerpetualPosition.openEventId,
         ),
         {
-          sumOpen: Big(deleveragedPerpetualPosition.size).plus(totalFilled).toFixed(),
-          entryPrice: getWeightedAverage(
-            deleveragedPerpetualPosition.entryPrice!,
-            deleveragedPerpetualPosition.size,
-            price,
-            totalFilled,
-          ),
+          sumClose: Big(totalFilled).toFixed(),
+          exitPrice: price,
         },
       ),
     ]);

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
@@ -40,7 +40,6 @@ import {
 import { KafkaMessage } from 'kafkajs';
 import { DateTime } from 'luxon';
 import {
-  DELEVERAGING_EVENT_TYPE,
   MILLIS_IN_NANOS,
   SECONDS_IN_MILLIS,
   STATEFUL_ORDER_ORDER_FILL_EVENT_TYPE,
@@ -200,9 +199,6 @@ describe('LiquidationHandler', () => {
       if (orderId !== undefined) {
         parallelizationIds.push(`${STATEFUL_ORDER_ORDER_FILL_EVENT_TYPE}_${orderId}`);
       }
-      parallelizationIds.push(
-        `${DELEVERAGING_EVENT_TYPE}_${SubaccountTable.subaccountIdToUuid(subaccountId)}`,
-      );
       expect(handler.getParallelizationIds()).toEqual(parallelizationIds);
     });
   });

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
@@ -42,7 +42,6 @@ import {
 import { KafkaMessage } from 'kafkajs';
 import { DateTime } from 'luxon';
 import {
-  DELEVERAGING_EVENT_TYPE,
   MILLIS_IN_NANOS,
   SECONDS_IN_MILLIS,
   STATEFUL_ORDER_ORDER_FILL_EVENT_TYPE,
@@ -198,7 +197,6 @@ describe('OrderHandler', () => {
         `${handler.eventType}_${SubaccountTable.subaccountIdToUuid(subaccountId)}_${defaultOrderEvent.makerOrder!.orderId!.clobPairId}`,
         `${SUBACCOUNT_ORDER_FILL_EVENT_TYPE}_${SubaccountTable.subaccountIdToUuid(subaccountId)}`,
         `${STATEFUL_ORDER_ORDER_FILL_EVENT_TYPE}_${orderUuid}`,
-        `${DELEVERAGING_EVENT_TYPE}_${SubaccountTable.subaccountIdToUuid(subaccountId)}`,
       ]);
     });
   });

diff --git a/indexer/services/ender/src/handlers/order-fills/deleveraging-handler.ts b/indexer/services/ender/src/handlers/order-fills/deleveraging-handler.ts
@@ -13,7 +13,7 @@ import {
 import { DeleveragingEventV1 } from '@dydxprotocol-indexer/v4-protos';
 import * as pg from 'pg';
 
-import { DELEVERAGING_EVENT_TYPE, SUBACCOUNT_ORDER_FILL_EVENT_TYPE } from '../../constants';
+import { SUBACCOUNT_ORDER_FILL_EVENT_TYPE } from '../../constants';
 import { indexerTendermintEventToTransactionIndex } from '../../lib/helper';
 import { ConsolidatedKafkaEvent } from '../../lib/types';
 import { AbstractOrderFillHandler } from './abstract-order-fill-handler';

diff --git a/indexer/services/ender/src/handlers/order-fills/liquidation-handler.ts b/indexer/services/ender/src/handlers/order-fills/liquidation-handler.ts
@@ -25,11 +25,7 @@ import Long from 'long';
 import * as pg from 'pg';
 
 import config from '../../config';
-import {
-  DELEVERAGING_EVENT_TYPE,
-  STATEFUL_ORDER_ORDER_FILL_EVENT_TYPE,
-  SUBACCOUNT_ORDER_FILL_EVENT_TYPE,
-} from '../../constants';
+import { STATEFUL_ORDER_ORDER_FILL_EVENT_TYPE, SUBACCOUNT_ORDER_FILL_EVENT_TYPE } from '../../constants';
 import { convertPerpetualPosition } from '../../helpers/kafka-helper';
 import { redisClient } from '../../helpers/redis/redis-controller';
 import {
@@ -78,9 +74,6 @@ export class LiquidationHandler extends AbstractOrderFillHandler<OrderFillWithLi
         // To ensure that SubaccountUpdateEvents and OrderFillEvents for the same subaccount are not
         // processed in parallel
         `${SUBACCOUNT_ORDER_FILL_EVENT_TYPE}_${subaccountUuid}`,
-        // To ensure that DeleveragingEvents for the same subaccount are not
-        // processed in parallel
-        `${DELEVERAGING_EVENT_TYPE}_${subaccountUuid}`,
         // We do not need to add the StatefulOrderEvent parallelizationId here, because liquidation
         // fills have no order in postgres
       ];

diff --git a/indexer/services/ender/src/handlers/order-fills/order-handler.ts b/indexer/services/ender/src/handlers/order-fills/order-handler.ts
@@ -25,11 +25,7 @@ import Long from 'long';
 import * as pg from 'pg';
 
 import config from '../../config';
-import {
-  DELEVERAGING_EVENT_TYPE,
-  STATEFUL_ORDER_ORDER_FILL_EVENT_TYPE,
-  SUBACCOUNT_ORDER_FILL_EVENT_TYPE,
-} from '../../constants';
+import { STATEFUL_ORDER_ORDER_FILL_EVENT_TYPE, SUBACCOUNT_ORDER_FILL_EVENT_TYPE } from '../../constants';
 import { convertPerpetualPosition } from '../../helpers/kafka-helper';
 import { redisClient } from '../../helpers/redis/redis-controller';
 import { orderFillWithLiquidityToOrderFillEventWithOrder } from '../../helpers/translation-helper';
@@ -61,9 +57,6 @@ export class OrderHandler extends AbstractOrderFillHandler<OrderFillWithLiquidit
       // To ensure that StatefulOrderEvents and OrderFillEvents for the same order are not
       // processed in parallel
       `${STATEFUL_ORDER_ORDER_FILL_EVENT_TYPE}_${orderUuid}`,
-      // To ensure that DeleveragingEvents for the same subaccount are not
-      // processed in parallel
-      `${DELEVERAGING_EVENT_TYPE}_${subaccountUuid}`,
     ];
   }