fix dependencies and deprecate test

This commit is contained in:
NikVolf
2018-01-30 19:35:51 +03:00
parent a228b43f19
commit a1ecded58c
8 changed files with 26 additions and 119 deletions
-92
View File
@@ -126,95 +126,3 @@ pub fn pack_instance(raw_module: Vec<u8>, mut ctor_module: elements::Module) ->
Ok(new_module)
}
#[cfg(test)]
mod test {
extern crate pwasm_emscripten;
extern crate parity_wasm;
use parity_wasm::builder;
use parity_wasm::interpreter;
use parity_wasm::interpreter::RuntimeValue;
use parity_wasm::ModuleInstanceInterface;
use super::*;
use super::super::optimize;
use byteorder::{ByteOrder, LittleEndian};
use self::pwasm_emscripten::program_with_emscripten_env;
#[test]
fn call_returns_code() {
let mut module = builder::module()
.import()
.module("env")
.field("memory")
.external().memory(1 as u32, Some(1 as u32))
.build()
.data()
.offset(elements::Opcode::I32Const(16)).value(vec![0u8])
.build()
.function()
.signature()
.params().i32().i32().build()
.build()
.body().build()
.build()
.function()
.signature().build()
.body()
.with_opcodes(elements::Opcodes::new(
vec![
elements::Opcode::End
]
))
.build()
.build()
.function()
.signature().param().i32().build()
.body()
.with_opcodes(elements::Opcodes::new(
vec![
elements::Opcode::End
]
))
.build()
.build()
.export()
.field(CALL_SYMBOL)
.internal().func(1)
.build()
.export()
.field(CREATE_SYMBOL)
.internal().func(2)
.build()
.build();
let mut ctor_module = module.clone();
optimize(&mut module, vec![CALL_SYMBOL]).expect("Optimizer to finish without errors");
optimize(&mut ctor_module, vec![CREATE_SYMBOL]).expect("Optimizer to finish without errors");
let raw_module = parity_wasm::serialize(module).unwrap();
let ctor_module = pack_instance(raw_module.clone(), ctor_module).expect("Packing failed");
let program = program_with_emscripten_env(Default::default()).expect("Wasm program to be created");
let env_instance = program.module("env").expect("Wasm program to contain env module");
let env_memory = env_instance.memory(interpreter::ItemIndex::Internal(0)).expect("Linear memory to exist in wasm runtime");
let constructor_module = program.add_module("contract", ctor_module, None).expect("Failed to initialize module");
let _ = constructor_module.execute_export(CALL_SYMBOL, vec![RuntimeValue::I32(1024)].into());
let pointer = LittleEndian::read_u32(&env_memory.get(1024 + 8, 4).unwrap());
let len = LittleEndian::read_u32(&env_memory.get(1024 + 12, 4).unwrap());
let contract_code = env_memory.get(pointer, len as usize).expect("Failed to get code");
assert_eq!(raw_module, contract_code);
let contract_module: elements::Module = parity_wasm::deserialize_buffer(contract_code).expect("Constructed contract module is not valid");
let program = program_with_emscripten_env(Default::default()).expect("Wasm program to be created");
let contract_module_instance = program.add_module("contract", contract_module, None).expect("Failed to initialize constructed contract module");
contract_module_instance.execute_export(CALL_SYMBOL, Default::default()).expect("Constructed contract failed to execute");
}
}