Switch from pwasm-utils to wasm-instrument (#10680)

* Switch executor to wasm-instrument

* Switch pallet-contracts to wasm-instrument
This commit is contained in:
Alexander Theißen
2022-01-17 17:00:17 +02:00
committed by GitHub
parent d174ff8a61
commit 2a122c44b1
12 changed files with 47 additions and 48 deletions
@@ -28,7 +28,7 @@ macro_rules! convert_args {
macro_rules! gen_signature {
( ( $( $params: ty ),* ) ) => (
{
pwasm_utils::parity_wasm::elements::FunctionType::new(
wasm_instrument::parity_wasm::elements::FunctionType::new(
convert_args!($($params),*), vec![],
)
}
@@ -36,7 +36,7 @@ macro_rules! gen_signature {
( ( $( $params: ty ),* ) -> $returns: ty ) => (
{
pwasm_utils::parity_wasm::elements::FunctionType::new(
wasm_instrument::parity_wasm::elements::FunctionType::new(
convert_args!($($params),*),
vec![{use $crate::wasm::env_def::ConvertibleToWasm; <$returns>::VALUE_TYPE}],
)
@@ -220,7 +220,7 @@ macro_rules! define_env {
fn can_satisfy(
module: &[u8],
name: &[u8],
func_type: &pwasm_utils::parity_wasm::elements::FunctionType,
func_type: &wasm_instrument::parity_wasm::elements::FunctionType,
) -> bool
{
#[cfg(not(feature = "unstable-interface"))]
@@ -260,9 +260,9 @@ mod tests {
wasm::{runtime::TrapReason, tests::MockExt, Runtime},
Weight,
};
use pwasm_utils::parity_wasm::elements::{FunctionType, ValueType};
use sp_runtime::traits::Zero;
use sp_sandbox::{ReturnValue, Value};
use wasm_instrument::parity_wasm::elements::{FunctionType, ValueType};
struct TestRuntime {
value: u32,
@@ -18,8 +18,8 @@
use super::Runtime;
use crate::exec::Ext;
use pwasm_utils::parity_wasm::elements::{FunctionType, ValueType};
use sp_sandbox::Value;
use wasm_instrument::parity_wasm::elements::{FunctionType, ValueType};
#[macro_use]
pub mod macros;