Skip to content

Commit 433d8dd

Browse files
mcmiremcmire
committed
Fix nesting
1 parent 6014c69 commit 433d8dd

File tree

8 files changed

+257
-267
lines changed

8 files changed

+257
-267
lines changed

‎packages/network-controller/src/create-network-client/ethereum-spec/block-hash-in-response.test.ts‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,18 @@ import { testsForRpcMethodsThatCheckForBlockHashInResponse } from '../../../test
22
import { NetworkClientType } from '../../types';
33

44
describe('createNetworkClient - methods included in the Ethereum JSON-RPC spec - methods with block hashes in their result', () => {
5-
for (const networkClientType of [
6-
NetworkClientType.Infura,
7-
NetworkClientType.Custom,
8-
]) {
9-
const methodsWithBlockHashInResponse = [
10-
{ name: 'eth_getTransactionByHash', numberOfParameters: 1 },
11-
{ name: 'eth_getTransactionReceipt', numberOfParameters: 1 },
12-
];
13-
methodsWithBlockHashInResponse.forEach(({ name, numberOfParameters }) => {
14-
describe(`method name: ${name}`, () => {
15-
testsForRpcMethodsThatCheckForBlockHashInResponse(name, {
16-
numberOfParameters,
17-
providerType: networkClientType,
5+
for (const networkClientType of Object.values(NetworkClientType)) {
6+
describe(`${networkClientType}`, () => {
7+
const methodsWithBlockHashInResponse = [
8+
{ name: 'eth_getTransactionByHash', numberOfParameters: 1 },
9+
{ name: 'eth_getTransactionReceipt', numberOfParameters: 1 },
10+
];
11+
methodsWithBlockHashInResponse.forEach(({ name, numberOfParameters }) => {
12+
describe(`${name}`, () => {
13+
testsForRpcMethodsThatCheckForBlockHashInResponse(name, {
14+
numberOfParameters,
15+
providerType: networkClientType,
16+
});
1817
});
1918
});
2019
});

‎packages/network-controller/src/create-network-client/ethereum-spec/block-param.test.ts‎

Lines changed: 41 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -2,48 +2,47 @@ import { testsForRpcMethodSupportingBlockParam } from '../../../tests/network-cl
22
import { NetworkClientType } from '../../types';
33

44
describe('createNetworkClient - methods included in the Ethereum JSON-RPC spec - methods that have a param to specify the block', () => {
5-
for (const networkClientType of [
6-
NetworkClientType.Infura,
7-
NetworkClientType.Custom,
8-
]) {
9-
const supportingBlockParam = [
10-
{
11-
name: 'eth_call',
12-
blockParamIndex: 1,
13-
numberOfParameters: 2,
14-
},
15-
{
16-
name: 'eth_getBalance',
17-
blockParamIndex: 1,
18-
numberOfParameters: 2,
19-
},
20-
{
21-
name: 'eth_getBlockByNumber',
22-
blockParamIndex: 0,
23-
numberOfParameters: 2,
24-
},
25-
{ name: 'eth_getCode', blockParamIndex: 1, numberOfParameters: 2 },
26-
{
27-
name: 'eth_getStorageAt',
28-
blockParamIndex: 2,
29-
numberOfParameters: 3,
30-
},
31-
{
32-
name: 'eth_getTransactionCount',
33-
blockParamIndex: 1,
34-
numberOfParameters: 2,
35-
},
36-
];
37-
supportingBlockParam.forEach(
38-
({ name, blockParamIndex, numberOfParameters }) => {
39-
describe(`method name: ${name}`, () => {
40-
testsForRpcMethodSupportingBlockParam(name, {
41-
providerType: networkClientType,
42-
blockParamIndex,
43-
numberOfParameters,
5+
for (const networkClientType of Object.values(NetworkClientType)) {
6+
describe(`${networkClientType}`, () => {
7+
const supportingBlockParam = [
8+
{
9+
name: 'eth_call',
10+
blockParamIndex: 1,
11+
numberOfParameters: 2,
12+
},
13+
{
14+
name: 'eth_getBalance',
15+
blockParamIndex: 1,
16+
numberOfParameters: 2,
17+
},
18+
{
19+
name: 'eth_getBlockByNumber',
20+
blockParamIndex: 0,
21+
numberOfParameters: 2,
22+
},
23+
{ name: 'eth_getCode', blockParamIndex: 1, numberOfParameters: 2 },
24+
{
25+
name: 'eth_getStorageAt',
26+
blockParamIndex: 2,
27+
numberOfParameters: 3,
28+
},
29+
{
30+
name: 'eth_getTransactionCount',
31+
blockParamIndex: 1,
32+
numberOfParameters: 2,
33+
},
34+
];
35+
supportingBlockParam.forEach(
36+
({ name, blockParamIndex, numberOfParameters }) => {
37+
describe(`method name: ${name}`, () => {
38+
testsForRpcMethodSupportingBlockParam(name, {
39+
providerType: networkClientType,
40+
blockParamIndex,
41+
numberOfParameters,
42+
});
4443
});
45-
});
46-
},
47-
);
44+
},
45+
);
46+
});
4847
}
4948
});

‎packages/network-controller/src/create-network-client/ethereum-spec/no-block-param.test.ts‎

Lines changed: 42 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -2,48 +2,47 @@ import { testsForRpcMethodAssumingNoBlockParam } from '../../../tests/network-cl
22
import { NetworkClientType } from '../../types';
33

44
describe('createNetworkClient - methods included in the Ethereum JSON-RPC spec - methods that assume there is no block param', () => {
5-
for (const networkClientType of [
6-
NetworkClientType.Infura,
7-
NetworkClientType.Custom,
8-
]) {
9-
const assumingNoBlockParam = [
10-
{ name: 'eth_getFilterLogs', numberOfParameters: 1 },
11-
{ name: 'eth_blockNumber', numberOfParameters: 0 },
12-
{ name: 'eth_estimateGas', numberOfParameters: 2 },
13-
{ name: 'eth_gasPrice', numberOfParameters: 0 },
14-
{ name: 'eth_getBlockByHash', numberOfParameters: 2 },
15-
{
16-
name: 'eth_getBlockTransactionCountByHash',
17-
numberOfParameters: 1,
18-
},
19-
{
20-
name: 'eth_getTransactionByBlockHashAndIndex',
21-
numberOfParameters: 2,
22-
},
23-
{ name: 'eth_getUncleByBlockHashAndIndex', numberOfParameters: 2 },
24-
{ name: 'eth_getUncleCountByBlockHash', numberOfParameters: 1 },
25-
];
26-
const blockParamIgnored = [
27-
{ name: 'eth_getUncleCountByBlockNumber', numberOfParameters: 1 },
28-
{ name: 'eth_getUncleByBlockNumberAndIndex', numberOfParameters: 2 },
29-
{
30-
name: 'eth_getTransactionByBlockNumberAndIndex',
31-
numberOfParameters: 2,
32-
},
33-
{
34-
name: 'eth_getBlockTransactionCountByNumber',
35-
numberOfParameters: 1,
36-
},
37-
];
38-
assumingNoBlockParam
39-
.concat(blockParamIgnored)
40-
.forEach(({ name, numberOfParameters }) =>
41-
describe(`method name: ${name}`, () => {
42-
testsForRpcMethodAssumingNoBlockParam(name, {
43-
providerType: networkClientType,
44-
numberOfParameters,
45-
});
46-
}),
47-
);
5+
for (const networkClientType of Object.values(NetworkClientType)) {
6+
describe(`${networkClientType}`, () => {
7+
const assumingNoBlockParam = [
8+
{ name: 'eth_getFilterLogs', numberOfParameters: 1 },
9+
{ name: 'eth_blockNumber', numberOfParameters: 0 },
10+
{ name: 'eth_estimateGas', numberOfParameters: 2 },
11+
{ name: 'eth_gasPrice', numberOfParameters: 0 },
12+
{ name: 'eth_getBlockByHash', numberOfParameters: 2 },
13+
{
14+
name: 'eth_getBlockTransactionCountByHash',
15+
numberOfParameters: 1,
16+
},
17+
{
18+
name: 'eth_getTransactionByBlockHashAndIndex',
19+
numberOfParameters: 2,
20+
},
21+
{ name: 'eth_getUncleByBlockHashAndIndex', numberOfParameters: 2 },
22+
{ name: 'eth_getUncleCountByBlockHash', numberOfParameters: 1 },
23+
];
24+
const blockParamIgnored = [
25+
{ name: 'eth_getUncleCountByBlockNumber', numberOfParameters: 1 },
26+
{ name: 'eth_getUncleByBlockNumberAndIndex', numberOfParameters: 2 },
27+
{
28+
name: 'eth_getTransactionByBlockNumberAndIndex',
29+
numberOfParameters: 2,
30+
},
31+
{
32+
name: 'eth_getBlockTransactionCountByNumber',
33+
numberOfParameters: 1,
34+
},
35+
];
36+
assumingNoBlockParam
37+
.concat(blockParamIgnored)
38+
.forEach(({ name, numberOfParameters }) =>
39+
describe(`${name}`, () => {
40+
testsForRpcMethodAssumingNoBlockParam(name, {
41+
providerType: networkClientType,
42+
numberOfParameters,
43+
});
44+
}),
45+
);
46+
});
4847
}
4948
});

‎packages/network-controller/src/create-network-client/ethereum-spec/not-handled-by-middleware.test.ts‎

Lines changed: 36 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -2,48 +2,45 @@ import { testsForRpcMethodNotHandledByMiddleware } from '../../../tests/network-
22
import { NetworkClientType } from '../../types';
33

44
describe('createNetworkClient - methods included in the Ethereum JSON-RPC spec - methods not handled by middleware', () => {
5-
for (const networkClientType of [
6-
NetworkClientType.Infura,
7-
NetworkClientType.Custom,
8-
]) {
9-
const notHandledByMiddleware = [
10-
{ name: 'eth_newFilter', numberOfParameters: 1 },
11-
{ name: 'eth_getFilterChanges', numberOfParameters: 1 },
12-
{ name: 'eth_newBlockFilter', numberOfParameters: 0 },
13-
{ name: 'eth_newPendingTransactionFilter', numberOfParameters: 0 },
14-
{ name: 'eth_uninstallFilter', numberOfParameters: 1 },
5+
for (const networkClientType of Object.values(NetworkClientType)) {
6+
describe(`${networkClientType}`, () => {
7+
const notHandledByMiddleware = [
8+
{ name: 'eth_newFilter', numberOfParameters: 1 },
9+
{ name: 'eth_getFilterChanges', numberOfParameters: 1 },
10+
{ name: 'eth_newBlockFilter', numberOfParameters: 0 },
11+
{ name: 'eth_newPendingTransactionFilter', numberOfParameters: 0 },
12+
{ name: 'eth_uninstallFilter', numberOfParameters: 1 },
1513

16-
{ name: 'eth_sendRawTransaction', numberOfParameters: 1 },
17-
{ name: 'eth_sendTransaction', numberOfParameters: 1 },
18-
{ name: 'eth_createAccessList', numberOfParameters: 2 },
19-
{ name: 'eth_getLogs', numberOfParameters: 1 },
20-
{ name: 'eth_getProof', numberOfParameters: 3 },
21-
{ name: 'eth_getWork', numberOfParameters: 0 },
22-
{ name: 'eth_maxPriorityFeePerGas', numberOfParameters: 0 },
23-
{ name: 'eth_submitHashRate', numberOfParameters: 2 },
24-
{ name: 'eth_submitWork', numberOfParameters: 3 },
25-
{ name: 'eth_syncing', numberOfParameters: 0 },
26-
{ name: 'eth_feeHistory', numberOfParameters: 3 },
27-
{ name: 'debug_getRawHeader', numberOfParameters: 1 },
28-
{ name: 'debug_getRawBlock', numberOfParameters: 1 },
29-
{ name: 'debug_getRawTransaction', numberOfParameters: 1 },
30-
{ name: 'debug_getRawReceipts', numberOfParameters: 1 },
31-
{ name: 'debug_getBadBlocks', numberOfParameters: 0 },
14+
{ name: 'eth_sendRawTransaction', numberOfParameters: 1 },
15+
{ name: 'eth_sendTransaction', numberOfParameters: 1 },
16+
{ name: 'eth_createAccessList', numberOfParameters: 2 },
17+
{ name: 'eth_getLogs', numberOfParameters: 1 },
18+
{ name: 'eth_getProof', numberOfParameters: 3 },
19+
{ name: 'eth_getWork', numberOfParameters: 0 },
20+
{ name: 'eth_maxPriorityFeePerGas', numberOfParameters: 0 },
21+
{ name: 'eth_submitHashRate', numberOfParameters: 2 },
22+
{ name: 'eth_submitWork', numberOfParameters: 3 },
23+
{ name: 'eth_syncing', numberOfParameters: 0 },
24+
{ name: 'eth_feeHistory', numberOfParameters: 3 },
25+
{ name: 'debug_getRawHeader', numberOfParameters: 1 },
26+
{ name: 'debug_getRawBlock', numberOfParameters: 1 },
27+
{ name: 'debug_getRawTransaction', numberOfParameters: 1 },
28+
{ name: 'debug_getRawReceipts', numberOfParameters: 1 },
29+
{ name: 'debug_getBadBlocks', numberOfParameters: 0 },
3230

33-
{ name: 'eth_accounts', numberOfParameters: 0 },
34-
{ name: 'eth_coinbase', numberOfParameters: 0 },
35-
{ name: 'eth_hashrate', numberOfParameters: 0 },
36-
{ name: 'eth_mining', numberOfParameters: 0 },
31+
{ name: 'eth_accounts', numberOfParameters: 0 },
32+
{ name: 'eth_coinbase', numberOfParameters: 0 },
33+
{ name: 'eth_hashrate', numberOfParameters: 0 },
34+
{ name: 'eth_mining', numberOfParameters: 0 },
3735

38-
{ name: 'eth_signTransaction', numberOfParameters: 1 },
39-
];
40-
notHandledByMiddleware.forEach(({ name, numberOfParameters }) => {
41-
// This is a valid title.
42-
// eslint-disable-next-line jest/valid-title
43-
describe(name, () => {
44-
testsForRpcMethodNotHandledByMiddleware(name, {
45-
providerType: networkClientType,
46-
numberOfParameters,
36+
{ name: 'eth_signTransaction', numberOfParameters: 1 },
37+
];
38+
notHandledByMiddleware.forEach(({ name, numberOfParameters }) => {
39+
describe(`${name}`, () => {
40+
testsForRpcMethodNotHandledByMiddleware(name, {
41+
providerType: networkClientType,
42+
numberOfParameters,
43+
});
4744
});
4845
});
4946
});

0 commit comments

Comments
 (0)