Fuel merge part 10 - Fuel specific names for transaction fields#192
Merged
Conversation
DZakh
commented
Sep 12, 2024
Comment on lines
+94
to
+100
| let dict = Js.Dict.empty() | ||
| //Note: if we implement all transaction fields, we will need all | ||
| //field names not just non optional ones | ||
| Types.Transaction.nonOptionalFieldNames | ||
| ->Belt.Array.map(name => (name, getTxFieldFromEthersLog(log, name, ~logger))) | ||
| ->Js.Dict.fromArray | ||
| ->(Utils.magic: Js.Dict.t<txFieldVal> => Types.Transaction.t) | ||
| nonOptionalTransactionFieldNames->Belt.Array.forEach(name => { | ||
| dict->Js.Dict.set(name, getTxFieldFromEthersLog(log, name, ~logger)) | ||
| }) | ||
| dict->(Utils.magic: Js.Dict.t<txFieldVal> => Types.Transaction.t) |
Comment on lines
+44
to
+53
| /** | ||
| Holds the value of the next page fetch happening concurrently to current page processing | ||
| */ | ||
| type nextPageFetchRes = { | ||
| contractInterfaceManager: ContractInterfaceManager.t, | ||
| page: HyperSync.logsQueryPage, | ||
| pageFetchTime: int, | ||
| } | ||
|
|
||
| /** | ||
| Holds the value of the next page fetch happening concurrently to current page processing | ||
| */ | ||
| type nextPageFetchRes = { | ||
| contractInterfaceManager: ContractInterfaceManager.t, | ||
| page: HyperSync.logsQueryPage, | ||
| pageFetchTime: int, | ||
| } | ||
|
|
||
| let waitForBlockGreaterThanCurrentHeight = (~currentBlockHeight, ~logger) => { | ||
| HyperSync.pollForHeightGtOrEq( | ||
| ~serverUrl=T.endpointUrl, | ||
| ~blockNumber=currentBlockHeight, | ||
| ~logger, | ||
| ) | ||
| let makeGetNextPage = (~endpointUrl, ~contracts: array<Config.contract>, ~queryLogsPage, ~pollForHeightGtOrEq, ~blockSchema, ~transactionSchema) => { |
Member
Author
There was a problem hiding this comment.
Moved it outiside of the functor to simplify testing
Comment on lines
+107
to
+127
| let addMissingParams = (acc, fieldNames, returnedObj, ~prefix) => { | ||
| fieldNames->Array.forEach(fieldName => { | ||
| switch returnedObj | ||
| ->(Utils.magic: 'a => Js.Dict.t<unknown>) | ||
| ->Utils.Dict.dangerouslyGetNonOption(fieldName) | ||
| ->Utils.Option.mapNone(prefix ++ "." ++ fieldName) | ||
| ->Utils.Dict.dangerouslyGetNonOption(fieldName) { | ||
| | Some(_) => () | ||
| | None => acc->Array.push(prefix ++ "." ++ fieldName)->ignore | ||
| } | ||
| }) | ||
| } | ||
|
|
||
| //Note this function can throw an error | ||
| let convertEvent = (event: HyperSyncClient.ResponseTypes.event, ~nonOptionalBlockFieldNames): logsQueryPageItem => { | ||
| let missingParams = | ||
| [ | ||
| getMissingFields(Types.Log.fieldNames, event.log, ~prefix="log"), | ||
| getMissingFields(nonOptionalBlockFieldNames, event.block, ~prefix="block"), | ||
| getMissingFields( | ||
| Types.Transaction.nonOptionalFieldNames, | ||
| event.transaction, | ||
| ~prefix="transaction", | ||
| ), | ||
| ]->Array.concatMany | ||
|
|
||
| let convertEvent = (event: HyperSyncClient.ResponseTypes.event, ~nonOptionalBlockFieldNames, ~nonOptionalTransactionFieldNames): logsQueryPageItem => { | ||
| let missingParams = [] | ||
| missingParams->addMissingParams(Types.Log.fieldNames, event.log, ~prefix="log") | ||
| missingParams->addMissingParams(nonOptionalBlockFieldNames, event.block, ~prefix="block") | ||
| missingParams->addMissingParams( | ||
| nonOptionalTransactionFieldNames, | ||
| event.transaction, | ||
| ~prefix="transaction", | ||
| ) |
Member
Author
There was a problem hiding this comment.
Still the same validation, but should be a little bit more performant
Comment on lines
+14
to
+16
| type mock = {queryLogsPageCalls: array<queryLogsPageCall>} | ||
|
|
||
| let mock = (~blockSchema=S.object(_ => ()), ~transactionSchema=S.object(_ => ())) => { |
Member
Author
There was a problem hiding this comment.
This mock is not the most flexible, but can be extended to conveniently test the logSelections logic, as well as polling logic
JonoPrest
approved these changes
Sep 12, 2024
JonoPrest
left a comment
JonoPrest
left a comment
Collaborator
There was a problem hiding this comment.
Awesome Dmitry looks great 👌🏼 🙏🏼
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
No description provided.