add extended_checks to aptos-transactional-test-harness #13337
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
brmataptos
force-pushed
the
brm-issue-13297
branch
from
b7483a7
to
c7e4315
Compare
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #13337 +/- ##
=========================================
- Coverage 33.0% 33.0% -0.1%
=========================================
Files 1760 1760
Lines 338918 338939 +21
=========================================
- Hits 112023 111961 -62
- Misses 226895 226978 +83 ☔ View full report in Codecov by Sentry. |
15 tasks
rahxephon89
reviewed
May 20, 2024
| @@ -113,7 +113,7 @@ impl<'a> ExtendedChecker<'a> { | |||
|
|
|||
| fn run(&mut self) { | |||
| for ref module in self.env.get_modules() { | |||
| if module.is_target() { | |||
| if module.is_primary_target() { | |||
There was a problem hiding this comment.
Thanks for fixing this @brmataptos. After changing to is_primary_target, we need to be careful and make sure for the V1 path, all target modules are checked.
rahxephon89
reviewed
May 20, 2024
| @@ -874,7 +951,8 @@ fn compile_ir_module<'a>( | |||
| ) -> Result<CompiledModule> { | |||
| use move_ir_compiler::Compiler as IRCompiler; | |||
| let code = std::fs::read_to_string(file_name).unwrap(); | |||
| IRCompiler::new(deps.collect()).into_compiled_module(&code) | |||
| let module = IRCompiler::new(deps.collect()).into_compiled_module(&code)?; | |||
There was a problem hiding this comment.
A noob question, what is the difference between before and after this code change?
There was a problem hiding this comment.
Nothing. At some point I had added an Option<GlobalEnv> result to a tuple here, but then realized it wasn't useful. I guess i didn't clean up completely.
rahxephon89
reviewed
May 20, 2024
| } | ||
| struct OuterStruct has key { | ||
| any_field: vector<InnerStruct> | ||
| bug: BYTECODE VERIFICATION FAILED |
There was a problem hiding this comment.
This just reveals that the issue #13191 still exists?
rahxephon89
reviewed
May 20, 2024
| @@ -130,9 +135,10 @@ fn annotated_module_from_unit(unit: &AnnotatedCompiledUnit) -> Option<&Annotated | |||
| } | |||
| } | |||
|
|
|||
| impl PreCompiledModules for FullyCompiledProgram { | |||
| impl PreCompiledModules for (FullyCompiledProgram, Vec<PackagePaths>) { | |||
There was a problem hiding this comment.
I did not even know we can do something like this.
There was a problem hiding this comment.
I only tried it on a whim, and was surprised to find it compiles.
rahxephon89
approved these changes
May 20, 2024
wrwg
approved these changes
May 20, 2024
brmataptos
force-pushed
the
brm-issue-13297
branch
from
82368c7
to
954367f
Compare
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.
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.
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.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
brmataptos
force-pushed
the
brm-issue-13297
branch
from
a8637fb
to
0d9e0f8
Compare
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.
Description
Run
extended_checksas part of theaptos-transactional-test-harness.Fixes #13297.
To run
extended_checkswe need a model (GlobalEnv) to be generatedby compilation. For Compiler V2 this is pretty straightforward, as we
just have to enable the
"attach-compiled-module"experiment. ForCompiler V1, the compilation entry point currently used by the test
framework doesn't generate a model as part of compilation, and reusing
the process used in
BuiltPackage::build()(defined inaptos-move/framework/src/build_package.rs) is overly complex.So instead, we follow the process that was used in
CompiledPackage::build_all()(defined inthird_party/move/tools/move-package/src/compilation/compiled_package.rs)to build a model under compiler V1, needed for ABIs or Docgen with
compiler V1.
The main implication is that we need input
PackagePathsfordependencies, notably the Stdlibs, so we make a copy of that in the
framework to be re-used in
compile_source_unit()(defined inthird_party/move/testing-infra/transactional-test-runner/src/framework.rs)if
need_modelistrue.We just learned that Rust Traits can't call a default implementation
from a specialized implementation, so we must rename the default
implementations of
MoveTestAdaptertrait functionscompile_moduleand
compile_scriptas*_default(), leaving the original functionsas forwarders that can be overwritten by new implementations for
AptosTestAdapter(defined inaptos-move/aptos-transactional-test-harness/src/aptos_test_harness.rs)to call the default compile methods and then run extended checks as
appropriate.
How Has This Been Tested?
Added a new test that should fails extended checks.
Was reminded that an existing test (
diamond_clicker.move) should have been failingextended checks, as it now fails in bytcode verification.
Key Areas to Review
It's a little messy, but much of the mess relates to compiler-v1 and
the third_party/aptos-move boundary which both should be going away
soonish, so let's not get hung up on it. :-) We really need to
refactor to simplify the compiler/module-building interfaces, but skip
that for now.
Type of Change
Which Components or Systems Does This Change Impact?
Checklist