Merge pull request #126 from kinode-dao/hf/fs-interface-changes

update fs to use tweaked variants

Author: nick1udwig

src/kv.rs

@@ -30,7 +30,7 @@ pub enum KvResponse {
     Ok,
     BeginTx { tx_id: u64 },
     Get { key: Vec<u8> },
-    Err { error: KvError },
+    Err(KvError),
 }
 
 #[derive(Debug, Serialize, Deserialize, Error)]
@@ -93,7 +93,7 @@ where
                             .map_err(|e| anyhow::anyhow!("Failed to deserialize value: {}", e))?;
                         Ok(value)
                     }
-                    KvResponse::Err { error } => Err(error.into()),
+                    KvResponse::Err(error) => Err(error.into()),
                     _ => Err(anyhow::anyhow!("kv: unexpected response {:?}", response)),
                 }
             }
@@ -159,7 +159,7 @@ where
 
                 match response {
                     KvResponse::Ok => Ok(()),
-                    KvResponse::Err { error } => Err(error.into()),
+                    KvResponse::Err(error) => Err(error.into()),
                     _ => Err(anyhow::anyhow!("kv: unexpected response {:?}", response)),
                 }
             }
@@ -217,7 +217,7 @@ where
 
                 match response {
                     KvResponse::Ok => Ok(()),
-                    KvResponse::Err { error } => Err(error.into()),
+                    KvResponse::Err(error) => Err(error.into()),
                     _ => Err(anyhow::anyhow!("kv: unexpected response {:?}", response)),
                 }
             }
@@ -272,7 +272,7 @@ where
 
                 match response {
                     KvResponse::BeginTx { tx_id } => Ok(tx_id),
-                    KvResponse::Err { error } => Err(error.into()),
+                    KvResponse::Err(error) => Err(error.into()),
                     _ => Err(anyhow::anyhow!("kv: unexpected response {:?}", response)),
                 }
             }
@@ -297,7 +297,7 @@ where
 
                 match response {
                     KvResponse::Ok => Ok(()),
-                    KvResponse::Err { error } => Err(error.into()),
+                    KvResponse::Err(error) => Err(error.into()),
                     _ => Err(anyhow::anyhow!("kv: unexpected response {:?}", response)),
                 }
             }
@@ -334,7 +334,7 @@ where
                     timeout,
                     _marker: PhantomData,
                 }),
-                KvResponse::Err { error } => Err(error.into()),
+                KvResponse::Err(error) => Err(error.into()),
                 _ => Err(anyhow::anyhow!("kv: unexpected response {:?}", response)),
             }
         }
@@ -361,7 +361,7 @@ pub fn remove_db(package_id: PackageId, db: &str, timeout: Option<u64>) -> anyho
 
             match response {
                 KvResponse::Ok => Ok(()),
-                KvResponse::Err { error } => Err(error.into()),
+                KvResponse::Err(error) => Err(error.into()),
                 _ => Err(anyhow::anyhow!("kv: unexpected response {:?}", response)),
             }
         }

src/sqlite.rs

@@ -36,7 +36,7 @@ pub enum SqliteResponse {
     Ok,
     Read,
     BeginTx { tx_id: u64 },
-    Err { error: SqliteError },
+    Err(SqliteError),
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
@@ -117,7 +117,7 @@ impl Sqlite {
                         })?;
                         Ok(values)
                     }
