remove market enum from FillsType (#788)

dydxprotocol · Nov 10, 2023 · 197f530 · 197f530
1 parent 9f30cf5
commit 197f530
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 17 deletions.
diff --git a/indexer/packages/postgres/__tests__/helpers/constants.ts b/indexer/packages/postgres/__tests__/helpers/constants.ts
@@ -355,7 +355,7 @@ export const defaultFill: FillCreateObject = {
   subaccountId: defaultSubaccountId,
   side: OrderSide.BUY,
   liquidity: Liquidity.TAKER,
-  type: FillType.MARKET,
+  type: FillType.LIMIT,
   clobPairId: '1',
   orderId: defaultOrderId,
   size: '10',

diff --git a/...ges/postgres/src/db/migrations/migration_files/20231110103241_remove_market_fills_type.ts b/...ges/postgres/src/db/migrations/migration_files/20231110103241_remove_market_fills_type.ts
@@ -0,0 +1,19 @@
+import * as Knex from 'knex';
+
+import { formatAlterTableEnumSql } from '../helpers';
+
+export async function up(knex: Knex): Promise<void> {
+  return knex.raw(formatAlterTableEnumSql(
+    'fills',
+    'type',
+    ['LIMIT', 'LIQUIDATED', 'LIQUIDATION', 'DELEVERAGED', 'OFFSETTING'],
+  ));
+}
+
+export async function down(knex: Knex): Promise<void> {
+  return knex.raw(formatAlterTableEnumSql(
+    'fills',
+    'type',
+    ['MARKET', 'LIMIT', 'LIQUIDATED', 'LIQUIDATION', 'DELEVERAGED', 'OFFSETTING'],
+  ));
+}
diff --git a/indexer/packages/postgres/src/types/fill-types.ts b/indexer/packages/postgres/src/types/fill-types.ts
@@ -14,8 +14,6 @@ export enum Liquidity {
 }
 
 export enum FillType {
-  // MARKET is the fill type for a fill with a market taker order.
-  MARKET = 'MARKET',
   // LIMIT is the fill type for a fill with a limit taker order.
   LIMIT = 'LIMIT',
   // LIQUIDATED is for the taker side of the fill where the subaccount was liquidated.

diff --git a/indexer/services/comlink/public/api-documentation.md b/indexer/services/comlink/public/api-documentation.md
@@ -618,7 +618,7 @@ fetch('https://indexer.v4testnet.dydx.exchange/v4/fills?address=string&subaccoun
       "id": "string",
       "side": "BUY",
       "liquidity": "TAKER",
-      "type": "MARKET",
+      "type": "LIMIT",
       "market": "string",
       "marketType": "PERPETUAL",
       "price": "string",
@@ -1639,7 +1639,7 @@ fetch('https://indexer.v4testnet.dydx.exchange/v4/trades/perpetualMarket/{ticker
       "side": "BUY",
       "size": "string",
       "price": "string",
-      "type": "MARKET",
+      "type": "LIMIT",
       "createdAt": "string",
       "createdAtHeight": "string"
     }
@@ -2270,7 +2270,7 @@ This operation does not require authentication
 <a id="tocsfilltype"></a>
 
 ```json
-"MARKET"
+"LIMIT"
 
 ```
 
@@ -2284,7 +2284,6 @@ This operation does not require authentication
 
 |Property|Value|
 |---|---|
-|*anonymous*|MARKET|
 |*anonymous*|LIMIT|
 |*anonymous*|LIQUIDATED|
 |*anonymous*|LIQUIDATION|
@@ -2328,7 +2327,7 @@ This operation does not require authentication
   "id": "string",
   "side": "BUY",
   "liquidity": "TAKER",
-  "type": "MARKET",
+  "type": "LIMIT",
   "market": "string",
   "marketType": "PERPETUAL",
   "price": "string",
@@ -2374,7 +2373,7 @@ This operation does not require authentication
       "id": "string",
       "side": "BUY",
       "liquidity": "TAKER",
-      "type": "MARKET",
+      "type": "LIMIT",
       "market": "string",
       "marketType": "PERPETUAL",
       "price": "string",
@@ -3063,7 +3062,7 @@ or
   "side": "BUY",
   "size": "string",
   "price": "string",
-  "type": "MARKET",
+  "type": "LIMIT",
   "createdAt": "string",
   "createdAtHeight": "string"
 }
@@ -3097,7 +3096,7 @@ or
       "side": "BUY",
       "size": "string",
       "price": "string",
-      "type": "MARKET",
+      "type": "LIMIT",
       "createdAt": "string",
       "createdAtHeight": "string"
     }

diff --git a/indexer/services/comlink/public/swagger.json b/indexer/services/comlink/public/swagger.json
@@ -301,7 +301,6 @@
       },
       "FillType": {
         "enum": [
-          "MARKET",
           "LIMIT",
           "LIQUIDATED",
           "LIQUIDATION",

diff --git a/indexer/services/comlink/public/websocket-documentation.md b/indexer/services/comlink/public/websocket-documentation.md
@@ -251,8 +251,6 @@ export enum Liquidity {
 }
 
 export enum FillType {
-  // MARKET is the fill type for a fill with a market taker order.
-  MARKET = 'MARKET',
   // LIMIT is the fill type for a fill with a limit taker order.
   LIMIT = 'LIMIT',
   // LIQUIDATED is for the taker side of the fill where the subaccount was liquidated.
@@ -752,7 +750,7 @@ interface TradeContent {
         "price": "27837",
         "side": "SELL",
         "createdAt": "2023-04-04T00:29:19.353Z",
-        "type": "MARKET"
+        "type": "LIMIT"
       },
       {
         "id": "dd1088b5-5cab-518f-a59c-4d5f735ab861",

diff --git a/indexer/services/ender/__tests__/helpers/constants.ts b/indexer/services/ender/__tests__/helpers/constants.ts
@@ -325,7 +325,7 @@ export const defaultTradeContent: TradeContent = {
   price: '10000',
   side: 'BUY',
   createdAt: 'createdAt',
-  type: FillType.MARKET,
+  type: FillType.LIMIT,
 };
 export const defaultTradeMessage: SingleTradeMessage = contentToSingleTradeMessage(
   defaultTradeContent,

diff --git a/indexer/services/ender/__tests__/lib/kafka-publisher.test.ts b/indexer/services/ender/__tests__/lib/kafka-publisher.test.ts
@@ -241,7 +241,7 @@ describe('kafka-publisher', () => {
       subaccountId: testConstants.defaultSubaccountId,
       side: OrderSide.BUY,
       liquidity: Liquidity.TAKER,
-      type: FillType.MARKET,
+      type: FillType.LIMIT,
       clobPairId: '1',
       orderId: testConstants.defaultOrderId,
       size: '10',