Skip to content

Commit 1554da9

Browse files
improve: add changes recommended by PR review (#935)
Signed-off-by: james-a-morris <[email protected]>
1 parent 95d58b9 commit 1554da9

File tree

2 files changed

+6
-35
lines changed

2 files changed

+6
-35
lines changed

Diff for: src/clients/SpokePoolClient/EVMSpokePoolClient.ts

+6-28
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,5 @@
11
import { Contract, EventFilter } from "ethers";
2-
import {
3-
BigNumber,
4-
DepositSearchResult,
5-
getDepositIdAtBlock,
6-
getNetworkName,
7-
InvalidFill,
8-
MakeOptional,
9-
toBN,
10-
} from "../../utils";
2+
import { BigNumber, DepositSearchResult, getNetworkName, InvalidFill, MakeOptional, toBN } from "../../utils";
113
import {
124
EventSearchConfig,
135
paginatedEventQuery,
@@ -18,15 +10,16 @@ import { isUpdateFailureReason } from "../BaseAbstractClient";
1810
import { knownEventNames, SpokePoolClient, SpokePoolUpdate } from "./SpokePoolClient";
1911
import winston from "winston";
2012
import { HubPoolClient } from "../HubPoolClient";
21-
import { SpokePool } from "../../typechain";
2213
import {
2314
findDepositBlock,
2415
getMaxFillDeadlineInRange as getMaxFillDeadline,
2516
getTimeAt as _getTimeAt,
2617
relayFillStatus,
2718
isZeroAddress,
19+
getDepositIdAtBlock,
2820
} from "../../utils/SpokeUtils";
2921
import { DepositWithBlock, FillStatus, RelayData } from "../../interfaces";
22+
import { SpokePool } from "../../typechain";
3023

3124
/**
3225
* An EVM-specific SpokePoolClient.
@@ -43,12 +36,7 @@ export class EVMSpokePoolClient extends SpokePoolClient {
4336
super(logger, hubPoolClient, chainId, deploymentBlock, eventSearchConfig);
4437
}
4538

46-
public async getTimestampForBlock(blockTag: number): Promise<number> {
47-
const block = await this.spokePool.provider.getBlock(blockTag);
48-
return Number(block.timestamp);
49-
}
50-
51-
public relayFillStatus(
39+
public override relayFillStatus(
5240
relayData: RelayData,
5341
blockTag?: number | "latest",
5442
destinationChainId?: number
@@ -148,21 +136,11 @@ export class EVMSpokePoolClient extends SpokePoolClient {
148136
};
149137
}
150138

151-
/**
152-
* Retrieves the time from the SpokePool contract at a particular block.
153-
* @returns The time at the specified block tag.
154-
*/
155-
public getTimeAt(blockNumber: number): Promise<number> {
139+
public override getTimeAt(blockNumber: number): Promise<number> {
156140
return _getTimeAt(this.spokePool, blockNumber);
157141
}
158142

159-
/**
160-
* For a given origin chain depositId, resolve the corresponding Deposit.
161-
* Note: This method can only be used for depositIds within the non-deterministic range (0 < depositId < 2^32 - 1).
162-
* @param depositId Deposit ID of the deposit to resolve.
163-
* @returns A DepositSearchResult instance.
164-
*/
165-
async findDeposit(depositId: BigNumber): Promise<DepositSearchResult> {
143+
public override async findDeposit(depositId: BigNumber): Promise<DepositSearchResult> {
166144
let deposit = this.getDeposit(depositId);
167145
if (deposit) {
168146
return { found: true, deposit };

Diff for: src/clients/SpokePoolClient/SpokePoolClient.ts

-7
Original file line numberDiff line numberDiff line change
@@ -807,13 +807,6 @@ export abstract class SpokePoolClient extends BaseAbstractClient {
807807
*/
808808
public abstract findDeposit(depositId: BigNumber): Promise<DepositSearchResult>;
809809

810-
/**
811-
* Retrieves the timestamp for a given block number.
812-
* @param blockTag The block number to retrieve the timestamp for.
813-
* @returns The timestamp for the given block number.
814-
*/
815-
public abstract getTimestampForBlock(blockTag: number): Promise<number>;
816-
817810
/**
818811
* Retrieves the fill status for a given relay data.
819812
* @param relayData The relay data to retrieve the fill status for.

0 commit comments

Comments
 (0)