-                    SqliteResponse::Err { error } => Err(error.into()),
+                    SqliteResponse::Err(error) => Err(error.into()),
                     _ => Err(anyhow::anyhow!(
                         "sqlite: unexpected response {:?}",
                         response
@@ -151,7 +151,7 @@ impl Sqlite {
 
                 match response {
                     SqliteResponse::Ok => Ok(()),
-                    SqliteResponse::Err { error } => Err(error.into()),
+                    SqliteResponse::Err(error) => Err(error.into()),
                     _ => Err(anyhow::anyhow!(
                         "sqlite: unexpected response {:?}",
                         response
@@ -179,7 +179,7 @@ impl Sqlite {
 
                 match response {
                     SqliteResponse::BeginTx { tx_id } => Ok(tx_id),
-                    SqliteResponse::Err { error } => Err(error.into()),
+                    SqliteResponse::Err(error) => Err(error.into()),
                     _ => Err(anyhow::anyhow!(
                         "sqlite: unexpected response {:?}",
                         response
@@ -207,7 +207,7 @@ impl Sqlite {
 
                 match response {
                     SqliteResponse::Ok => Ok(()),
-                    SqliteResponse::Err { error } => Err(error.into()),
+                    SqliteResponse::Err(error) => Err(error.into()),
                     _ => Err(anyhow::anyhow!(
                         "sqlite: unexpected response {:?}",
                         response
@@ -242,7 +242,7 @@ pub fn open(package_id: PackageId, db: &str, timeout: Option<u64>) -> anyhow::Re
                     db: db.to_string(),
                     timeout,
                 }),
-                SqliteResponse::Err { error } => Err(error.into()),
+                SqliteResponse::Err(error) => Err(error.into()),
                 _ => Err(anyhow::anyhow!(
                     "sqlite: unexpected response {:?}",
                     response
@@ -272,7 +272,7 @@ pub fn remove_db(package_id: PackageId, db: &str, timeout: Option<u64>) -> anyho
 
             match response {
                 SqliteResponse::Ok => Ok(()),
-                SqliteResponse::Err { error } => Err(error.into()),
+                SqliteResponse::Err(error) => Err(error.into()),
                 _ => Err(anyhow::anyhow!(
                     "sqlite: unexpected response {:?}",
                     response

src/vfs/file.rs

@@ -81,9 +81,9 @@ impl File {
     /// Read into buffer from current cursor position
     /// Returns the amount of bytes read.
     pub fn read_at(&self, buffer: &mut [u8]) -> Result<usize, VfsError> {
-        let length = buffer.len();
+        let length = buffer.len() as u64;
 
-        let message = vfs_request(&self.path, VfsAction::ReadExact(length as u64))
+        let message = vfs_request(&self.path, VfsAction::ReadExact { length })
             .send_and_await_response(self.timeout)
             .unwrap()
             .map_err(|e| VfsError::IOError {
@@ -216,7 +216,7 @@ impl File {
     /// Seek file to position.
     /// Returns the new position.
     pub fn seek(&mut self, pos: SeekFrom) -> Result<u64, VfsError> {
-        let message = vfs_request(&self.path, VfsAction::Seek { seek_from: pos })
+        let message = vfs_request(&self.path, VfsAction::Seek(pos))
             .send_and_await_response(self.timeout)
             .unwrap()
             .map_err(|e| VfsError::IOError {
@@ -225,7 +225,9 @@ impl File {
             })?;
 
         match parse_response(message.body())? {
-            VfsResponse::SeekFrom(new_pos) => Ok(new_pos),
+            VfsResponse::SeekFrom {
+                new_offset: new_pos,
+            } => Ok(new_pos),
             VfsResponse::Err(e) => Err(e),
             _ => Err(VfsError::ParseError {
                 error: "unexpected response".to_string(),

src/vfs/mod.rs

@@ -32,9 +32,9 @@ pub enum VfsAction {
     Read,
     ReadDir,
     ReadToEnd,
-    ReadExact(u64),
+    ReadExact { length: u64 },
     ReadToString,
-    Seek { seek_from: SeekFrom },
+    Seek(SeekFrom),
     RemoveFile,
     RemoveDir,
     RemoveDirAll,
@@ -79,7 +79,7 @@ pub enum VfsResponse {
     Ok,
     Err(VfsError),
     Read,
-    SeekFrom(u64),
+    SeekFrom { new_offset: u64 },
     ReadDir(Vec<DirEntry>),
     ReadToString(String),
     Metadata(FileMetadata),