refactor(mirror): return a struct with a Vec of txs in next_batch() #11325
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
this can just be an ExtraTxs batch with the txs we send, and there's no need to queue a fake block
that just has a list of txs
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #11325 +/- ##
==========================================
+ Coverage 71.04% 71.06% +0.02%
==========================================
Files 782 783 +1
Lines 156618 156873 +255
Branches 156618 156873 +255
==========================================
+ Hits 111264 111479 +215
- Misses 40533 40561 +28
- Partials 4821 4833 +12
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
tayfunelmas
approved these changes
May 16, 2024
marcelo-gonzalez
added a commit
to marcelo-gonzalez/nearcore
that referenced
this pull request
May 17, 2024
This reverts commit e301c09 from near#11325. This small commit was not necessary, and actually incorrect, because there's an assumption that changed access keys will only appear in SentBatch::MappedBlock(). Otherwise we hit an assertion here: https://github.com/near/nearcore/blob/510948178c5920c614448dc7bcce72873a1655fd/tools/mirror/src/chain_tracker.rs#L1026
github-merge-queue bot
pushed a commit
that referenced
this pull request
May 18, 2024
This reverts commit e301c09 from #11325. This small commit was not necessary, and actually incorrect, because there's an assumption that changed access keys will only appear in SentBatch::MappedBlock(). Otherwise we hit an assertion here: https://github.com/near/nearcore/blob/510948178c5920c614448dc7bcce72873a1655fd/tools/mirror/src/chain_tracker.rs#L1026
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.
Before this change, the
TxTrackerreturns aMappedBlockfromnext_batch()and accepts it (viaSentBatch) inon_txs_sent(). This struct contains a vec of transactions per chunk, and corresponds to a particular block height. In preparation for implementing a qps option tomirror run, we refactor it to return a newstruct TxBatch, which only has aVecof the transactions we want to send. The previous separation of the transactions by shard served no purpose, really, and removing that will make it easier to implement the qps option, since then we'll no longer be batching transactions by block height, but will just be sending them at a regular interval regardless of block height or shard ID.The
struct MappedBlockdoesn't fully go away with this PR, since it's cumbersome to remove it everywhere, but this refactoring should be enough to let us move forward