feat: multi-action transaction support with retries (#8)

* feat: multi-action transaction support with retries * fix: get rid of move and unnecessary cloning * chore: remove unnecessary clones * fix: clippy warnings solved * chore: formatted
molnett · Oct 11, 2024 · 9285b94 · 9285b94
1 parent 1b3cc9c
commit 9285b94
Show file tree

Hide file tree

Showing 7 changed files with 404 additions and 218 deletions.
diff --git a/crates/valv/src/api/server.rs b/crates/valv/src/api/server.rs
@@ -25,8 +25,8 @@ impl MasterKeyManagementService for API {
         let key = self
             .valv
             .create_key(
-                request.get_ref().keyring_name.clone(),
-                request.get_ref().master_key_id.clone(),
+                &request.get_ref().keyring_name,
+                &request.get_ref().master_key_id,
             )
             .await;
 
@@ -101,8 +101,8 @@ impl MasterKeyManagementService for API {
         let encrypted_value = self
             .valv
             .encrypt(
-                request.get_ref().keyring_name.clone(),
-                request.get_ref().master_key_id.clone(),
+                &request.get_ref().keyring_name,
+                &request.get_ref().master_key_id,
                 request.get_ref().plaintext.clone().to_vec(),
             )
             .await;
@@ -133,9 +133,9 @@ impl MasterKeyManagementService for API {
         let decrypted_result = self
             .valv
             .decrypt(
-                request.get_ref().keyring_name.clone(),
-                request.get_ref().master_key_id.clone(),
-                request.get_ref().ciphertext.clone().to_vec(),
+                &request.get_ref().keyring_name,
+                &request.get_ref().master_key_id,
+                request.get_ref().ciphertext.to_vec(),
             )
             .await;
         match decrypted_result {

diff --git a/crates/valv/src/errors.rs b/crates/valv/src/errors.rs
@@ -1,24 +1,13 @@
+use foundationdb::FdbBindingError;
 use thiserror::Error;
 
 #[derive(Error, Debug)]
 pub enum ValvError {
     #[error("IO error")]
     Io(#[from] std::io::Error),
 
-    #[error("Database error")]
-    Database(#[from] foundationdb::FdbError),
-
-    #[error("Transaction commit error")]
-    TransactionCommitError(#[from] foundationdb::TransactionCommitError),
-
-    #[error("Directory error")]
-    DirectoryError(foundationdb::directory::DirectoryError),
-
-    #[error("TuplePacking error")]
-    TuplePacking(#[from] foundationdb::tuple::PackError),
-
-    #[error("Prost decode error")]
-    Decode(#[from] prost::DecodeError),
+    #[error("Storage error")]
+    Storage(#[from] crate::storage::errors::StorageError),
 
     #[error("BoringSSL error")]
     BoringSSL(#[from] boring::error::ErrorStack),
@@ -43,3 +32,9 @@ pub enum ValvError {
 }
 
 pub type Result<T> = std::result::Result<T, ValvError>;
+
+impl From<ValvError> for FdbBindingError {
+    fn from(error: ValvError) -> Self {
+        FdbBindingError::CustomError(Box::new(error))
+    }
+}