Avoid using the controversial Vec::from_raw_parts.

This commit is contained in:
Gav
2018-01-28 20:39:18 +01:00
parent 5b179842ec
commit 769bd9d101
6 changed files with 9 additions and 9 deletions
+6 -6
View File
@@ -46,8 +46,8 @@ mod tests {
use native_runtime::runtime::staking::balance;
use primitives::twox_128;
const bloaty_code: &[u8] = include_bytes!("../../wasm-runtime/target/wasm32-unknown-unknown/release/runtime_polkadot.wasm");
const compact_code: &[u8] = include_bytes!("../../wasm-runtime/target/wasm32-unknown-unknown/release/runtime_polkadot.compact.wasm");
const BLOATY_CODE: &[u8] = include_bytes!("../../wasm-runtime/target/wasm32-unknown-unknown/release/runtime_polkadot.wasm");
const COMPACT_CODE: &[u8] = include_bytes!("../../wasm-runtime/target/wasm32-unknown-unknown/release/runtime_polkadot.compact.wasm");
fn tx() -> Vec<u8> { "679fcf0a846b4224c84ecad7d91a26241c46d00cb53d6480a363274e8965ee34b0b80b4b2e3836d3d8f8f12c0c1aef7350af587d9aee3883561d11726068ac0a2f8c6129d816cf51c374bc7f08c3e63ed156cf78aefb4a6550d97b87997977ee00000000000000000228000000d75a980182b10ab7d54bfed3c964073a0ee172f3daa62325af021a68f707511a4500000000000000".convert() }
#[test]
@@ -57,7 +57,7 @@ mod tests {
twox_128(&one.to_keyed_vec(b"sta:bal:")).to_vec() => vec![68u8, 0, 0, 0, 0, 0, 0, 0]
], };
let r = NativeExecutor.call(&mut t, bloaty_code, "execute_transaction", &CallData(tx()));
let r = NativeExecutor.call(&mut t, BLOATY_CODE, "execute_transaction", &CallData(tx()));
assert!(r.is_err());
}
@@ -68,7 +68,7 @@ mod tests {
twox_128(&one.to_keyed_vec(b"sta:bal:")).to_vec() => vec![68u8, 0, 0, 0, 0, 0, 0, 0]
], };
let r = NativeExecutor.call(&mut t, compact_code, "execute_transaction", &CallData(tx()));
let r = NativeExecutor.call(&mut t, COMPACT_CODE, "execute_transaction", &CallData(tx()));
assert!(r.is_err());
}
@@ -81,7 +81,7 @@ mod tests {
twox_128(&one.to_keyed_vec(b"sta:bal:")).to_vec() => vec![111u8, 0, 0, 0, 0, 0, 0, 0]
], };
let r = NativeExecutor.call(&mut t, compact_code, "execute_transaction", &CallData(tx()));
let r = NativeExecutor.call(&mut t, COMPACT_CODE, "execute_transaction", &CallData(tx()));
assert!(r.is_ok());
runtime_std::with_externalities(&mut t, || {
@@ -99,7 +99,7 @@ mod tests {
twox_128(&one.to_keyed_vec(b"sta:bal:")).to_vec() => vec![111u8, 0, 0, 0, 0, 0, 0, 0]
], };
let r = NativeExecutor.call(&mut t, bloaty_code, "execute_transaction", &CallData(tx()));
let r = NativeExecutor.call(&mut t, BLOATY_CODE, "execute_transaction", &CallData(tx()));
assert!(r.is_ok());
runtime_std::with_externalities(&mut t, || {
+3 -3
View File
@@ -154,14 +154,14 @@ macro_rules! impl_stubs {
#[no_mangle]
pub fn $name(input_data: *mut u8, input_len: usize) -> u64 {
let input = if input_len == 0 {
$crate::vec::Vec::new()
&[0u8; 0]
} else {
unsafe {
$crate::vec::Vec::from_raw_parts(input_data, input_len, input_len)
$crate::slice::from_raw_parts(input_data, input_len)
}
};
let output = super::$name(&input[..]);
let output = super::$name(input);
output.as_ptr() as u64 + ((output.len() as u64) << 32)
}
)*