Update wasmi version with breaking changes (#1817)

* Update wasmi version with breaking changes * Update version
smol-dot · May 7, 2024 · 21d4916 · 21d4916
1 parent 61cf6a9
commit 21d4916
Show file tree

Hide file tree

Showing 4 changed files with 84 additions and 39 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/lib/Cargo.toml b/lib/Cargo.toml
@@ -76,7 +76,7 @@ siphasher = { version = "1.0.1", default-features = false }
 slab = { version = "0.4.8", default-features = false }
 smallvec = { version = "1.13.2", default-features = false }
 twox-hash = { version = "1.6.3", default-features = false }
-wasmi = { version = "0.32.0-beta.10", default-features = false }
+wasmi = { version = "0.32.0-beta.14", default-features = false }
 x25519-dalek = { version = "2.0.0-rc.3", default-features = false, features = ["alloc", "precomputed-tables", "static_secrets", "zeroize"] }
 zeroize = { version = "1.7.0", default-features = false, features = ["alloc"] }
 

diff --git a/lib/src/executor/vm.rs b/lib/src/executor/vm.rs
@@ -1062,9 +1062,9 @@ impl<'a> From<&'a Signature> for wasmi::FuncType {
             sig.params
                 .iter()
                 .copied()
-                .map(wasmi::core::ValueType::from)
+                .map(wasmi::core::ValType::from)
                 .collect::<Vec<_>>(),
-            sig.ret_ty.map(wasmi::core::ValueType::from),
+            sig.ret_ty.map(wasmi::core::ValType::from),
         )
     }
 }
@@ -1189,35 +1189,35 @@ impl WasmValue {
     }
 }
 
