Skip to content

Commit

Permalink
Enable eslint restrict-template-expressions plugin has a few extra li…
Browse files Browse the repository at this point in the history
…nting errors (#3694)

* Solve restrict-template-expressions linting errors

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

---------

Co-authored-by: Steven Luscher <[email protected]>
  • Loading branch information
kox and steveluscher authored Dec 10, 2024
1 parent 06e063e commit 099c287
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 2 deletions.
2 changes: 1 addition & 1 deletion examples/deserialize-transaction/src/example.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down
5 changes: 4 additions & 1 deletion packages/errors/src/message-formatter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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/);
});
});
Expand Down

0 comments on commit 099c287

Please sign in to comment.