Ensure acceptance tests run on previewnet/testnet (#351)

* fix: ensure acceptance tests run against testnet Signed-off-by: Ivo Yankov <[email protected]> * nit: improve test case branching Signed-off-by: Ivo Yankov <[email protected]> * nit: optimize hbar usage Signed-off-by: Ivo Yankov <[email protected]> * test: add a hapi eth_feeHistory test Signed-off-by: Ivo Yankov <[email protected]> * docs: update chainId for previewnet in readme Signed-off-by: Ivo Yankov <[email protected]> * test: fix eth_feeHistory assertion Signed-off-by: Ivo Yankov <[email protected]>
hashgraph · Jul 20, 2022 · d467b65 · d467b65
1 parent cc9ba38
commit d467b65
Show file tree

Hide file tree

Showing 7 changed files with 146 additions and 74 deletions.
diff --git a/README.md b/README.md
@@ -70,9 +70,9 @@ E2E_RELAY_HOST=http://127.0.0.1:7546
 
 The following table highlights some initial configuration values to consider
 
-| Config      | Default | Description           |
-| ------------|-------|-----------------------|
-| `CHAIN_ID`  | `0x12a` | The netowrk chain id. Local and previewnet envs should use `0x12a`. Mainnet and Testnet should use `0x127` and `0x128` respectively |
+| Config      | Default | Description                                                                                                                                       |
+| ------------|-------|---------------------------------------------------------------------------------------------------------------------------------------------------|
+| `CHAIN_ID`  | `0x12a` | The netowrk chain id. Local and previewnet envs should use `0x12a`. Mainnet, Testnet and Previewnet should use `0x127`, `0x128` and `0x129` respectively |
 
 > **_NOTE:_** Acceptance tests can be pointed at a remote location. In this case be sure to appropriately update these values to point away from your local host and to valid deployed services.
 

diff --git a/packages/relay/tests/lib/mirrorNodeClient.spec.ts b/packages/relay/tests/lib/mirrorNodeClient.spec.ts
@@ -31,7 +31,7 @@ import pino from 'pino';
 const logger = pino();
 
 describe('MirrorNodeClient', async function () {
-  this.timeout(10000);
+  this.timeout(20000);
 
   // mock axios
   const instance = axios.create({
@@ -40,7 +40,7 @@ describe('MirrorNodeClient', async function () {
     headers: {
       'Content-Type': 'application/json'
     },
-    timeout: 10 * 1000
+    timeout: 20 * 1000
   });
   const mock = new MockAdapter(instance);
   const mirrorNodeInstance = new MirrorNodeClient(process.env.MIRROR_NODE_URL, logger.child({ name: `mirror-node` }), instance);

diff --git a/packages/server/tests/acceptance/erc20.spec.ts b/packages/server/tests/acceptance/erc20.spec.ts
@@ -55,8 +55,8 @@ describe('ERC20 Acceptance Tests', async function () {
 
     before(async () => {
         accounts[0] = await servicesNode.createAliasAccount(30, relay.provider);
-        accounts[1] = await servicesNode.createAliasAccount(10, relay.provider);
-        accounts[2] = await servicesNode.createAliasAccount(10, relay.provider);
+        accounts[1] = await servicesNode.createAliasAccount(15, relay.provider);
+        accounts[2] = await servicesNode.createAliasAccount(15, relay.provider);
 
         initialHolder = accounts[0].address;
         recipient = accounts[1].address;

diff --git a/packages/server/tests/acceptance/rpc.spec.ts b/packages/server/tests/acceptance/rpc.spec.ts
diff --git a/packages/server/tests/clients/relayClient.ts b/packages/server/tests/clients/relayClient.ts
@@ -107,4 +107,10 @@ export default class RelayClient {
         return this.provider.send('eth_sendRawTransaction', [signedTx]);
     };
 
+    /**
+     * Returns the result of eth_gasPrice as a Number.
+     */
+    async gasPrice(): Promise<number> {
+        return Number(await this.call('eth_gasPrice', []));
+    }
 }
diff --git a/packages/server/tests/clients/servicesClient.ts b/packages/server/tests/clients/servicesClient.ts
@@ -313,7 +313,15 @@ export default class ServicesClient {
         const expiration = new Date();
         expiration.setDate(expiration.getDate() + 30);
 
-        const htsClient = Client.forNetwork(JSON.parse(this.network));
+        let network = this.network;
+        try {
+            network = JSON.parse(this.network);
+        }
+        catch(e) {
+            // network config is a string and not a valid JSON
+        }
+
+        const htsClient = Client.forNetwork(network);
         htsClient.setOperator(AccountId.fromString(args.treasuryAccountId), args.adminPrivateKey);
 
         const tokenCreate = await (await new TokenCreateTransaction()

diff --git a/packages/server/tests/helpers/assertions.ts b/packages/server/tests/helpers/assertions.ts
@@ -18,7 +18,7 @@
  *
  */
 import { expect } from 'chai';
-import { ethers } from 'ethers';
+import { ethers, BigNumber } from 'ethers';
 import { JsonRpcError, predefined } from '../../../relay/src/lib/errors';
 import { Utils } from './utils';
 
@@ -59,7 +59,15 @@ export default class Assertions {
      */
     public static block(relayResponse, mirrorNodeResponse, mirrorTransactions, hydratedTransactions = false) {
         // Assert static values
-        expect(relayResponse.baseFeePerGas).to.be.equal(ethers.utils.hexValue(this.defaultGasPrice));
+        expect(relayResponse.baseFeePerGas).to.exist;
+
+        if (process.env.LOCAL_NODE && process.env.LOCAL_NODE !== 'false') {
+            expect(relayResponse.baseFeePerGas).to.be.equal(ethers.utils.hexValue(this.defaultGasPrice));
+        }
+        else {
+            expect(Number(relayResponse.baseFeePerGas)).to.be.gt(0);
+        }
+
         expect(relayResponse.difficulty).to.be.equal(ethers.utils.hexValue(0));
         expect(relayResponse.extraData).to.be.equal(Assertions.emptyHex);
         expect(relayResponse.miner).to.be.equal(ethers.constants.AddressZero);
@@ -125,7 +133,9 @@ export default class Assertions {
         // expect(relayResponse.gasPrice).to.eq(mirrorNodeResponse.gas_price); // FIXME must not be null!
         expect(relayResponse.hash).to.eq(mirrorNodeResponse.hash.slice(0, 66));
         expect(relayResponse.input).to.eq(mirrorNodeResponse.function_parameters);
-        expect(relayResponse.to).to.eq(mirrorNodeResponse.to);
+        if (relayResponse.to || mirrorNodeResponse.to) {
+            expect(relayResponse.to).to.eq(mirrorNodeResponse.to);
+        }
         expect(relayResponse.transactionIndex).to.eq(ethers.utils.hexValue(mirrorNodeResponse.transaction_index));
         expect(relayResponse.value).to.eq(ethers.utils.hexValue(mirrorNodeResponse.amount));
     }
@@ -164,7 +174,7 @@ export default class Assertions {
             ? mirrorResult.gas_price
             : mirrorResult.max_fee_per_gas;
         const mirrorEffectiveGasPrice = Utils.tinyBarsToWeibars(effectiveGas);
-        expect(transactionReceipt.effectiveGasPrice).to.eq(mirrorEffectiveGasPrice);
+        expect(BigNumber.from(transactionReceipt.effectiveGasPrice).toString()).to.eq(mirrorEffectiveGasPrice.toString());
 
         expect(transactionReceipt.status).to.exist;
         expect(transactionReceipt.status).to.eq(mirrorResult.status);