fixes unit tests

Signed-off-by: Konstantina Blazhukova <[email protected]>

Author: konstantinabl

packages/relay/src/lib/precheck.ts

@@ -2,7 +2,6 @@
 
 import { ConfigService } from '@hashgraph/json-rpc-config-service/dist/services';
 import { ethers, Transaction } from 'ethers';
-import { Logger } from 'pino';
 
 import { prepend0x } from '../formatters';
 import { MirrorNodeClient } from './clients';

packages/relay/tests/lib/eth/eth_estimateGas.spec.ts

@@ -2,7 +2,7 @@
 
 import { expect, use } from 'chai';
 import chaiAsPromised from 'chai-as-promised';
-import { AbiCoder, keccak256 } from 'ethers';
+import { AbiCoder, keccak256, Transaction } from 'ethers';
 import { createStubInstance, SinonStub, SinonStubbedInstance, stub } from 'sinon';
 import { v4 as uuid } from 'uuid';
 
@@ -145,7 +145,8 @@ describe('@ethEstimateGas Estimate Gas spec', async function () {
     await mockContractCall(callData, true, 501, { errorMessage: '', statusCode: 501 }, requestDetails);
 
     const gas = await ethImpl.estimateGas({ data: '0x01' }, null, requestDetails);
-    expect(gas).to.equal(numberTo0x(Precheck.transactionIntrinsicGasCost(callData.data!)));
+    const tx = { data: callData.data! } as Transaction;
+    expect(gas).to.equal(numberTo0x(Precheck.transactionIntrinsicGasCost(tx)));
   });
 
   it('should eth_estimateGas to mirror node for transfer returns 501', async function () {
@@ -390,22 +391,22 @@ describe('@ethEstimateGas Estimate Gas spec', async function () {
       },
     };
     await mockContractCall(transaction, true, 400, contractCallResult, requestDetails);
-
+    const tx = { data: transaction.data! } as Transaction;
     const estimatedGas = await ethImpl.estimateGas(transaction, id, requestDetails);
 
-    expect(estimatedGas).to.equal(numberTo0x(Precheck.transactionIntrinsicGasCost(transaction.data!)));
+    expect(estimatedGas).to.equal(numberTo0x(Precheck.transactionIntrinsicGasCost(tx)));
   });
 
   withOverriddenEnvsInMochaTest({ ESTIMATE_GAS_THROWS: 'false' }, () => {
     it('should eth_estimateGas with contract revert and message does not equal executionReverted and ESTIMATE_GAS_THROWS is set to false', async function () {
       const originalEstimateGas = contractService.estimateGas;
       contractService.estimateGas = async () => {
-        return numberTo0x(Precheck.transactionIntrinsicGasCost(transaction.data!));
+        return numberTo0x(Precheck.transactionIntrinsicGasCost(transaction as Transaction));
       };
 
       const result = await ethImpl.estimateGas(transaction, id, requestDetails);
 
-      expect(result).to.equal(numberTo0x(Precheck.transactionIntrinsicGasCost(transaction.data!)));
+      expect(result).to.equal(numberTo0x(Precheck.transactionIntrinsicGasCost(transaction as Transaction)));
 
       contractService.estimateGas = originalEstimateGas;
     });

packages/relay/tests/lib/eth/eth_sendRawTransaction.spec.ts

@@ -145,6 +145,7 @@ describe('@ethSendRawTransaction eth_sendRawTransaction spec', async function ()
       it('should emit tracking event (limiter and metrics) only for successful tx responses from FileAppend transaction', async function () {
         const signed = await signTransaction({
           ...transaction,
+          gasLimit: '0x927C0',
           data: '0x' + '22'.repeat(13000),
         });
         const expectedTxHash = Utils.computeTransactionHash(Buffer.from(signed.replace('0x', ''), 'hex'));

packages/relay/tests/lib/precheck.spec.ts

@@ -663,49 +663,50 @@ describe('Precheck', async function () {
     it('should be able to calculate small contract create', function () {
       // This number represents the estimation for mirror node web3 module
       // Can be fetched by using: curl -X POST --data '{"jsonrpc":"2.0","id":1,"method":"eth_call","params":[{"from":"0x...","data":<greeterContractCreate>},"latest"]}'
-      const mirrorNodeEstimation = 60364;
+      const mirrorNodeEstimation = 70711;
       // This number represents the difference between the actual gas returned from the mirror node and the minimal required for deployment of this contract based only on the data field.
-      const gasDifferenceFromOtherFactors = 37964;
-      // @ts-ignore
-      const intrinsicGasCost = Precheck.transactionIntrinsicGasCost(smallestContractCreate);
+      const gasDifferenceFromOtherFactors = 16305;
+
+      const intrinsicGasCost = Precheck.transactionIntrinsicGasCost({ data: smallestContractCreate } as Transaction);
+
       expect(intrinsicGasCost).to.be.equal(mirrorNodeEstimation - gasDifferenceFromOtherFactors);
       expect(intrinsicGasCost).to.be.greaterThan(constants.TX_BASE_COST);
     });
 
     it('should be able to calculate normal contract create', function () {
       // This number represents the estimation for mirror node web3 module
       // Can be fetched by using: curl -X POST --data '{"jsonrpc":"2.0","id":1,"method":"eth_call","params":[{"from":"0x...","data":<greeterContractCreate>},"latest"]}'
-      const mirrorNodeEstimation = 86351;
+      const mirrorNodeEstimation = 499055;
       // This number represents the difference between the actual gas returned from the mirror node and the minimal required for deployment of this contract based only on the data field.
-      const gasDifferenceFromOtherFactors = 16739;
+      const gasDifferenceFromOtherFactors = 356525;
       // @ts-ignore
-      const intrinsicGasCost = Precheck.transactionIntrinsicGasCost(greeterContractCreate);
+      const intrinsicGasCost = Precheck.transactionIntrinsicGasCost({ data: greeterContractCreate } as Transaction);
+      console.log(`intrinsicGasCost: ${intrinsicGasCost}`);
       expect(intrinsicGasCost).to.be.equal(mirrorNodeEstimation - gasDifferenceFromOtherFactors);
       expect(intrinsicGasCost).to.be.greaterThan(constants.TX_BASE_COST);
     });
 
     it('should be able to calculate contract call', function () {
-      // @ts-ignore
-      const intrinsicGasCost = Precheck.transactionIntrinsicGasCost(contractCall);
+      const intrinsicGasCost = Precheck.transactionIntrinsicGasCost({ data: contractCall } as Transaction);
       expect(intrinsicGasCost).to.be.greaterThan(constants.TX_BASE_COST);
     });
 
     it('should be able to calucate tx without starting 0x', function () {
       const contractCallTrimmed = contractCall.replace('0x', '');
-      // @ts-ignore
-      const intrinsicGasCost = Precheck.transactionIntrinsicGasCost(contractCallTrimmed);
+      const intrinsicGasCost = Precheck.transactionIntrinsicGasCost({ data: contractCallTrimmed } as Transaction);
       expect(intrinsicGasCost).to.be.greaterThan(constants.TX_BASE_COST);
     });
 
     it('should be able to able to calculate transfer', function () {
-      // @ts-ignore
-      const intrinsicGasCost = Precheck.transactionIntrinsicGasCost(transfer);
+      const intrinsicGasCost = Precheck.transactionIntrinsicGasCost({
+        data: transfer,
+        to: contractAddress1,
+      } as Transaction);
       expect(intrinsicGasCost).to.be.equal(constants.TX_BASE_COST);
     });
 
     it('should be able to calculate for odd length tx', function () {
-      // @ts-ignore
-      const intrinsicGasCost = Precheck.transactionIntrinsicGasCost(invalidTx);
+      const intrinsicGasCost = Precheck.transactionIntrinsicGasCost({ data: invalidTx } as Transaction);
       expect(intrinsicGasCost).to.be.greaterThan(constants.TX_BASE_COST);
     });
   });