[aggregator] Fix simulation & view for delayed fields #12063
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
georgemitenkov
requested review from
davidiw,
movekevin,
wrwg,
zekun000,
vgao1996,
banool,
gregnazario and
0xmaayan
as code owners
georgemitenkov
requested review from
vusirikala,
sitalkedia,
gelash and
igor-aptos
georgemitenkov
added
the
CICD:run-e2e-tests
igor-aptos
approved these changes
Feb 16, 2024
Codecov ReportAttention:
Additional details and impacted files@@ Coverage Diff @@
## main #12063 +/- ##
=======================================
Coverage 71.4% 71.4%
=======================================
Files 802 802
Lines 184373 184411 +38
=======================================
+ Hits 131737 131826 +89
+ Misses 52636 52585 -51 ☔ View full report in Codecov by Sentry. |
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.
This comment has been minimized.
This comment has been minimized.
ziaptos
approved these changes
Feb 16, 2024
aptos-move/aptos-vm/src/aptos_vm.rs
Outdated
|
|
||
| fn new_impl( | ||
| resolver: &impl AptosMoveResolver, | ||
| is_delayed_field_optimization_capable: bool, |
There was a problem hiding this comment.
Too many constructors, we can have:
fn new(resolver: &..., maybe_override_delay_field_flag: Option) and cover all the cases.
aptos-move/aptos-vm/src/aptos_vm.rs
Outdated
| } | ||
|
|
||
| pub(crate) fn new_with_delayed_fields(resolver: &impl AptosMoveResolver) -> Self { | ||
| Self::new_impl(resolver, true) |
There was a problem hiding this comment.
Should we assert resolver.is_delayed_field_optimization_capable())
There was a problem hiding this comment.
Used a single constructor instead
| @@ -82,3 +86,57 @@ async fn test_simulate_transaction_with_insufficient_balance() { | |||
| let resp = simulate_aptos_transfer(&mut context, false, LARGE_TRANSFER_AMOUNT, 200).await; | |||
| assert!(!resp[0]["success"].as_bool().is_some_and(|v| v)); | |||
| } | |||
|
|
|||
| #[tokio::test(flavor = "multi_thread", worker_threads = 2)] | |||
There was a problem hiding this comment.
Do we know what is this worker_threads = 2 achieving?
There was a problem hiding this comment.
This makes sure your runtime is configured as multi-threaded with 2 threads to run async
| @@ -0,0 +1 @@ | |||
| ["10"] | |||
There was a problem hiding this comment.
golden tests compare the full file so new line breaks them
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.
This comment has been minimized.
This comment has been minimized.
vusirikala
reviewed
Feb 16, 2024
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.
This comment has been minimized.
This comment has been minimized.
vusirikala
reviewed
Feb 16, 2024
| let vm = AptosVM::new(&resolver); | ||
| let vm = AptosVM::new( | ||
| &resolver, | ||
| /*override_is_delayed_field_optimization_capable=*/ Some(false), |
There was a problem hiding this comment.
Why do we need to disable aggregators here?
There was a problem hiding this comment.
This runs outside of Block-STM context
vusirikala
approved these changes
Feb 16, 2024
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
✅ Forge suite
|
✅ Forge suite
|
gelash
reviewed
Feb 16, 2024
| @@ -0,0 +1,26 @@ | |||
| module addr::counter { | |||
There was a problem hiding this comment.
Do we need them for test sources as well?
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.
Description
Previously, we have been tagging aggregator fields if the feature flag is enabled. This is not correct because it can be enabled but we run under non-capable context (i.e., outside of Block-STM). This PR fixes that by explicitly providing a boolean whether type layouts need to be tagged inside a VM.
Test Plan