fluencelabs/wasmer
1
0
Fork 0
mirror of https://github.com/fluencelabs/wasmer synced 2025-06-25 22:51:32 +00:00
Code Issues Projects Releases Wiki Activity

Support checking the execution limit exceeded error.

Browse Source
This commit is contained in:
losfair
2019-06-05 11:51:33 +08:00
parent 0867208e0c
commit f2d8aad73a
4 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/middleware-common/src/metering.rs
View File

@ -34,6 +34,9 @@ impl Metering {
}
}
#[derive(Copy, Clone, Debug)]
pub struct ExecutionLimitExceededError;
impl FunctionMiddleware for Metering {
type Error = String;
fn feed_event<'a, 'b: 'a>(
@ -93,9 +96,8 @@ impl FunctionMiddleware for Metering {
}));
sink.push(Event::Internal(InternalEvent::Breakpoint(Box::new(
move |ctx| {
eprintln!("execution limit reached");
unsafe {
(ctx.throw)();
(ctx.throw)(Box::new(ExecutionLimitExceededError));
}
},
))));
@ -251,6 +253,7 @@ mod tests {
#[test]
fn test_traps_after_costly_call() {
use wasmer_runtime_core::error::RuntimeError;
let wasm_binary = wat2wasm(WAT).unwrap();
let limit = 100u64;
@ -265,8 +268,13 @@ mod tests {
let add_to: Func<(i32, i32), i32> = instance.func("add_to").unwrap();
let result = add_to.call(10_000_000, 4);
// verify it errors
assert_eq!(result.is_err(), true); // TODO assert that the trap is caused by PointsExausted
let err = result.unwrap_err();
match err {
RuntimeError::Error { data } => {
assert!(data.downcast_ref::<ExecutionLimitExceededError>().is_some());
},
_ => unreachable!(),
}
// verify is uses the correct number of points
assert_eq!(get_points_used(&instance), 109); // Used points will be slightly more than `limit` because of the way we do gas checking.