Update logic to point acceptance tests to remote relay (#224)

* Update logic to point acceptance tests to remote relay

Update acceptance tests logic to point to remote instances
- Add `E2E_RELAY_HOST` config
- Update tests to use a smaller balance for new accounts
- Update balance test expected value
- Update README with instructions

Signed-off-by: Nana-EC <[email protected]>

Signed-off-by: Daniel Ivanov <[email protected]>

Co-authored-by: Daniel Ivanov <[email protected]>

Author: Nana-EC

.env.example

@@ -4,4 +4,5 @@ OPERATOR_KEY_MAIN=
 OPERATOR_ID_ETH_SENDRAWTRANSACTION=
 OPERATOR_KEY_ETH_SENDRAWTRANSACTION=
 CHAIN_ID=
-MIRROR_NODE_URL=
+MIRROR_NODE_URL=
+E2E_RELAY_HOST=

README.md

@@ -65,8 +65,11 @@ CHAIN_ID=0x12a
 MIRROR_NODE_URL=http://127.0.0.1:5551
 LOCAL_NODE=true
 SERVER_PORT=7546
+E2E_RELAY_HOST=http://127.0.0.1:7546
 ```
 
+> **_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.
+
 #### Run
 
 Tests may be run using the following command

packages/server/tests/acceptance/rpc.spec.ts

@@ -67,7 +67,8 @@ const NETWORK = process.env.HEDERA_NETWORK || '';
 const OPERATOR_KEY = process.env.OPERATOR_KEY_MAIN || '';
 const OPERATOR_ID = process.env.OPERATOR_ID_MAIN || '';
 const MIRROR_NODE_URL = process.env.MIRROR_NODE_URL || '';
-const RELAY_URL = 'http://localhost:7546';
+const LOCAL_RELAY_URL = 'http://localhost:7546';
+const RELAY_URL = process.env.E2E_RELAY_HOST || LOCAL_RELAY_URL;
 const ONE_TINYBAR = ethers.utils.parseUnits('1', 10);
 const NON_EXISTING_ADDRESS = '0x5555555555555555555555555555555555555555';
 
@@ -87,9 +88,9 @@ describe('RPC Server Acceptance Tests', function() {
             runLocalHederaNetwork();
         }
 
-        // start relay
-        logger.info(`Start relay on port ${process.env.SERVER_PORT}`);
-        relayServer = app.listen({ port: process.env.SERVER_PORT });
+        if (RELAY_URL === LOCAL_RELAY_URL) {
+            runLocalRelay();
+        }
 
         accounts[0] = await servicesNode.createAliasAccount();
         accounts[1] = await servicesNode.createAliasAccount();
@@ -316,7 +317,7 @@ describe('RPC Server Acceptance Tests', function() {
         });
 
         it('should execute "eth_getTransactionCount" for account with non-zero nonce', async function() {
-            const account = await servicesNode.createAliasAccount();
+            const account = await servicesNode.createAliasAccount(10);
             // Wait for account creation to propagate
             await mirrorNode.get(`/accounts/${account.accountId}`);
             const transaction = {
@@ -348,16 +349,16 @@ describe('RPC Server Acceptance Tests', function() {
         expect(res).to.be.equal('0xa7a3582000');
     });
 
-    it('should execute "eth_getBalance" for newly created account with 1000 HBAR', async function() {
-        const account = await servicesNode.createAliasAccount(1000);
+    it('should execute "eth_getBalance" for newly created account with 100 HBAR', async function() {
+        const account = await servicesNode.createAliasAccount(100);
         // Wait for account creation to propagate
         await mirrorNode.get(`/accounts/${account.accountId}`);
 
         const res = await relay.call('eth_getBalance', [account.address, 'latest']);
         const balance = await servicesNode.executeQuery(new AccountBalanceQuery()
             .setAccountId(account.accountId));
         const balanceInWeiBars = BigNumber.from(balance.hbars.toTinybars().toString()).mul(10 ** 10);
-        expect(res).to.eq(ethers.utils.hexlify(balanceInWeiBars));
+        expect(res).to.eq(ethers.utils.hexValue(balanceInWeiBars));
     });
 
     it('should execute "eth_getBalance" for non-existing address', async function() {
@@ -501,4 +502,11 @@ describe('RPC Server Acceptance Tests', function() {
         shell.exec('npx hedera-local restart');
         logger.trace('Hedera Hashgraph local node env started');
     }
-});
+
+    function runLocalRelay() {
+        // start relay
+        logger.info(`Start relay on port ${process.env.SERVER_PORT}`);
+        relayServer = app.listen({ port: process.env.SERVER_PORT });
+    }
+
+});

packages/server/tests/helpers/assertions.ts

@@ -18,7 +18,7 @@
  *
  */
 import { expect } from 'chai';
-import { Utils } from './utils';
+import { ethers } from 'ethers';
 
 export default class Assertions {
 
@@ -40,13 +40,13 @@ export default class Assertions {
 
     public static block(relayResponse, mirrorNodeResponse) {
         expect(relayResponse.hash).to.be.equal(mirrorNodeResponse.hash.slice(0, 66));
-        expect(relayResponse.number).to.be.equal(Utils.numberTo0x(mirrorNodeResponse.number));
+        expect(relayResponse.number).to.be.equal(ethers.utils.hexValue(mirrorNodeResponse.number));
         // expect(relayResponse.transactions.length).to.equal(mirrorNodeResponse.count); // FIXME this assertion fails
     }
 
     public static transaction(relayResponse, mirrorNodeResponse) {
         expect(relayResponse.blockHash).to.eq(mirrorNodeResponse.block_hash.slice(0, 66));
-        expect(relayResponse.blockNumber).to.eq(Utils.numberTo0x(mirrorNodeResponse.block_number));
+        expect(relayResponse.blockNumber).to.eq(ethers.utils.hexValue(mirrorNodeResponse.block_number));
         // expect(relayResponse.chainId).to.eq(mirrorNodeResponse.chain_id); // FIXME must not be null!
         expect(relayResponse.from).to.eq(mirrorNodeResponse.from);
         expect(relayResponse.gas).to.eq(mirrorNodeResponse.gas_used);

packages/server/tests/helpers/utils.ts

@@ -27,10 +27,6 @@ export class Utils {
         return parseInt(num).toString(16);
     };
 
-    static numberTo0x = (input: number): string => {
-        return `0x${Utils.toHex(input)}`;
-    };
-
     static idToEvmAddress = (id): string => {
         Assertions.assertId(id);
         const [shard, realm, num] = id.split('.');