Refactor ETH test spec (#1925)

---------

Signed-off-by: Stefan Stefanov <[email protected]>

Author: stefan-stefanooov

packages/relay/package.json

@@ -25,7 +25,26 @@
     "lint": "npx eslint --ext .js,.ts .",
     "format": "npx prettier --ignore-path ../../.gitignore --write \"**/*.+(js|ts|json)\"",
     "test": "nyc ts-mocha --recursive './tests/**/*.spec.ts' './tests/**/**/*.spec.ts' --exit",
-    "test:balance": "nyc ts-mocha --recursive './tests/**/*.spec.ts' './tests/**/**/*.spec.ts' -g '@balance' --exit"
+    "test-eth": "nyc ts-mocha --recursive './tests/lib/eth/**/*.spec.ts' --exit",
+    "test:eth-get-block-by-number": "nyc ts-mocha --recursive './tests/**/*.spec.ts' './tests/**/**/*.spec.ts' -g '@ethGetBlockByNumber' --exit",
+    "test:eth-get-block-by-hash": "nyc ts-mocha --recursive './tests/**/*.spec.ts' './tests/**/**/*.spec.ts' -g '@ethGetBlockByHash' --exit",
+    "test:eth-get-block-transaction-count-by-number": "nyc ts-mocha --recursive './tests/**/*.spec.ts' './tests/**/**/*.spec.ts' -g '@ethGetBlockTransactionCountByNumber' --exit",
+    "test:eth-get-block-transaction-count-by-hash": "nyc ts-mocha --recursive './tests/**/*.spec.ts' './tests/**/**/*.spec.ts' -g '@ethGetBlockTransactionCountByHash' --exit",
+    "test:eth-get-transaction-by-block-number-and-index": "nyc ts-mocha --recursive './tests/**/*.spec.ts' './tests/**/**/*.spec.ts' -g '@ethGetTransactionByBlockNumberAndIndex' --exit",
+    "test:eth-get-transaction-by-block-hash-and-index": "nyc ts-mocha --recursive './tests/**/*.spec.ts' './tests/**/**/*.spec.ts' -g '@ethGetTransactionByBlockHashAndIndex' --exit",
+    "test:eth-get-balance": "nyc ts-mocha --recursive './tests/**/*.spec.ts' './tests/**/**/*.spec.ts' -g '@ethGetBalance' --exit",
+    "test:eth-get-code": "nyc ts-mocha --recursive './tests/**/*.spec.ts' './tests/**/**/*.spec.ts' -g '@ethGetCode' --exit",
+    "test:eth-fee-history": "nyc ts-mocha --recursive './tests/**/*.spec.ts' './tests/**/**/*.spec.ts' -g '@ethFeeHistory' --exit",
+    "test:eth-estimate-gas": "nyc ts-mocha --recursive './tests/**/*.spec.ts' './tests/**/**/*.spec.ts' -g '@ethEstimateGas' --exit",
+    "test:eth-gas-price": "nyc ts-mocha --recursive './tests/**/*.spec.ts' './tests/**/**/*.spec.ts' -g '@ethGasPrice' --exit",
+    "test:eth-call": "nyc ts-mocha --recursive './tests/**/*.spec.ts' './tests/**/**/*.spec.ts' -g '@ethCall' --exit",
+    "test:eth-send-raw-transaction": "nyc ts-mocha --recursive './tests/**/*.spec.ts' './tests/**/**/*.spec.ts' -g '@ethSendRawTransaction' --exit",
+    "test:eth-get-storage-at": "nyc ts-mocha --recursive './tests/**/*.spec.ts' './tests/**/**/*.spec.ts' -g '@ethGetStorageAt' --exit",
+    "test:eth-get-transaction-count": "nyc ts-mocha --recursive './tests/**/*.spec.ts' './tests/**/**/*.spec.ts' -g '@ethGetTransactionCount' --exit",
+    "test:eth-common": "nyc ts-mocha --recursive './tests/**/*.spec.ts' './tests/**/**/*.spec.ts' -g '@ethCommon' --exit",
+    "test:eth-get-transaction-receipt": "nyc ts-mocha --recursive './tests/**/*.spec.ts' './tests/**/**/*.spec.ts' -g '@ethGetTransactionReceipt' --exit",
+    "test:eth-get-transaction-by-hash": "nyc ts-mocha --recursive './tests/**/*.spec.ts' './tests/**/**/*.spec.ts' -g '@ethGetTransactionByHash' --exit",
+    "test:eth-get-logs": "nyc ts-mocha --recursive './tests/**/*.spec.ts' './tests/**/**/*.spec.ts' -g '@ethGetLogs' --exit"
   },
   "dependencies": {
     "@ethersproject/asm": "^5.7.0",

packages/relay/tests/assertions.ts

@@ -3,6 +3,7 @@ import { JsonRpcError } from '../src';
 import { EthImpl } from '../src/lib/eth';
 import { Block, Transaction } from '../src/lib/model';
 import { numberTo0x } from '../src/formatters';
+import { BASE_FEE_PER_GAS_DEFAULT } from './lib/eth/eth-config';
 
 export default class RelayAssertions {
   static assertRejection = async (
@@ -123,7 +124,7 @@ export default class RelayAssertions {
 
   static verifyBlockConstants = (block: Block) => {
     expect(block.gasLimit).equal(numberTo0x(15000000));
-    expect(block.baseFeePerGas).equal('0x84b6a5c400');
+    expect(block.baseFeePerGas).equal(BASE_FEE_PER_GAS_DEFAULT);
     expect(block.difficulty).equal(EthImpl.zeroHex);
     expect(block.extraData).equal(EthImpl.emptyHex);
     expect(block.miner).equal(EthImpl.zeroAddressHex);

packages/relay/tests/helpers.ts

@@ -68,7 +68,7 @@ export const ethCallFailing = async (ethImpl, args, block, assertFunc) => {
   expect(hasError).to.eq(true);
 };
 
-export const ethGetLogsFailing = async (ethImpl, args, assertFunc) => {
+export async function ethGetLogsFailing(ethImpl, args, assertFunc) {
   let hasError = false;
   try {
     await ethImpl.getLogs(...args);
@@ -78,7 +78,7 @@ export const ethGetLogsFailing = async (ethImpl, args, assertFunc) => {
     assertFunc(error);
   }
   expect(hasError).to.eq(true);
-};
+}
 
 export const expectLogData = (res, log, tx) => {
   expect(res.address).to.eq(log.address);