chore: resolve comments

Signed-off-by: nikolay <[email protected]>
hashgraph · Nov 27, 2024 · 59dd3be · 59dd3be
1 parent bc8267d
commit 59dd3be
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/packages/relay/src/lib/eth.ts b/packages/relay/src/lib/eth.ts
@@ -1593,6 +1593,13 @@ export class EthImpl implements Eth {
     }
 
     if (e instanceof SDKClientError) {
+      if (e.nodeAccountId) {
+        // Log the target node account ID, right now, it's populated only for MaxAttemptsOrTimeout error
+        this.logger.info(
+          `${requestDetails.formattedRequestId} Transaction failed to execute against node with id: ${e.nodeAccountId}`,
+        );
+      }
+
       this.hapiService.decrementErrorCounter(e.statusCode);
       if (e.status.toString() === constants.TRANSACTION_RESULT_STATUS.WRONG_NONCE) {
         const mirrorNodeGetContractResultRetries = this.mirrorNodeClient.getMirrorNodeRequestRetryCount();
@@ -1698,11 +1705,6 @@ export class EthImpl implements Eth {
     } catch (e: any) {
       if (e instanceof SDKClientError && (e.isConnectionDropped() || e.isTimeoutExceeded())) {
         submittedTransactionId = e.transactionId || '';
-
-        // Log the target node account ID, right now, it's populated only for MaxAttemptsOrTimeout error
-        this.logger.info(
-          `${requestDetails.formattedRequestId} Transaction failed to execute against node with id: ${e.nodeAccountId}`
-        );
       }
 
       sendRawTransactionError = e;

diff --git a/packages/relay/tests/lib/errors/SDKClientError.spec.ts b/packages/relay/tests/lib/errors/SDKClientError.spec.ts
@@ -18,8 +18,9 @@
  *
  */
 
-import { expect } from 'chai';
 import { Status } from '@hashgraph/sdk';
+import { expect } from 'chai';
+
 import { SDKClientError } from '../../../src/lib/errors/SDKClientError'; // Update the path to point to the SDKClientError file
 
 describe('SDKClientError', () => {
@@ -115,4 +116,10 @@ describe('SDKClientError', () => {
     expect(error.statusCode).to.equal(invalidStatus._code);
     expect(error.isValidNetworkError()).to.be.true;
   });
+
+  it('should be able to get nodeAccountId', () => {
+    const nodeId = '0.0.3';
+    const error = new SDKClientError({}, undefined, undefined, nodeId);
+    expect(error.nodeAccountId).to.equal(nodeId);
+  });
 });