status-im
/
evmc
mirror of https://github.com/status-im/evmc.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

rust: expect output as slice in ExecutionResult

This commit is contained in:
Alex Beregszaszi 2019-07-03 15:56:26 +01:00
parent 87ad703e62
commit 593ef3b6ac
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bindings/rust/evmc-vm/src/lib.rs
View File

@ -51,13 +51,13 @@ impl ExecutionResult {
pub fn new( pub fn new(
_status_code: ffi::evmc_status_code, _status_code: ffi::evmc_status_code,
_gas_left: i64, _gas_left: i64,
_output: Option<&Vec<u8>>, _output: Option<&[u8]>,
) -> Self { ) -> Self {
ExecutionResult { ExecutionResult {
status_code: _status_code, status_code: _status_code,
gas_left: _gas_left, gas_left: _gas_left,
output: if _output.is_some() { output: if _output.is_some() {
Some(_output.unwrap().clone()) Some(_output.unwrap().to_vec())
} else { } else {
None None
}, },
@ -69,7 +69,7 @@ impl ExecutionResult {
ExecutionResult::new(ffi::evmc_status_code::EVMC_FAILURE, 0, None) ExecutionResult::new(ffi::evmc_status_code::EVMC_FAILURE, 0, None)
} }
pub fn success(_gas_left: i64, _output: Option<&Vec<u8>>) -> Self { pub fn success(_gas_left: i64, _output: Option<&[u8]>) -> Self {
ExecutionResult::new(ffi::evmc_status_code::EVMC_SUCCESS, _gas_left, _output) ExecutionResult::new(ffi::evmc_status_code::EVMC_SUCCESS, _gas_left, _output)
} }
@ -486,7 +486,7 @@ mod tests {
let r = ExecutionResult::new( let r = ExecutionResult::new(
ffi::evmc_status_code::EVMC_FAILURE, ffi::evmc_status_code::EVMC_FAILURE,
420, 420,
Some(&vec![0xc0, 0xff, 0xee, 0x71, 0x75]), Some(&[0xc0, 0xff, 0xee, 0x71, 0x75]),
); );
let f: *const ffi::evmc_result = r.into(); let f: *const ffi::evmc_result = r.into();
@ -530,7 +530,7 @@ mod tests {
let r = ExecutionResult::new( let r = ExecutionResult::new(
ffi::evmc_status_code::EVMC_FAILURE, ffi::evmc_status_code::EVMC_FAILURE,
420, 420,
Some(&vec![0xc0, 0xff, 0xee, 0x71, 0x75]), Some(&[0xc0, 0xff, 0xee, 0x71, 0x75]),
); );
let f: ffi::evmc_result = r.into(); let f: ffi::evmc_result = r.into();

2
examples/example-rust-vm/src/lib.rs
View File

@ -20,7 +20,7 @@ impl EvmcVm for ExampleRustVM {
if is_create { if is_create {
ExecutionResult::failure() ExecutionResult::failure()
} else { } else {
ExecutionResult::success(66, Some(&vec![0xc0, 0xff, 0xee])) ExecutionResult::success(66, Some(&[0xc0, 0xff, 0xee]))
} }
} }
} }