Skip to content
This repository was archived by the owner on Mar 5, 2025. It is now read-only.

Commit 3ee777a

Browse files
author
Alex Luu
committed
lint and feedback
1 parent 4a70466 commit 3ee777a

File tree

4 files changed

+26
-42
lines changed

4 files changed

+26
-42
lines changed

packages/web3-core/src/web3_request_manager.ts

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ export class Web3RequestManager<
210210
) as JsonRpcPayload;
211211

212212
if (!isNullish(this.middleware)) {
213-
payload = (await this.middleware.processRequest(payload));
213+
payload = await this.middleware.processRequest(payload);
214214
}
215215
if (isWeb3Provider(provider)) {
216216
let response;
@@ -241,14 +241,14 @@ export class Web3RequestManager<
241241
payload,
242242
error as JsonRpcResponse<ResponseType, unknown>,
243243
{ legacy: true, error: true },
244-
)
244+
),
245245
);
246246
}
247247

248248
// TODO: This could be deprecated and removed.
249249
if (isLegacyRequestProvider(provider)) {
250250
return new Promise<JsonRpcResponse<ResponseType>>((resolve, reject) => {
251-
const rejectWithError = (err: unknown) =>{
251+
const rejectWithError = (err: unknown) => {
252252
reject(
253253
this._processJsonRpcResponse(
254254
payload,
@@ -257,9 +257,10 @@ export class Web3RequestManager<
257257
legacy: true,
258258
error: true,
259259
},
260-
))
261-
}
262-
260+
),
261+
);
262+
};
263+
263264
const resolveWithResponse = (response: JsonRpcResponse<ResponseType>) =>
264265
resolve(
265266
this._processJsonRpcResponse(payload, response, {
@@ -290,18 +291,18 @@ export class Web3RequestManager<
290291
JsonRpcResponse<ResponseType>
291292
>;
292293
responsePromise.then(resolveWithResponse).catch(error => {
293-
try {
294-
// Attempt to process the error response
295-
const processedError = this._processJsonRpcResponse(
296-
payload,
297-
error as JsonRpcResponse<ResponseType, unknown>,
298-
{ legacy: true, error: true }
299-
);
300-
reject(processedError);
301-
} catch (processingError) {
302-
// Catch any errors that occur during the error processing
303-
reject(processingError);
304-
}
294+
try {
295+
// Attempt to process the error response
296+
const processedError = this._processJsonRpcResponse(
297+
payload,
298+
error as JsonRpcResponse<ResponseType, unknown>,
299+
{ legacy: true, error: true },
300+
);
301+
reject(processedError);
302+
} catch (processingError) {
303+
// Catch any errors that occur during the error processing
304+
reject(processingError);
305+
}
305306
});
306307
}
307308
});

packages/web3-core/test/unit/web3_request_manager.test.ts

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -281,20 +281,6 @@ describe('Web3RequestManager', () => {
281281
expect(await pr).toBe('test');
282282
});
283283

284-
it('promise of legacy provider should be error', async () => {
285-
const manager = new Web3RequestManager(undefined, undefined);
286-
const pr = new Promise(resolve => {
287-
resolve('test');
288-
});
289-
const myProvider = {
290-
request: jest.fn().mockImplementation(async () => pr),
291-
} as any;
292-
manager.setProvider(myProvider);
293-
await manager.send(request);
294-
expect(myProvider.request).toHaveBeenCalledTimes(1);
295-
expect(await pr).toBe('test');
296-
});
297-
298284
it('Got a "nullish" response from provider', async () => {
299285
const manager = new Web3RequestManager(undefined, undefined);
300286
const myProvider = {
@@ -1150,12 +1136,11 @@ describe('Web3RequestManager', () => {
11501136
});
11511137

11521138
it('should error in isPromise', async () => {
1153-
11541139
const manager = new Web3RequestManager();
11551140
const myProvider = {
11561141
request: jest
11571142
.fn()
1158-
.mockImplementation((async () => Promise.reject(errorResponse))),
1143+
.mockImplementation(async () => Promise.reject(errorResponse)),
11591144
} as any;
11601145

11611146
jest.spyOn(manager, 'provider', 'get').mockReturnValue(myProvider);

packages/web3-eth/src/rpc_method_wrappers.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -581,7 +581,7 @@ export function sendTransaction<
581581
transaction,
582582
transactionFormatted,
583583
});
584-
584+
585585
await sendTxHelper.checkRevertBeforeSending(
586586
transactionFormatted as TransactionCall,
587587
);

packages/web3/test/integration/external-providers/helper.ts

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,15 @@ export async function performBasicRpcCalls(provider: SupportedProviders) {
3838
to: accounts[1],
3939
from: accounts[0],
4040
value: '1',
41-
gas: 21000
41+
gas: 21000,
4242
});
4343
expect(tx.status).toBe(BigInt(1));
4444

4545
const blockNumber1 = await web3.eth.getBlockNumber();
4646
expect(typeof blockNumber1).toBe('bigint');
4747

4848
// After sending a transaction, the blocknumber is supposed to be greater than or equal the block number before sending the transaction
49-
expect(blockNumber1).toBeGreaterThanOrEqual(blockNumber0);
49+
expect(blockNumber1).toBeGreaterThanOrEqual(blockNumber0);
5050
}
5151

5252
export async function failErrorCalls(provider: SupportedProviders) {
@@ -57,7 +57,7 @@ export async function failErrorCalls(provider: SupportedProviders) {
5757
provider,
5858
});
5959

60-
let deployOptions: Record<string, unknown>;;
60+
let deployOptions: Record<string, unknown>;
6161

6262
// eslint-disable-next-line prefer-const
6363
deployOptions = {
@@ -68,9 +68,7 @@ export async function failErrorCalls(provider: SupportedProviders) {
6868

6969
const sendOptions = { from: accounts[0], gas: '1000000' };
7070

71-
7271
contract = await contract.deploy(deployOptions).send(sendOptions);
7372

74-
await contract.methods.reverts().send({ from: accounts[0] })
75-
76-
}
73+
await contract.methods.reverts().send({ from: accounts[0] });
74+
}

0 commit comments

Comments
 (0)