clean up some unit tests

dydxprotocol · Aug 28, 2024 · 8f8400c · 8f8400c
1 parent c9e4411
commit 8f8400c
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 63 deletions.
diff --git a/indexer/services/comlink/__tests__/controllers/api/v4/transfers-controller.test.ts b/indexer/services/comlink/__tests__/controllers/api/v4/transfers-controller.test.ts
@@ -27,6 +27,13 @@ import {
 } from '@dydxprotocol-indexer/postgres/build/__tests__/helpers/constants';
 import Big from 'big.js';
 
+const defaultWallet = {
+  address: testConstants.defaultWalletAddress,
+  totalTradingRewards: '0',
+  totalVolume: '0',
+  isWhitelistAffiliate: false,
+};
+
 describe('transfers-controller#V4', () => {
   beforeAll(async () => {
     await dbHelpers.migrate();
@@ -53,12 +60,7 @@ describe('transfers-controller#V4', () => {
         createdAt: testConstants.createdDateTime.toISO(),
         createdAtHeight: testConstants.createdHeight,
       };
-      await WalletTable.create({
-        address: testConstants.defaultWalletAddress,
-        totalTradingRewards: '0',
-        totalVolume: '0',
-        isWhitelistAffiliate: false,
-      });
+      await WalletTable.create(defaultWallet);
       await Promise.all([
         TransferTable.create(testConstants.defaultTransfer),
         TransferTable.create(transfer2),
@@ -179,12 +181,7 @@ describe('transfers-controller#V4', () => {
         createdAt: testConstants.createdDateTime.toISO(),
         createdAtHeight: testConstants.createdHeight,
       };
-      await WalletTable.create({
-        address: testConstants.defaultWalletAddress,
-        totalTradingRewards: '0',
-        totalVolume: '0',
-        isWhitelistAffiliate: false,
-      });
+      await WalletTable.create(defaultWallet);
       await Promise.all([
         TransferTable.create(testConstants.defaultTransfer),
         TransferTable.create(transfer2),
@@ -462,12 +459,7 @@ describe('transfers-controller#V4', () => {
         createdAt: testConstants.createdDateTime.toISO(),
         createdAtHeight: testConstants.createdHeight,
       };
-      await WalletTable.create({
-        address: testConstants.defaultWalletAddress,
-        totalTradingRewards: '0',
-        totalVolume: '0',
-        isWhitelistAffiliate: false,
-      });
+      await WalletTable.create(defaultWallet);
       await Promise.all([
         TransferTable.create(testConstants.defaultTransfer),
         TransferTable.create(transfer2),
@@ -588,12 +580,7 @@ describe('transfers-controller#V4', () => {
         createdAt: testConstants.createdDateTime.toISO(),
         createdAtHeight: testConstants.createdHeight,
       };
-      await WalletTable.create({
-        address: testConstants.defaultWalletAddress,
-        totalTradingRewards: '0',
-        totalVolume: '0',
-        isWhitelistAffiliate: false,
-      });
+      await WalletTable.create(defaultWallet);
       await Promise.all([
         TransferTable.create(testConstants.defaultTransfer),
         TransferTable.create(transfer2),
@@ -743,12 +730,7 @@ describe('transfers-controller#V4', () => {
         createdAt: testConstants.createdDateTime.toISO(),
         createdAtHeight: testConstants.createdHeight,
       };
-      await WalletTable.create({
-        address: testConstants.defaultWalletAddress,
-        totalTradingRewards: '0',
-        totalVolume: '0',
-        isWhitelistAffiliate: false,
-      });
+      await WalletTable.create(defaultWallet);
       await Promise.all([
         TransferTable.create(testConstants.defaultTransfer),
         TransferTable.create(transfer2),
@@ -831,12 +813,7 @@ describe('transfers-controller#V4', () => {
         createdAt: createdDateTime.toISO(),
         createdAtHeight: createdHeight,
       };
-      await WalletTable.create({
-        address: testConstants.defaultWalletAddress,
-        totalTradingRewards: '0',
-        totalVolume: '0',
-        isWhitelistAffiliate: false,
-      });
+      await WalletTable.create(defaultWallet);
       await Promise.all([
         TransferTable.create(transferFromNonParent),
         TransferTable.create(transferToNonParent),

diff --git a/indexer/services/ender/__tests__/handlers/trading-rewards-handler.test.ts b/indexer/services/ender/__tests__/handlers/trading-rewards-handler.test.ts
@@ -30,6 +30,7 @@ import {
   defaultTime,
   defaultTradingRewardsEvent,
   defaultTxHash,
+  defaultWalletAddress,
 } from '../helpers/constants';
 import { updateBlockCache } from '../../src/caches/block-cache';
 import { createPostgresFunctions } from '../../src/helpers/postgres/postgres-functions';
@@ -38,6 +39,13 @@ import { intToSerializedInt } from '../helpers/conversion-helpers';
 
 const defaultTransactionIndex: number = -2; // end block
 
+const defaultWallet = {
+  address: defaultWalletAddress,
+  totalTradingRewards: testConversionHelpers.denomToHumanReadableConversion(0),
+  totalVolume: '0',
+  isWhitelistAffiliate: false,
+};
+
 describe('tradingRewardHandler', () => {
   beforeAll(async () => {
     await dbHelpers.migrate();
@@ -171,11 +179,10 @@ describe('tradingRewardHandler', () => {
     const wallet: WalletFromDatabase | undefined = await WalletTable.findById(
       testConstants.defaultWallet.address,
     );
+
     expect(wallet).toEqual({
-      address: testConstants.defaultWallet.address,
+      ...defaultWallet,
       totalTradingRewards: testConversionHelpers.denomToHumanReadableConversion(1_000_000_000),
-      totalVolume: '0',
-      isWhitelistAffiliate: false,
     });
   });
 
@@ -197,21 +204,17 @@ describe('tradingRewardHandler', () => {
     });
 
     await WalletTable.update({
-      address: testConstants.defaultWallet.address,
+      ...defaultWallet,
       totalTradingRewards: testConversionHelpers.denomToHumanReadableConversion(1_000_000_000),
-      totalVolume: '0',
-      isWhitelistAffiliate: false,
     });
 
     await onMessage(kafkaMessage);
     const wallet: WalletFromDatabase | undefined = await WalletTable.findById(
       testConstants.defaultWallet.address,
     );
     expect(wallet).toEqual({
-      address: testConstants.defaultWallet.address,
+      ...defaultWallet,
       totalTradingRewards: testConversionHelpers.denomToHumanReadableConversion(2_000_000_000),
-      totalVolume: '0',
-      isWhitelistAffiliate: false,
     });
   });
 });

diff --git a/indexer/services/ender/__tests__/handlers/transfer-handler.test.ts b/indexer/services/ender/__tests__/handlers/transfer-handler.test.ts
@@ -52,6 +52,13 @@ import {
 import { updateBlockCache } from '../../src/caches/block-cache';
 import { createPostgresFunctions } from '../../src/helpers/postgres/postgres-functions';
 
+const defaultWallet = {
+  address: defaultWalletAddress,
+  totalTradingRewards: testConversionHelpers.denomToHumanReadableConversion(0),
+  totalVolume: '0',
+  isWhitelistAffiliate: false,
+};
+
 describe('transferHandler', () => {
   beforeAll(async () => {
     await dbHelpers.migrate();
@@ -303,12 +310,7 @@ describe('transferHandler', () => {
     const wallet: WalletFromDatabase | undefined = await WalletTable.findById(
       defaultWalletAddress,
     );
-    expect(wallet).toEqual({
-      address: defaultWalletAddress,
-      totalTradingRewards: testConversionHelpers.denomToHumanReadableConversion(0),
-      totalVolume: '0',
-      isWhitelistAffiliate: false,
-    });
+    expect(wallet).toEqual(defaultWallet);
   });
 
   it('creates new deposit for previously non-existent subaccount', async () => {
@@ -357,12 +359,7 @@ describe('transferHandler', () => {
       defaultRecipientSubaccountId,
     );
     expect(newRecipientSubaccount).toBeDefined();
-    expect(wallet).toEqual({
-      address: defaultWalletAddress,
-      totalTradingRewards: testConversionHelpers.denomToHumanReadableConversion(0),
-      totalVolume: '0',
-      isWhitelistAffiliate: false,
-    });
+    expect(wallet).toEqual(defaultWallet);
   });
 
   it('creates new withdrawal for existing subaccount', async () => {
@@ -412,12 +409,7 @@ describe('transferHandler', () => {
     const wallet: WalletFromDatabase | undefined = await WalletTable.findById(
       defaultWalletAddress,
     );
-    expect(wallet).toEqual({
-      address: defaultWalletAddress,
-      totalTradingRewards: testConversionHelpers.denomToHumanReadableConversion(0),
-      totalVolume: '0',
-      isWhitelistAffiliate: false,
-    });
+    expect(wallet).toEqual(defaultWallet);
   });
 
   it('creates new transfer and the recipient subaccount', async () => {