[forge] Remove SenderAware shuffler from forge and tests #16109
Merged
+37
−8
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
⏱️ 1h 19m total CI duration on this PR
|
msmouse
reviewed
Mar 11, 2025
| @@ -439,11 +439,11 @@ pub(crate) fn realistic_network_tuned_for_throughput_test() -> ForgeConfig { | |||
| } | |||
| OnChainExecutionConfig::V4(config_v4) => { | |||
| config_v4.block_gas_limit_type = BlockGasLimitType::NoLimit; | |||
| config_v4.transaction_shuffler_type = TransactionShufflerType::SenderAwareV2(256); | |||
| config_v4.transaction_shuffler_type = TransactionShufflerType::default_for_genesis(); | |||
There was a problem hiding this comment.
if it's default we don't need to override, right?
probably should overwrite with
UseCaseAware {
sender_spread_factor: 256,
platform_use_case_spread_factor: 0,
user_use_case_spread_factor: 0,
},
Replaced with TransactionShufflerType::UseCaseAware
hariria
force-pushed
the
andrew/forge/remove-sender-aware-shuffler
branch
from
11ddec4 to
87a5488
Compare
msmouse
approved these changes
Mar 12, 2025
zekun000
approved these changes
Mar 12, 2025
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
✅ Forge suite
|
✅ Forge suite
|
✅ Forge suite
|
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.
Context
In a previous PR (#15613) I had deprecated the
SenderAwareV2shuffler given that we had made theUseCaseAwareShufflerthe default going forward.Unfortunately, I forgot to remove all instances of the
SenderAwareV2shuffler, including places where it was used in forge. Because of this theforge-realistic-network-tuned-for-throughputtest (which you can find inrealistic_network_tuned_for_throughput_test()for aptos-core here) was failing.Resolution
In forge I changed from
TransactionShufflerType::SenderAwareV2(256)toI also changed tests where appropriate
Test Plan
IDE Find Usages for
TransactionShufflerType::SenderAwareV2now only returns the following:create_transaction_shuffler-> this has anunreachable!branch forSenderAwareV2user_use_case_spread_factor-> returnsNonefor all deprecated shufflers(No longer used in tests and forge)