Simplify dynamic linking imports tests #818
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
saulecabrera
reviewed
Nov 6, 2024
| @@ -432,63 +432,49 @@ impl Runner { | |||
| let module = Module::from_binary(self.linker.engine(), &self.wasm)?; | |||
There was a problem hiding this comment.
As a nit, given the description of the PR, could you rename this function reflect the intention? e.g., ensure_expected_imports (or something along those lines)
crates/runner/src/lib.rs
Outdated
Comment on lines
435
to
475
| let imports = module | ||
| .imports() | ||
| .filter(|i| i.module() == instance_name) | ||
| .collect::<Vec<_>>(); | ||
| assert_eq!(4, imports.len()); | ||
|
|
||
| let realloc = imports | ||
| .iter() | ||
| .find(|i| i.name() == "canonical_abi_realloc") | ||
| .expect("Should have canonical_abi_realloc import"); | ||
| let ty = realloc.ty(); | ||
| let f = ty.unwrap_func(); | ||
| assert!(f.params().all(|p| p.is_i32())); | ||
| assert_eq!(4, f.params().len()); | ||
| assert!(f.results().all(|p| p.is_i32())); | ||
| assert_eq!(1, f.results().len()); | ||
|
|
||
| let memory = imports | ||
| .iter() | ||
| .find(|i| i.name() == "memory" && i.ty().memory().is_some()); | ||
| assert!(memory.is_some(), "Should have memory import"); | ||
|
|
||
| let eval_bytecode = imports | ||
| .iter() | ||
| .find(|i| i.name() == "eval_bytecode") | ||
| .expect("Should have eval_bytecode import"); | ||
| let ty = eval_bytecode.ty(); | ||
| let f = ty.unwrap_func(); | ||
| assert!(f.params().all(|p| p.is_i32())); | ||
| assert_eq!(2, f.params().len()); | ||
| assert_eq!(0, f.results().len()); | ||
|
|
||
| let invoke = imports | ||
| .iter() | ||
| .find(|i| i.name() == "invoke") | ||
| .expect("Should have eval_bytecode import"); | ||
| let ty = invoke.ty(); | ||
| let f = ty.unwrap_func(); | ||
| assert!(f.params().all(|p| p.is_i32())); | ||
| assert_eq!(4, f.params().len()); | ||
| assert_eq!(0, f.results().len()); |
There was a problem hiding this comment.
Could you replace the asserts with bail! or Err(anyhow::Error)? I get that we're asserting and that the runner is mostly used in tests, however, I'd like to ensure that errors are recoverable here so that failures can bubble up with as much as context as possible to the test invoking them.
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 of the change
Simplifies the test code for checking the imports that dynamically linked modules have. At the moment, we always import
canonical_abi_realloc,memory,eval_bytecode, andinvoke, so we don't need separate tests for dynamically linked modules that have named exports.Why am I making this change?
I'm going to need to adjust how we check the imports to exclude
eval_bytecodeand reduce the number of expected imports for certain dynamically linked modules in an upcoming PR and wanted to refactor the test suite outside of that PR first.Checklist
javy-cliandjavy-plugindo not require updating CHANGELOG files.