From 1290e7ef294aacd05cafcae7466ff6a808baaca3 Mon Sep 17 00:00:00 2001
From: nicholaspai <npai.nyc@gmail.com>
Date: Tue, 20 Feb 2024 14:50:02 -0500
Subject: [PATCH] Remove block number from type

---
 src/clients/HubPoolClient.ts           | 4 ++--
 src/clients/SpokePoolClient.ts         | 2 --
 src/clients/mocks/MockHubPoolClient.ts | 9 +++++----
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/clients/HubPoolClient.ts b/src/clients/HubPoolClient.ts
index 620e25e8..68636853 100644
--- a/src/clients/HubPoolClient.ts
+++ b/src/clients/HubPoolClient.ts
@@ -72,13 +72,13 @@ type L1TokensToDestinationTokens = {
 // Temporary type for v2 -> v3 transition. @todo: Remove.
 type V2PartialDepositWithBlock = Pick<
   V2DepositWithBlock,
-  "originChainId" | "originToken" | "amount" | "quoteTimestamp" | "blockNumber"
+  "originChainId" | "originToken" | "amount" | "quoteTimestamp"
 >;
 
 // Temporary type for v2 -> v3 transition. @todo: Remove.
 type V3PartialDepositWithBlock = Pick<
   V3DepositWithBlock,
-  "originChainId" | "inputToken" | "inputAmount" | "quoteTimestamp" | "blockNumber"
+  "originChainId" | "inputToken" | "inputAmount" | "quoteTimestamp"
 >;
 
 export type LpFeeRequest = (V2PartialDepositWithBlock | V3PartialDepositWithBlock) & { paymentChainId?: number };
diff --git a/src/clients/SpokePoolClient.ts b/src/clients/SpokePoolClient.ts
index e4cd9ce0..410e6f2f 100644
--- a/src/clients/SpokePoolClient.ts
+++ b/src/clients/SpokePoolClient.ts
@@ -18,7 +18,6 @@ import {
   isV2SpeedUp,
   isV3SpeedUp,
   toBN,
-  assert,
 } from "../utils";
 import {
   paginatedEventQuery,
@@ -989,7 +988,6 @@ export class SpokePoolClient extends BaseAbstractClient {
         originChainId: this.chainId,
         paymentChainId: _paymentChainId,
         quoteTimestamp: event.args.quoteTimestamp,
-        blockNumber: event.blockNumber,
       };
     });
 
diff --git a/src/clients/mocks/MockHubPoolClient.ts b/src/clients/mocks/MockHubPoolClient.ts
index 43f9806c..ca35d307 100644
--- a/src/clients/mocks/MockHubPoolClient.ts
+++ b/src/clients/mocks/MockHubPoolClient.ts
@@ -51,14 +51,15 @@ export class MockHubPoolClient extends HubPoolClient {
 
   async computeRealizedLpFeePct(deposit: LpFeeRequest): Promise<RealizedLpFee> {
     const { realizedLpFeePct, realizedLpFeePctOverride } = this;
-    const { blockNumber: quoteBlock } = deposit;
-    return realizedLpFeePctOverride ? { realizedLpFeePct, quoteBlock } : await super.computeRealizedLpFeePct(deposit);
+    return realizedLpFeePctOverride
+      ? { realizedLpFeePct, quoteBlock: 0 }
+      : await super.computeRealizedLpFeePct(deposit);
   }
   async batchComputeRealizedLpFeePct(_deposits: LpFeeRequest[]): Promise<RealizedLpFee[]> {
     const { realizedLpFeePct, realizedLpFeePctOverride } = this;
     return realizedLpFeePctOverride
-      ? _deposits.map(({ blockNumber: quoteBlock }) => {
-          return { realizedLpFeePct, quoteBlock };
+      ? _deposits.map(() => {
+          return { realizedLpFeePct, quoteBlock: 0 };
         })
       : await super.batchComputeRealizedLpFeePct(_deposits);
   }