Add perpetual market refresher to roundtable

dydxprotocol · Nov 19, 2024 · 3a3e3c5 · 3a3e3c5
1 parent d16654c
commit 3a3e3c5
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 25 deletions.
diff --git a/indexer/services/roundtable/__tests__/tasks/cache-orderbook-mid-prices.test.ts b/indexer/services/roundtable/__tests__/tasks/cache-orderbook-mid-prices.test.ts
@@ -4,6 +4,7 @@ import {
   PerpetualMarketTable,
   testConstants,
   testMocks,
+  perpetualMarketRefresher,
 } from '@dydxprotocol-indexer/postgres';
 import {
   OrderbookLevelsCache,
@@ -17,6 +18,7 @@ describe('cache-orderbook-mid-prices', () => {
   beforeEach(async () => {
     await redis.deleteAllAsync(redisClient);
     await testMocks.seedData();
+    await perpetualMarketRefresher.updatePerpetualMarkets();
   });
 
   afterAll(() => {
@@ -30,6 +32,7 @@ describe('cache-orderbook-mid-prices', () => {
 
   afterEach(async () => {
     await dbHelpers.clearData();
+    await perpetualMarketRefresher.clear();
   });
 
   it('caches mid prices for all markets', async () => {
@@ -41,36 +44,30 @@ describe('cache-orderbook-mid-prices', () => {
       .findByMarketId(
         testConstants.defaultMarket2.id,
       );
-    if (!market1) {
-      throw new Error('Market 1 not found');
-    }
-    if (!market2) {
-      throw new Error('Market 2 not found');
+    const market3 = await PerpetualMarketTable
+      .findByMarketId(
+        testConstants.defaultMarket3.id,
+      );
+    if (!market1 || !market2 || !market3) {
+      throw new Error('Test market not found');
     }
 
-    jest.spyOn(PerpetualMarketTable, 'findAll')
-      .mockReturnValueOnce(Promise.resolve([
-        market1,
-        // Passing market2 twice so that it will call getOrderbookMidPrice twice and
-        // cache the last two prices from the mock below
-        market2,
-        market2,
-      ] as PerpetualMarketFromDatabase[]));
-
     jest.spyOn(OrderbookLevelsCache, 'getOrderBookMidPrice')
       .mockReturnValueOnce(Promise.resolve('200'))
       .mockReturnValueOnce(Promise.resolve('300'))
       .mockReturnValueOnce(Promise.resolve('400'));
 
     await runTask();
+    expect(OrderbookLevelsCache.getOrderBookMidPrice).toHaveBeenCalledTimes(5);
 
     const prices = await OrderbookMidPricesCache.getMedianPrices(
       redisClient,
-      [market1.ticker, market2.ticker],
+      [market1.ticker, market2.ticker, market3.ticker],
     );
 
     expect(prices[market1.ticker]).toBe('200');
-    expect(prices[market2.ticker]).toBe('350');
+    expect(prices[market2.ticker]).toBe('300');
+    expect(prices[market3.ticker]).toBe('400');
   });
 
   it('handles undefined prices', async () => {

diff --git a/indexer/services/roundtable/src/tasks/cache-orderbook-mid-prices.ts b/indexer/services/roundtable/src/tasks/cache-orderbook-mid-prices.ts
@@ -2,7 +2,8 @@ import {
   logger,
 } from '@dydxprotocol-indexer/base';
 import {
-  PerpetualMarketTable,
+  PerpetualMarketFromDatabase,
+  perpetualMarketRefresher,
 } from '@dydxprotocol-indexer/postgres';
 import {
   OrderbookMidPricesCache,
@@ -14,14 +15,10 @@ import { redisClient } from '../helpers/redis';
  * Updates OrderbookMidPricesCache with current orderbook mid price for each market
  */
 export default async function runTask(): Promise<void> {
-  const marketTickers: string[] = (await PerpetualMarketTable.findAll(
-    {},
-    [],
-    { readReplica: true },
-  )).map((market) => {
-    return market.ticker;
-  });
-
+  const perpetualMarkets = Object.values(perpetualMarketRefresher.getPerpetualMarketsMap());
+  const marketTickers = perpetualMarkets.map(
+    (market: PerpetualMarketFromDatabase) => market.ticker,
+  );
   try {
     logger.info({
       at: 'cache-orderbook-mid-prices#runTask',