checkpoint

veilid-core/src/intf/wasm/protected_store.rs

@@ -136,18 +136,22 @@ impl ProtectedStore {
     }
 
     #[instrument(level = "trace", skip(self, value))]
-    pub async fn save_user_secret_cbor<T>(&self, key: &str, value: &T) -> EyreResult<bool>
+    pub async fn save_user_secret_frozen<T>(&self, key: &str, value: &T) -> EyreResult<bool>
     where
-        T: Serialize,
+        T: RkyvSerialize<rkyv::ser::serializers::AllocSerializer<1024>>,
     {
-        let v = serde_cbor::to_vec(value).wrap_err("couldn't store as CBOR")?;
+        let v = to_frozen(value)?;
         self.save_user_secret(&key, &v).await
     }
 
     #[instrument(level = "trace", skip(self))]
-    pub async fn load_user_secret_cbor<T>(&self, key: &str) -> EyreResult<Option<T>>
+    pub async fn load_user_secret_frozen<T>(&self, key: &str) -> EyreResult<Option<T>>
     where
-        T: for<'de> Deserialize<'de>,
+        T: RkyvArchive,
+        <T as RkyvArchive>::Archived:
+            for<'t> bytecheck::CheckBytes<rkyv::validation::validators::DefaultValidator<'t>>,
+        <T as RkyvArchive>::Archived:
+            rkyv::Deserialize<T, rkyv::de::deserializers::SharedDeserializeMap>,
     {
         let out = self.load_user_secret(key).await?;
         let b = match out {
@@ -157,7 +161,7 @@ impl ProtectedStore {
             }
         };
 
-        let obj = serde_cbor::from_slice::<T>(&b).wrap_err("failed to deserialize")?;
+        let obj = from_frozen(&b)?;
         Ok(Some(obj))
     }