chore: fix tests

Signed-off-by: nikolay <n.atanasow94@gmail.com>

Author: natanasow

packages/relay/src/lib/decorators/cache.decorator.ts

@@ -4,9 +4,31 @@ import { RequestDetails } from '../types';
 import { ConfigService } from '@hashgraph/json-rpc-config-service/dist/services';
 import { CacheService } from '../services/cacheService/cacheService';
 
+interface CacheSingleParam {
+  index: string,
+  value: string
+}
+
+interface CacheNamedParam {
+  name: string,
+  value: string
+}
+
+interface CacheNamedParams {
+  index: string,
+  fields: CacheNamedParam[]
+}
+
+interface CacheOptions {
+  skipParams?: CacheSingleParam[],
+  skipNamedParams?: CacheNamedParams[],
+  ttl?: number,
+}
+
 const shouldSkipCachingForSingleParams = (args: any, params: any = []) => {
   for (const item of params) {
-    if (args[item.index] == item.value) {
+    const values = item.value.split('|');
+    if (values.indexOf(args[item.index]) > -1) {
       return true;
     }
   }
@@ -22,7 +44,8 @@ const shouldSkipCachingForNamedParams = (args: any, params: any = []) => {
     }));
 
     for (const [key, value] of Object.entries(skipList)) {
-      if (input[key] == value) {
+      const values = (value as string).split('|');
+      if (values.indexOf(input[key]) > -1) {
         return true;
       }
     }
@@ -63,27 +86,6 @@ const extractRequestDetails = (args: any): RequestDetails => {
   return new RequestDetails({ requestId, ipAddress, connectionId });
 };
 
-interface CacheSingleParam {
-  index: string,
-  value: string
-}
-
-interface CacheNamedParam {
-  name: string,
-  value: string
-}
-
-interface CacheNamedParams {
-  index: string,
-  fields: CacheNamedParam[]
-}
-
-interface CacheOptions {
-  skipParams?: CacheSingleParam[],
-  skipNamedParams?: CacheNamedParams[],
-  ttl?: number,
-}
-
 export function cache(cacheService: CacheService, options: CacheOptions = {}) {
   return function(_target: any, _propertyKey: string, descriptor: PropertyDescriptor) {
     const method = descriptor.value;

packages/relay/src/lib/eth.ts

@@ -174,7 +174,7 @@ export class EthImpl implements Eth {
   })
   @rpcParamLayoutConfig(RPC_LAYOUT.custom((params) => [Number(params[0]), params[1], params[2]]))
   @cache(CacheService.getInstance(CACHE_LEVEL.L1), {
-    skipParams: [{ index: '2', value: 'latest' }],
+    skipParams: [{ index: '2', value: 'latest|pending|finalized|safe' }],
     ttl: constants.CACHE_TTL.FIFTEEN_MINUTES,
   })
   async feeHistory(
@@ -679,7 +679,7 @@ export class EthImpl implements Eth {
   })
   @rpcParamLayoutConfig(RPC_LAYOUT.custom((params) => [params[0], params[1], params[2]]))
   @cache(CacheService.getInstance(CACHE_LEVEL.L1), {
-    skipParams: [{ index: '2', value: 'latest' }],
+    skipParams: [{ index: '2', value: 'latest|pending|finalized|safe' }],
   })
   async getStorageAt(
     address: string,
@@ -708,7 +708,7 @@ export class EthImpl implements Eth {
     1: { type: ParamType.BLOCK_NUMBER_OR_HASH, required: true },
   })
   @cache(CacheService.getInstance(CACHE_LEVEL.L1), {
-    skipParams: [{ index: '1', value: 'latest' }],
+    skipParams: [{ index: '1', value: 'latest|pending|finalized|safe' }],
   })
   async getBalance(
     account: string,
@@ -736,7 +736,7 @@ export class EthImpl implements Eth {
     1: { type: ParamType.BLOCK_NUMBER_OR_HASH, required: true },
   })
   @cache(CacheService.getInstance(CACHE_LEVEL.L1), {
-    skipParams: [{ index: '1', value: 'latest' }],
+    skipParams: [{ index: '1', value: 'latest|pending|finalized|safe' }],
   })
   public async getCode(
     address: string,
@@ -801,7 +801,7 @@ export class EthImpl implements Eth {
     0: { type: ParamType.BLOCK_NUMBER, required: true },
   })
   @cache(CacheService.getInstance(CACHE_LEVEL.L1), {
-    skipParams: [{ index: '0', value: 'latest' }],
+    skipParams: [{ index: '0', value: 'latest|pending|finalized|safe' }],
   })
   async getBlockTransactionCountByNumber(
     blockNumOrTag: string,
@@ -852,7 +852,7 @@ export class EthImpl implements Eth {
     1: { type: ParamType.HEX, required: true },
   })
   @cache(CacheService.getInstance(CACHE_LEVEL.L1), {
-    skipParams: [{ index: '0', value: 'latest' }],
+    skipParams: [{ index: '0', value: 'latest|pending|finalized|safe' }],
   })
   async getTransactionByBlockNumberAndIndex(
     blockNumOrTag: string,
@@ -883,7 +883,7 @@ export class EthImpl implements Eth {
     1: { type: ParamType.BOOLEAN, required: true },
   })
   @cache(CacheService.getInstance(CACHE_LEVEL.L1), {
-    skipParams: [{ index: '0', value: 'latest' }],
+    skipParams: [{ index: '0', value: 'latest|pending|finalized|safe' }],
   })
   async getBlockByNumber(
     blockNumOrTag: string,
@@ -1058,8 +1058,8 @@ export class EthImpl implements Eth {
       {
         index: '0',
         fields: [
-          { name: 'fromBlock', value: 'latest' },
-          { name: 'toBlock', value: 'latest' },
+          { name: 'fromBlock', value: 'latest|pending|finalized|safe' },
+          { name: 'toBlock', value: 'latest|pending|finalized|safe' },
         ],
       },
     ],
@@ -1102,7 +1102,7 @@ export class EthImpl implements Eth {
     0: { type: ParamType.BLOCK_NUMBER_OR_HASH, required: true },
   })
   @cache(CacheService.getInstance(CACHE_LEVEL.L1), {
-    skipParams: [{ index: '0', value: 'latest' }],
+    skipParams: [{ index: '0', value: 'latest|pending|finalized|safe' }],
   })
   public async getBlockReceipts(blockHashOrBlockNumber: string, requestDetails: RequestDetails): Promise<Receipt[]> {
     return await this.blockService.getBlockReceipts(blockHashOrBlockNumber, requestDetails);