Skip to content

Commit

Permalink
removes request details from args everywhere its used; adapt repeated…
Browse files Browse the repository at this point in the history
…Request to the changed logic

Signed-off-by: Konstantina Blazhukova <[email protected]>
  • Loading branch information
konstantinabl committed Nov 15, 2024
1 parent 44506b5 commit d5db1d0
Showing 1 changed file with 19 additions and 13 deletions.
32 changes: 19 additions & 13 deletions packages/relay/src/lib/clients/mirrorNodeClient.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,22 +18,22 @@
*
*/

import { ConfigService } from '@hashgraph/json-rpc-config-service/dist/services';
import Axios, { AxiosInstance, AxiosRequestConfig, AxiosResponse } from 'axios';
import axiosRetry from 'axios-retry';
import { install as betterLookupInstall } from 'better-lookup';
import { ethers } from 'ethers';
import http from 'http';
import https from 'https';
import { Logger } from 'pino';
import { ethers } from 'ethers';
import axiosRetry from 'axios-retry';
import constants from './../constants';
import { Histogram, Registry } from 'prom-client';

import { formatRequestIdMessage, formatTransactionId, parseNumericEnvVar } from '../../formatters';
import { predefined } from '../errors/JsonRpcError';
import { MirrorNodeClientError } from '../errors/MirrorNodeClientError';
import { SDKClientError } from '../errors/SDKClientError';
import { IOpcodesResponse } from './models/IOpcodesResponse';
import { install as betterLookupInstall } from 'better-lookup';
import { EthImpl } from '../eth';
import { CacheService } from '../services/cacheService/cacheService';
import { ConfigService } from '@hashgraph/json-rpc-config-service/dist/services';
import { MirrorNodeClientError } from '../errors/MirrorNodeClientError';
import Axios, { AxiosInstance, AxiosRequestConfig, AxiosResponse } from 'axios';
import { formatRequestIdMessage, formatTransactionId, parseNumericEnvVar } from '../../formatters';
import {
IContractCallRequest,
IContractCallResponse,
Expand All @@ -45,7 +45,8 @@ import {
MirrorNodeTransactionRecord,
RequestDetails,
} from '../types';
import { EthImpl } from '../eth';
import constants from './../constants';
import { IOpcodesResponse } from './models/IOpcodesResponse';

type REQUEST_METHODS = 'GET' | 'POST';

Expand Down Expand Up @@ -1303,6 +1304,9 @@ export class MirrorNodeClient {
*/
public async repeatedRequest(methodName: string, args: any[], repeatCount: number, requestDetails?: RequestDetails) {
let result;
const loggableArgs = [...args]; // Create a copy for logging
args.push(requestDetails); // Add requestDetails only for the method call

for (let i = 0; i < repeatCount; i++) {
try {
result = await this[methodName](...args);
Expand All @@ -1315,7 +1319,9 @@ export class MirrorNodeClient {
} else {
this.logger.warn(
e,
`${requestDetails?.formattedRequestId} Error raised during polling mirror node for updated records: method=${methodName}, args=${args}`,
`${requestDetails?.formattedRequestId} Error raised during polling mirror node for updated records: method=${methodName}, args=${JSON.stringify(
loggableArgs,
)}`,
);
}
}
Expand All @@ -1327,7 +1333,7 @@ export class MirrorNodeClient {
if (this.logger.isLevelEnabled('trace')) {
this.logger.trace(
`${requestDetails?.formattedRequestId} Repeating request ${methodName} with args ${JSON.stringify(
args,
loggableArgs,
)} retry count ${i} of ${repeatCount}. Waiting ${this.MIRROR_NODE_RETRY_DELAY} ms before repeating request`,
);
}
Expand Down Expand Up @@ -1366,7 +1372,7 @@ export class MirrorNodeClient {

const transactionRecords = await this.repeatedRequest(
this.getTransactionById.name,
[transactionId, requestDetails, 0],
[transactionId, 0],
this.MIRROR_NODE_REQUEST_RETRY_COUNT,
requestDetails,
);
Expand Down

0 comments on commit d5db1d0

Please sign in to comment.