VRF-330: enabling batch fulfillment for VRF e2e tests #13091
Merged
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
ibrajer
reviewed
May 6, 2024
Comment on lines
114
to
127
| if topic.Cmp(vrf_coordinator_v2_5.VRFCoordinatorV25RandomWordsFulfilled{}.Topic()) == 0 { | ||
| randomWordsFulfilledEvent, err := coordinator.ParseRandomWordsFulfilled(*eventLog) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("parse RandomWordsFulfilled log failed, err: %w", err) | ||
| } | ||
| randomWordsFulfilledEventArr = append(randomWordsFulfilledEventArr, randomWordsFulfilledEvent) | ||
| } | ||
| if topic.Cmp(vrf_coordinator_v2.VRFCoordinatorV2RandomWordsFulfilled{}.Topic()) == 0 { | ||
| randomWordsFulfilledEvent, err := coordinator.ParseRandomWordsFulfilled(*eventLog) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("parse RandomWordsFulfilled log failed, err: %w", err) | ||
| } | ||
| randomWordsFulfilledEventArr = append(randomWordsFulfilledEventArr, randomWordsFulfilledEvent) | ||
| } |
There was a problem hiding this comment.
That looks like the same code to me. Perpahs just checking if the topic comes from V2 or V25 and if that's not the case, throw an error? So something like this:
if topic.Cmp(vrf_coordinator_v2_5.VRFCoordinatorV25RandomWordsFulfilled{}.Topic()) != 0 && topic.Cmp(vrf_coordinator_v2.VRFCoordinatorV2RandomWordsFulfilled{}.Topic()) != 0 {
// return an error
}
// topic is detected, the processing is the same for both coordinator versions
randomWordsFulfilledEvent, err := coordinator.ParseRandomWordsFulfilled(*eventLog)
if err != nil {
return nil, fmt.Errorf("parse RandomWordsFulfilled log failed, err: %w", err)
}
randomWordsFulfilledEventArr = append(randomWordsFulfilledEventArr, randomWordsFulfilledEvent)
There was a problem hiding this comment.
good catch, thanks!
ibrajer
approved these changes
May 7, 2024
|
Tofel
reviewed
May 7, 2024
|
|
||
| //batchMaxGas := config.MaxGasLimit() (2.5 mill) + 400_000 = 2.9 mill | ||
| //callback gas limit set by consumer = 500k | ||
| // so 4 requests should be fulfilled inside 1 tx since 500k*4 < 2.9 mill |
Tofel
reviewed
May 7, 2024
|
|
||
| //ensure that no job present on the node | ||
| err = actions.DeleteJobs([]*client.ChainlinkClient{vrfNode.CLNode.API}) | ||
| require.NoError(t, err) |
Tofel
reviewed
May 7, 2024
| Msg("Request/Fulfilment Stats") | ||
|
|
||
| clNodeTxs, resp, err := nodeTypeToNodeMap[vrfcommon.VRF].CLNode.API.ReadTransactions() | ||
| require.NoError(t, err) |
Tofel
reviewed
May 7, 2024
| } | ||
| } | ||
| // verify that all fulfillments should be inside one tx | ||
| require.Equal(t, 1, len(batchFulfillmentTxs)) |
Tofel
reviewed
May 7, 2024
| require.NoError(t, err) | ||
|
|
||
| // verify that all fulfillments should be inside one tx | ||
| require.Equal(t, int(randRequestCount), len(randomWordsFulfilledLogs)) |
There was a problem hiding this comment.
add error message to the three above?
Tofel
reviewed
May 7, 2024
| randRequestCount := expectedNumberOfFulfillmentsInsideOneBatchFulfillment | ||
|
|
||
| t.Run("Batch Fulfillment Enabled", func(t *testing.T) { | ||
| configCopy := config.MustCopy().(tc.TestConfig) |
There was a problem hiding this comment.
we don't want to run them in parallel?
Tofel
reviewed
May 7, 2024
| require.True(t, exists, "VRF Node does not exist") | ||
| //ensure that no job present on the node | ||
| err = actions.DeleteJobs([]*client.ChainlinkClient{vrfNode.CLNode.API}) | ||
| require.NoError(t, err) |
There was a problem hiding this comment.
reluctantly adding those, but I dont think those add much value
Tofel
reviewed
May 7, 2024
| } | ||
| } | ||
| // verify that all fulfillments should be in separate txs | ||
| require.Equal(t, int(randRequestCount), len(singleFulfillmentTxs)) |
There was a problem hiding this comment.
add error message to requires above? 😅
Tofel
reviewed
May 7, 2024
| l.Error().Err(err).Msg("Error cleaning up test environment") | ||
| } | ||
| } | ||
| } |
There was a problem hiding this comment.
can't we define that as a function? you could have higher order function that returns this function as well, if needed. I see it's identical to the previous tests, why copy & paste?
Tofel
reviewed
May 7, 2024
|
|
||
| //batchMaxGas := config.MaxGasLimit() (2.5 mill) + 400_000 = 2.9 mill | ||
| //callback gas limit set by consumer = 500k | ||
| // so 4 requests should be fulfilled inside 1 tx since 500k*4 < 2.9 mill |
Tofel
reviewed
May 7, 2024
| @@ -2083,3 +2080,287 @@ func TestVRFv2PlusNodeReorg(t *testing.T) { | |||
| }) | |||
|
|
|||
| } | |||
|
|
|||
| func TestVRFv2PlusBatchFulfillmentEnabledDisabled(t *testing.T) { | |||
There was a problem hiding this comment.
well, tbh I would extract common logic to one function and then just pass as arguments vrfv2 and vrfv2plus specific parts so we don't have almost identical test
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.
No description provided.