Reduce Accepted Error codes from MirrorNodeClient.ts (#1746)

* removing anything that is not 404, only 404 should default to null instead of the actual error

Signed-off-by: Alfredo Gutierrez <[email protected]>

* fixed broken unit tests

Signed-off-by: Alfredo Gutierrez <[email protected]>

---------

Signed-off-by: Alfredo Gutierrez <[email protected]>

Author: AlfredoG87

packages/relay/src/lib/clients/mirrorNodeClient.ts

@@ -90,23 +90,23 @@ export class MirrorNodeClient {
 
   static acceptedErrorStatusesResponsePerRequestPathMap: Map<string, Array<number>> = new Map([
     [MirrorNodeClient.GET_ACCOUNTS_BY_ID_ENDPOINT, [404]],
-    [MirrorNodeClient.GET_BALANCE_ENDPOINT, [400, 404]],
-    [MirrorNodeClient.GET_BLOCK_ENDPOINT, [400, 404]],
-    [MirrorNodeClient.GET_BLOCKS_ENDPOINT, [400, 404]],
-    [MirrorNodeClient.GET_CONTRACT_ENDPOINT, [400, 404]],
-    [MirrorNodeClient.GET_CONTRACT_RESULTS_BY_ADDRESS_ENDPOINT, [206, 400, 404]],
-    [MirrorNodeClient.GET_CONTRACT_RESULTS_DETAILS_BY_CONTRACT_ID_ENDPOINT, [400, 404]],
-    [MirrorNodeClient.GET_CONTRACT_RESULTS_DETAILS_BY_ADDRESS_AND_TIMESTAMP_ENDPOINT, [400, 404]],
-    [MirrorNodeClient.GET_CONTRACT_RESULT_ENDPOINT, [400, 404]],
-    [MirrorNodeClient.GET_CONTRACT_RESULT_LOGS_ENDPOINT, [400, 404]],
-    [MirrorNodeClient.GET_CONTRACT_RESULT_LOGS_BY_ADDRESS_ENDPOINT, [400, 404]],
-    [MirrorNodeClient.GET_CONTRACT_RESULTS_ENDPOINT, [400, 404]],
-    [MirrorNodeClient.GET_NETWORK_EXCHANGERATE_ENDPOINT, [400, 404]],
-    [MirrorNodeClient.GET_NETWORK_FEES_ENDPOINT, [400, 404]],
-    [MirrorNodeClient.GET_TOKENS_ENDPOINT, [400, 404]],
-    [MirrorNodeClient.GET_TRANSACTIONS_ENDPOINT, [400, 404]],
-    [MirrorNodeClient.CONTRACT_CALL_ENDPOINT, [404, 415, 500]],
-    [MirrorNodeClient.CONTRACT_ADDRESS_STATE_ENDPOINT, [400, 404]],
+    [MirrorNodeClient.GET_BALANCE_ENDPOINT, [404]],
+    [MirrorNodeClient.GET_BLOCK_ENDPOINT, [404]],
+    [MirrorNodeClient.GET_BLOCKS_ENDPOINT, [404]],
+    [MirrorNodeClient.GET_CONTRACT_ENDPOINT, [404]],
+    [MirrorNodeClient.GET_CONTRACT_RESULTS_BY_ADDRESS_ENDPOINT, [404]],
+    [MirrorNodeClient.GET_CONTRACT_RESULTS_DETAILS_BY_CONTRACT_ID_ENDPOINT, [404]],
+    [MirrorNodeClient.GET_CONTRACT_RESULTS_DETAILS_BY_ADDRESS_AND_TIMESTAMP_ENDPOINT, [404]],
+    [MirrorNodeClient.GET_CONTRACT_RESULT_ENDPOINT, [404]],
+    [MirrorNodeClient.GET_CONTRACT_RESULT_LOGS_ENDPOINT, [404]],
+    [MirrorNodeClient.GET_CONTRACT_RESULT_LOGS_BY_ADDRESS_ENDPOINT, [404]],
+    [MirrorNodeClient.GET_CONTRACT_RESULTS_ENDPOINT, [404]],
+    [MirrorNodeClient.GET_NETWORK_EXCHANGERATE_ENDPOINT, [404]],
+    [MirrorNodeClient.GET_NETWORK_FEES_ENDPOINT, [404]],
+    [MirrorNodeClient.GET_TOKENS_ENDPOINT, [404]],
+    [MirrorNodeClient.GET_TRANSACTIONS_ENDPOINT, [404]],
+    [MirrorNodeClient.CONTRACT_CALL_ENDPOINT, [404]],
+    [MirrorNodeClient.CONTRACT_ADDRESS_STATE_ENDPOINT, [404]],
   ]);
 
   private static ETHEREUM_TRANSACTION_TYPE = 'ETHEREUMTRANSACTION';

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

@@ -877,7 +877,7 @@ describe('Eth calls using MirrorNode', async function () {
 
   it('eth_getBlockByNumber with no match', async function () {
     cacheService.clear();
-    restMock.onGet(`blocks/${blockNumber}`).reply(400, {
+    restMock.onGet(`blocks/${blockNumber}`).reply(404, {
       _status: {
         messages: [
           {
@@ -1207,7 +1207,7 @@ describe('Eth calls using MirrorNode', async function () {
   it('eth_getBlockByHash with no match', async function () {
     cacheService.clear();
     // mirror node request mocks
-    restMock.onGet(`blocks/${blockHash}`).reply(400, {
+    restMock.onGet(`blocks/${blockHash}`).reply(404, {
       _status: {
         messages: [
           {
@@ -1260,7 +1260,7 @@ describe('Eth calls using MirrorNode', async function () {
 
   it('eth_getBlockTransactionCountByNumber with no match', async function () {
     cacheService.clear();
-    restMock.onGet(`blocks/${blockNumber}`).reply(400, {
+    restMock.onGet(`blocks/${blockNumber}`).reply(404, {
       _status: {
         messages: [
           {
@@ -1328,7 +1328,7 @@ describe('Eth calls using MirrorNode', async function () {
   it('eth_getBlockTransactionCountByHash with no match', async function () {
     cacheService.clear();
     // mirror node request mocks
-    restMock.onGet(`blocks/${blockHash}`).reply(400, {
+    restMock.onGet(`blocks/${blockHash}`).reply(404, {
       _status: {
         messages: [
           {
@@ -1397,7 +1397,7 @@ describe('Eth calls using MirrorNode', async function () {
       .onGet(
         `contracts/results?block.number=${defaultBlock.number}&transaction.index=${defaultBlock.count}&limit=100&order=asc`,
       )
-      .reply(400, {
+      .reply(404, {
         _status: {
           messages: [
             {
@@ -2681,9 +2681,16 @@ describe('Eth calls using MirrorNode', async function () {
         )
         .reply(400, { _status: { messages: [{ message: 'Mocked error' }] } });
 
-      const result = await ethImpl.getLogs(null, null, null, null, null);
-      expect(result).to.exist;
-      expect(result.length).to.eq(0);
+      let errorReceived = false;
+      try {
+        const result = await ethImpl.getLogs(null, null, null, null, null);
+      } catch (error) {
+        errorReceived = true;
+        expect(error.statusCode).to.equal(400);
+        expect(error.message).to.eq('Mocked error');
+      }
+
+      expect(errorReceived, 'Error should be thrown').to.be.true;
     });
 
     it('no filters', async function () {

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

@@ -68,8 +68,8 @@ describe('MirrorNodeClient', async function () {
 
   describe('handleError', async () => {
     const CONTRACT_CALL_ENDPOINT = 'contracts/call';
-    const nullResponseCodes = [404, 415, 500];
-    const errorRepsonseCodes = [501, 503, 400, 429];
+    const nullResponseCodes = [404];
+    const errorRepsonseCodes = [501, 503, 400, 429, 415, 500];
 
     for (const code of nullResponseCodes) {
       it(`returns null when ${code} is returned`, async () => {