feat: change commit signature make it easy (#1074)

Author: lightsing

ceno_host/tests/test_elf.rs

@@ -477,7 +477,7 @@ fn test_sha256_extend() -> Result<()> {
 
 #[test]
 fn test_sha256_full() -> Result<()> {
-    let public_io: &Vec<u32> = &vec![
+    let public_io: &[u32; 8] = &[
         30689455, 3643278932, 1489987339, 1626711444, 3610619649, 1925764735, 581441152, 321290698,
     ];
     let hints: &Vec<u32> = &vec![0u32; 10];

ceno_rt/src/mmio.rs

@@ -1,6 +1,11 @@
 //! Memory-mapped I/O (MMIO) functions.
 
-use rkyv::{Portable, api::high::HighValidator, bytecheck::CheckBytes, rancor::Failure};
+use rkyv::{
+    Archived, Deserialize, Portable,
+    api::high::{HighDeserializer, HighValidator},
+    bytecheck::CheckBytes,
+    rancor::Failure,
+};
 
 use core::slice::from_raw_parts;
 
@@ -90,12 +95,16 @@ pub fn pubio_read_slice<'a>() -> &'a [u8] {
     &pubio_region()[..pubio_len()]
 }
 
-pub fn commit<'a, T, F: From<&'a T> + core::fmt::Debug + PartialEq>(v: &F)
+/// Read a value from public io, deserialize it, and assert that it matches the given value.
+pub fn commit<T>(v: &T)
 where
-    T: Portable + for<'c> CheckBytes<HighValidator<'c, Failure>> + 'a,
+    T: rkyv::Archive + core::fmt::Debug + PartialEq,
+    T::Archived:
+        for<'c> CheckBytes<HighValidator<'c, Failure>> + Deserialize<T, HighDeserializer<Failure>>,
 {
-    let expected: F = rkyv::access::<T, Failure>(pubio_read_slice())
-        .expect("Deserialised access failed.")
-        .into();
-    assert_eq!(*v, expected);
+    let expected = rkyv::access::<Archived<T>, Failure>(pubio_read_slice())
+        .expect("Deserialised access failed.");
+    let expected_deserialized: T =
+        rkyv::deserialize::<T, Failure>(expected).expect("Deserialised value failed.");
+    assert_eq!(*v, expected_deserialized);
 }

examples/examples/fibonacci.rs

@@ -15,5 +15,5 @@ fn main() {
         b = c;
     }
     // Constrain with public io
-    ceno_rt::commit::<Archived<u32>, _>(&b);
+    ceno_rt::commit(&b);
 }

examples/examples/sha256.rs

@@ -1,4 +1,5 @@
 extern crate ceno_rt;
+
 use ceno_rt::syscalls::syscall_sha256_extend;
 use rkyv::vec::ArchivedVec;
 
@@ -65,18 +66,10 @@ fn main() {
     }
 
     // Output the final hash values one by one
-    ceno_rt::commit::<ArchivedVec<u32>, SHA256Result>(&SHA256Result(h.to_vec()));
+    ceno_rt::commit(&h);
     // debug_print!("{:x}", h[0]);
 }
 
-#[derive(Debug, PartialEq)]
-struct SHA256Result(Vec<u32>);
-impl From<&ArchivedVec<u32>> for SHA256Result {
-    fn from(value: &ArchivedVec<u32>) -> Self {
-        SHA256Result(value.to_vec())
-    }
-}
-
 fn process_block(h: &mut [u32; 8], w: &[u32; 64]) {
     // Expand message schedule
     let mut w_expanded = *w;