fluencelabs/parity-wasm
1
0
Fork 0
mirror of https://github.com/fluencelabs/parity-wasm synced 2025-06-28 14:11:57 +00:00
Code Issues Projects Releases Wiki Activity

removed 'AbsenceMismatch' test

Browse Source
This commit is contained in:
Svyatoslav Nikolsky
2017-09-04 12:25:23 +03:00
parent a85162dcd1
commit 39be2717c9
2 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/interpreter/module.rs
View File

@ -315,11 +315,11 @@ impl<E> ModuleInstance<E> where E: UserError {
return Err(Error::Validation(format!("trying to import memory with initial={} and import.initial={}", memory_limits.initial(), import_limits.initial())));
}
// not working because of wabt tests:
// a linear-memory import is required to have a maximum length if the imported linear memory has a maximum length.
// if present, a linear-memory import's maximum length is required to be at least the imported linear memory's maximum length.
match (memory_limits.maximum(), import_limits.maximum()) {
(Some(_), None) | (None, Some(_)) =>
return Err(Error::Validation("trying to import memory with maximum absence mismatch".into())),
(Some(ml), Some(il)) if il < ml =>
return Err(Error::Validation(format!("trying to import memory with maximum={} and import.maximum={}", ml, il))),
_ => (),
@ -337,11 +337,11 @@ impl<E> ModuleInstance<E> where E: UserError {
return Err(Error::Validation(format!("trying to import table with initial={} and import.initial={}", table_limits.initial(), import_limits.initial())));
}
// not working because of wabt tests:
// a table import is required to have a maximum length if the imported table has a maximum length.
// if present, a table import's maximum length is required to be at least the imported table's maximum length.
match (table_limits.maximum(), import_limits.maximum()) {
(Some(_), None) | (None, Some(_)) =>
return Err(Error::Validation("trying to import table with maximum absence mismatch".into())),
(Some(ml), Some(il)) if il < ml =>
return Err(Error::Validation(format!("trying to import table with maximum={} and import.maximum={}", ml, il))),
_ => (),

16
src/interpreter/tests/basics.rs
View File

@ -490,11 +490,11 @@ fn memory_import_limits_initial() {
#[test]
fn memory_import_limits_maximum() {
#[derive(Debug, Clone, Copy, PartialEq)]
enum MaximumError { AbsenceMismatch, ValueMismatch, Ok };
enum MaximumError { ValueMismatch, Ok };
let test_cases = vec![
(None, Some(100), MaximumError::AbsenceMismatch),
(Some(100), None, MaximumError::AbsenceMismatch),
(None, Some(100), MaximumError::Ok),
(Some(100), None, MaximumError::Ok),
(Some(100), Some(98), MaximumError::ValueMismatch),
(Some(100), Some(100), MaximumError::Ok),
(Some(100), Some(101), MaximumError::Ok),
@ -515,8 +515,6 @@ fn memory_import_limits_maximum() {
program.add_module("core", core_module, None).unwrap();
match program.add_module("client", client_module, None).map(|_| ()) {
Err(Error::Validation(actual_err)) => match expected_err {
MaximumError::AbsenceMismatch
if actual_err == "trying to import memory with maximum absence mismatch".to_owned() => (),
MaximumError::ValueMismatch
if actual_err == format!("trying to import memory with maximum={} and import.maximum={}", core_maximum.unwrap_or_default(), client_maximum.unwrap_or_default()) => (),
_ => panic!("unexpected validation error for test_case {:?}: {}", test_case, actual_err),
@ -560,11 +558,11 @@ fn table_import_limits_initial() {
#[test]
fn table_import_limits_maximum() {
#[derive(Debug, Clone, Copy, PartialEq)]
enum MaximumError { AbsenceMismatch, ValueMismatch, Ok };
enum MaximumError { ValueMismatch, Ok };
let test_cases = vec![
(None, Some(100), MaximumError::AbsenceMismatch),
(Some(100), None, MaximumError::AbsenceMismatch),
(None, Some(100), MaximumError::Ok),
(Some(100), None, MaximumError::Ok),
(Some(100), Some(98), MaximumError::ValueMismatch),
(Some(100), Some(100), MaximumError::Ok),
(Some(100), Some(101), MaximumError::Ok),
@ -585,8 +583,6 @@ fn table_import_limits_maximum() {
program.add_module("core", core_module, None).unwrap();
match program.add_module("client", client_module, None).map(|_| ()) {
Err(Error::Validation(actual_err)) => match expected_err {
MaximumError::AbsenceMismatch
if actual_err == "trying to import table with maximum absence mismatch".to_owned() => (),
MaximumError::ValueMismatch
if actual_err == format!("trying to import table with maximum={} and import.maximum={}", core_maximum.unwrap_or_default(), client_maximum.unwrap_or_default()) => (),
_ => panic!("unexpected validation error for test_case {:?}: {}", test_case, actual_err),