refactor: Adjust wnfs-wasm code

wnfs-wg · Dec 5, 2023 · 0b725f7 · 0b725f7
1 parent 2693ae7
commit 0b725f7
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 11 deletions.
diff --git a/wnfs-hamt/src/diff.rs b/wnfs-hamt/src/diff.rs
@@ -30,6 +30,27 @@ pub struct KeyValueChange<K, V> {
     pub value2: Option<V>,
 }
 
+//--------------------------------------------------------------------------------------------------
+// Implementations
+//--------------------------------------------------------------------------------------------------
+
+impl<K, V> KeyValueChange<K, V> {
+    pub fn map<W>(self, f: &impl Fn(V) -> W) -> KeyValueChange<K, W> {
+        let Self {
+            r#type,
+            key,
+            value1,
+            value2,
+        } = self;
+        KeyValueChange {
+            r#type,
+            key,
+            value1: value1.map(f),
+            value2: value2.map(f),
+        }
+    }
+}
+
 //--------------------------------------------------------------------------------------------------
 // Functions
 //--------------------------------------------------------------------------------------------------

diff --git a/wnfs-wasm/src/fs/private/forest.rs b/wnfs-wasm/src/fs/private/forest.rs
@@ -8,8 +8,11 @@ use libipld_core::cid::Cid;
 use std::rc::Rc;
 use wasm_bindgen::prelude::wasm_bindgen;
 use wasm_bindgen_futures::future_to_promise;
-use wnfs::private::forest::{
-    hamt::HamtForest as WnfsHamtForest, traits::PrivateForest as WnfsPrivateForest,
+use wnfs::{
+    common::Storable,
+    private::forest::{
+        hamt::HamtForest as WnfsHamtForest, traits::PrivateForest as WnfsPrivateForest,
+    },
 };
 use wnfs_nameaccumulator::AccumulatorSetup;
 
@@ -47,7 +50,7 @@ impl PrivateForest {
         let cid = Cid::read_bytes(&cid[..]).map_err(error("Cannot parse cid"))?;
 
         Ok(future_to_promise(async move {
-            let forest: WnfsHamtForest = WnfsHamtForest::load(&cid, &store)
+            let forest = WnfsHamtForest::load(&cid, &store)
                 .await
                 .map_err(error("Couldn't deserialize forest"))?;
 
@@ -103,7 +106,7 @@ impl PrivateForest {
 
             Ok(value!(diff
                 .into_iter()
-                .map(|c| value!(ForestChange(c)))
+                .map(|c| value!(ForestChange(c.map(&|c| c.0))))
                 .collect::<Array>()))
         }))
     }

diff --git a/wnfs-wasm/src/fs/public/directory.rs b/wnfs-wasm/src/fs/public/directory.rs
@@ -15,7 +15,7 @@ use std::rc::Rc;
 use wasm_bindgen::{prelude::wasm_bindgen, JsValue};
 use wasm_bindgen_futures::future_to_promise;
 use wnfs::{
-    common::BlockStore as WnfsBlockStore,
+    common::Storable,
     public::{PublicDirectory as WnfsPublicDirectory, PublicNode as WnfsPublicNode},
     traits::Id,
 };
@@ -97,8 +97,7 @@ impl PublicDirectory {
         let cid = Cid::read_bytes(&cid[..]).map_err(error("Cannot parse cid"))?;
 
         Ok(future_to_promise(async move {
-            let directory: WnfsPublicDirectory = store
-                .get_deserializable(&cid)
+            let directory = WnfsPublicDirectory::load(&cid, &store)
                 .await
                 .map_err(error("Couldn't deserialize directory"))?;
 

diff --git a/wnfs-wasm/src/fs/public/file.rs b/wnfs-wasm/src/fs/public/file.rs
@@ -11,7 +11,7 @@ use std::rc::Rc;
 use wasm_bindgen::{prelude::wasm_bindgen, JsValue};
 use wasm_bindgen_futures::future_to_promise;
 use wnfs::{
-    common::BlockStore as WnfsBlockStore,
+    common::Storable,
     public::{PublicFile as WnfsPublicFile, PublicNode as WnfsPublicNode},
     traits::Id,
 };
@@ -66,8 +66,7 @@ impl PublicFile {
         let cid = Cid::try_from(cid).map_err(|e| Error::new(&format!("Cannot parse cid: {e}")))?;
 
         Ok(future_to_promise(async move {
-            let file: WnfsPublicFile = store
-                .get_deserializable(&cid)
+            let file = WnfsPublicFile::load(&cid, &store)
                 .await
                 .map_err(|e| Error::new(&format!("Couldn't deserialize directory: {e}")))?;
 

diff --git a/wnfs/src/private/forest/hamt.rs b/wnfs/src/private/forest/hamt.rs
@@ -63,7 +63,7 @@ pub struct HamtForestSerializable {
 
 /// Links to ciphertexts
 #[derive(Serialize, Deserialize, Debug, Clone, Hash, Eq, PartialEq)]
-pub struct Ciphertexts(BTreeSet<Cid>);
+pub struct Ciphertexts(pub BTreeSet<Cid>);
 
 impl_storable_from_serde! { Ciphertexts }