From 099c287a9d83f21115ded7ef82e8e005d37055bb Mon Sep 17 00:00:00 2001
From: enekoox <garsanzi@gmail.com>
Date: Tue, 10 Dec 2024 16:51:14 +0100
Subject: [PATCH] Enable eslint restrict-template-expressions plugin has a few
 extra linting errors (#3694)

* Solve restrict-template-expressions linting errors

* Fix whitespace; move suppression to line to which it pertains

---------

Co-authored-by: Steven Luscher <steven.luscher@anza.xyz>
---
 examples/deserialize-transaction/src/example.ts              | 2 +-
 packages/errors/src/message-formatter.ts                     | 5 ++++-
 .../rpc-transport-http/src/__tests__/http-transport-test.ts  | 1 +
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/examples/deserialize-transaction/src/example.ts b/examples/deserialize-transaction/src/example.ts
index 6fb6090b46ae..483f3f64c38c 100644
--- a/examples/deserialize-transaction/src/example.ts
+++ b/examples/deserialize-transaction/src/example.ts
@@ -310,7 +310,7 @@ const decompiledTransactionMessage = await decompileTransactionMessageFetchingLo
 // This is the same data structure that was created before we first signed the transaction
 
 // We can see the fee payer:
-log.info(`[step 3] The transaction fee payer is ${decompiledTransactionMessage.feePayer}`);
+log.info(`[step 3] The transaction fee payer is ${decompiledTransactionMessage.feePayer.address}`);
 
 // And the lifetime constraint:
 log.info(decompiledTransactionMessage.lifetimeConstraint, '[step 3] The transaction lifetime constraint');
diff --git a/packages/errors/src/message-formatter.ts b/packages/errors/src/message-formatter.ts
index c91672e65e79..ef51e30e52af 100644
--- a/packages/errors/src/message-formatter.ts
+++ b/packages/errors/src/message-formatter.ts
@@ -28,7 +28,10 @@ export function getHumanReadableErrorMessage<TErrorCode extends SolanaErrorCode>
             const variableName = messageFormatString.slice(state[START_INDEX] + 1, endIndex);
 
             fragments.push(
-                variableName in context ? `${context[variableName as keyof typeof context]}` : `$${variableName}`,
+                variableName in context
+                    ? // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
+                      `${context[variableName as keyof typeof context]}`
+                    : `$${variableName}`,
             );
         } else if (state[TYPE] === StateType.Text) {
             fragments.push(messageFormatString.slice(state[START_INDEX], endIndex));
diff --git a/packages/rpc-transport-http/src/__tests__/http-transport-test.ts b/packages/rpc-transport-http/src/__tests__/http-transport-test.ts
index 382caf78ca87..0ca641b3239c 100644
--- a/packages/rpc-transport-http/src/__tests__/http-transport-test.ts
+++ b/packages/rpc-transport-http/src/__tests__/http-transport-test.ts
@@ -71,6 +71,7 @@ describe('createHttpTransport', () => {
                 thrownError = e as SolanaError<typeof SOLANA_ERROR__RPC__TRANSPORT_HTTP_ERROR>;
             }
             expect(thrownError).toBeDefined();
+            // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
             expect(`${thrownError.context.headers}`).not.toMatch(/doNotLog/);
         });
     });