Refactor TransactionWatcher to accept either Transaction or hash #404
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
andreibancioiu
previously approved these changes
Mar 19, 2024
|
|
||
| await Promise.all([ | ||
| provider.mockTransactionTimelineByHash(hash, [new Wait(40), new TransactionStatus("pending"), new Wait(40), new TransactionStatus("executed"), new MarkCompleted()]), | ||
| watcher.awaitCompleted(dummyTransaction) |
| import { ITransactionFetcher } from "./interface"; | ||
| import { ITransactionEvent, ITransactionOnNetwork, ITransactionStatus } from "./interfaceOfNetwork"; | ||
| import { Logger } from "./logger"; | ||
|
|
||
| export type PredicateIsAwaitedStatus = (status: ITransactionStatus) => boolean; | ||
|
|
||
| /** | ||
| * Internal interface: a transaction, as seen from the perspective of a {@link TransactionWatcher}. |
There was a problem hiding this comment.
Indeed, for backwards compatibility (legacy).
src/transactionWatcher.ts
Outdated
| }; | ||
|
|
||
| const doFetch = async () => await this.fetcher.getTransaction(txHash); | ||
| const doFetch = async () => { | ||
| const hash = typeof transactionOrTxHash === "string" ? transactionOrTxHash : transactionOrTxHash.getHash().hex(); |
There was a problem hiding this comment.
Since logic is in several places, could have been extracted to a private function e.g. transactionOrTxHashToTxHash(...): string.
Can also stay as it is, though.
There was a problem hiding this comment.
extracted to a private method.
andreibancioiu
previously approved these changes
Mar 19, 2024
src/transactionWatcher.ts
Outdated
| } | ||
|
|
||
| private transactionOrTxHashToTxHash(transactionOrTxHash: ITransaction | string): string { | ||
| return typeof transactionOrTxHash === "string" ? transactionOrTxHash : transactionOrTxHash.getHash().hex(); |
There was a problem hiding this comment.
could also check the validity of the hash. it can be "invalid tx hash" instead of 64 hex chars
bogdan-rosianu
approved these changes
Mar 19, 2024
andreibancioiu
approved these changes
Mar 19, 2024
This was referenced Mar 24, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The methods of the
TransactionWatchercan be called using either the transaction object or the hash of the transaction.