-impl TryFrom<wasmi::Value> for WasmValue {
+impl TryFrom<wasmi::Val> for WasmValue {
     type Error = UnsupportedTypeError;
 
-    fn try_from(val: wasmi::Value) -> Result<Self, Self::Error> {
+    fn try_from(val: wasmi::Val) -> Result<Self, Self::Error> {
         match val {
-            wasmi::Value::I32(v) => Ok(WasmValue::I32(v)),
-            wasmi::Value::I64(v) => Ok(WasmValue::I64(v)),
+            wasmi::Val::I32(v) => Ok(WasmValue::I32(v)),
+            wasmi::Val::I64(v) => Ok(WasmValue::I64(v)),
             _ => Err(UnsupportedTypeError),
         }
     }
 }
 
-impl<'a> TryFrom<&'a wasmi::Value> for WasmValue {
+impl<'a> TryFrom<&'a wasmi::Val> for WasmValue {
     type Error = UnsupportedTypeError;
 
-    fn try_from(val: &'a wasmi::Value) -> Result<Self, Self::Error> {
+    fn try_from(val: &'a wasmi::Val) -> Result<Self, Self::Error> {
         match val {
-            wasmi::Value::I32(v) => Ok(WasmValue::I32(*v)),
-            wasmi::Value::I64(v) => Ok(WasmValue::I64(*v)),
+            wasmi::Val::I32(v) => Ok(WasmValue::I32(*v)),
+            wasmi::Val::I64(v) => Ok(WasmValue::I64(*v)),
             _ => Err(UnsupportedTypeError),
         }
     }
 }
 
-impl From<WasmValue> for wasmi::Value {
+impl From<WasmValue> for wasmi::Val {
     fn from(val: WasmValue) -> Self {
         match val {
-            WasmValue::I32(v) => wasmi::Value::I32(v),
-            WasmValue::I64(v) => wasmi::Value::I64(v),
+            WasmValue::I32(v) => wasmi::Val::I32(v),
+            WasmValue::I64(v) => wasmi::Val::I64(v),
         }
     }
 }
@@ -1273,22 +1273,22 @@ impl<'a> TryFrom<&'a wasmtime::Val> for WasmValue {
     }
 }
 
-impl From<ValueType> for wasmi::core::ValueType {
-    fn from(ty: ValueType) -> wasmi::core::ValueType {
+impl From<ValueType> for wasmi::core::ValType {
+    fn from(ty: ValueType) -> wasmi::core::ValType {
         match ty {
-            ValueType::I32 => wasmi::core::ValueType::I32,
-            ValueType::I64 => wasmi::core::ValueType::I64,
+            ValueType::I32 => wasmi::core::ValType::I32,
+            ValueType::I64 => wasmi::core::ValType::I64,
         }
     }
 }
 
-impl TryFrom<wasmi::core::ValueType> for ValueType {
+impl TryFrom<wasmi::core::ValType> for ValueType {
     type Error = UnsupportedTypeError;
 
-    fn try_from(val: wasmi::core::ValueType) -> Result<Self, Self::Error> {
+    fn try_from(val: wasmi::core::ValType) -> Result<Self, Self::Error> {
         match val {
-            wasmi::core::ValueType::I32 => Ok(ValueType::I32),
-            wasmi::core::ValueType::I64 => Ok(ValueType::I64),
+            wasmi::core::ValType::I32 => Ok(ValueType::I32),
+            wasmi::core::ValType::I64 => Ok(ValueType::I64),
             _ => Err(UnsupportedTypeError),
         }
     }

diff --git a/lib/src/executor/vm/interpreter.rs b/lib/src/executor/vm/interpreter.rs
@@ -217,7 +217,7 @@ impl InterpreterPrototype {
             .get(&self.store);
 
         match value {
-            wasmi::Value::I32(v) => Ok(u32::from_ne_bytes(v.to_ne_bytes())),
+            wasmi::Val::I32(v) => Ok(u32::from_ne_bytes(v.to_ne_bytes())),
             _ => Err(GlobalValueErr::Invalid),
         }
     }
@@ -385,10 +385,10 @@ impl Prepare {
             // function signature above.
             debug_assert!(list.len() <= 1);
             list.first().map(|item| match *item {
-                wasmi::core::ValueType::I32 => wasmi::Value::I32(0),
-                wasmi::core::ValueType::I64 => wasmi::Value::I64(0),
-                wasmi::core::ValueType::F32 => wasmi::Value::F32(0.0f32.into()),
-                wasmi::core::ValueType::F64 => wasmi::Value::F64(0.0.into()),
+                wasmi::core::ValType::I32 => wasmi::Val::I32(0),
+                wasmi::core::ValType::I64 => wasmi::Val::I64(0),
+                wasmi::core::ValType::F32 => wasmi::Val::F32(0.0f32.into()),
+                wasmi::core::ValType::F64 => wasmi::Val::F64(0.0.into()),
                 _ => unreachable!(),
             })
         };
@@ -402,7 +402,7 @@ impl Prepare {
                 func_to_call,
                 params
                     .iter()
-                    .map(|v| wasmi::Value::from(*v))
+                    .map(|v| wasmi::Val::from(*v))
                     .collect::<Vec<_>>(),
             )),
         })
@@ -452,11 +452,11 @@ pub struct Interpreter {
     /// Where the return value of the execution will be stored.
     /// While this could be regenerated every time `run` is called, it is instead kept in the
     /// `Interpreter` struct for convenience.
-    dummy_output_value: Option<wasmi::Value>,
+    dummy_output_value: Option<wasmi::Val>,
 }
 
 enum Execution {
-    NotStarted(wasmi::Func, Vec<wasmi::Value>),
+    NotStarted(wasmi::Func, Vec<wasmi::Val>),
     Started(wasmi::ResumableInvocation),
 }
 
@@ -497,7 +497,7 @@ impl Interpreter {
                     return Err(RunErr::BadValueTy { expected, obtained });
                 }
 
-                let value = value.map(wasmi::Value::from);
+                let value = value.map(wasmi::Val::from);
                 let inputs = match value.as_ref() {
                     Some(v) => &core::array::from_ref(v)[..],
                     None => &[],