From 36ea4ba96b9babaee3064ee30419c2b6a31b4b1d Mon Sep 17 00:00:00 2001
From: Hinton <hinton@users.noreply.github.com>
Date: Tue, 13 Aug 2024 10:05:17 +0200
Subject: [PATCH] Cleanup cargo files

---
 Cargo.lock                         | 1 -
 crates/bitwarden-uniffi/Cargo.toml | 1 -
 crates/bitwarden-uniffi/src/lib.rs | 2 +-
 crates/bitwarden-vault/Cargo.toml  | 8 ++++++--
 crates/bitwarden-vault/src/sync.rs | 4 +---
 crates/bitwarden/Cargo.toml        | 1 +
 6 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 33688b58b..d005a5f2f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -679,7 +679,6 @@ dependencies = [
  "oslog",
  "schemars",
  "thiserror",
- "tokio",
  "uniffi",
  "uuid",
 ]
diff --git a/crates/bitwarden-uniffi/Cargo.toml b/crates/bitwarden-uniffi/Cargo.toml
index 022f35dc6..eba12649c 100644
--- a/crates/bitwarden-uniffi/Cargo.toml
+++ b/crates/bitwarden-uniffi/Cargo.toml
@@ -37,7 +37,6 @@ schemars = { version = ">=0.8, <0.9", optional = true }
 thiserror = ">=1.0.40, <2.0"
 uniffi = "=0.28.0"
 uuid = ">=1.3.3, <2"
-tokio = { workspace = true }
 
 [target.'cfg(target_os = "android")'.dependencies]
 android_logger = "0.14"
diff --git a/crates/bitwarden-uniffi/src/lib.rs b/crates/bitwarden-uniffi/src/lib.rs
index 95449c294..beba36629 100644
--- a/crates/bitwarden-uniffi/src/lib.rs
+++ b/crates/bitwarden-uniffi/src/lib.rs
@@ -28,7 +28,7 @@ pub struct Client(bitwarden::Client);
 #[uniffi::export]
 impl Client {
     /// Initialize a new instance of the SDK client
-    #[uniffi::constructor(async_runtime = "tokio")]
+    #[uniffi::constructor]
     pub async fn factory(settings: Option<ClientSettings>) -> Arc<Self> {
         init_logger();
         Arc::new(Self(bitwarden::Client::new(settings).await))
diff --git a/crates/bitwarden-vault/Cargo.toml b/crates/bitwarden-vault/Cargo.toml
index 6a3f87799..e14e43d01 100644
--- a/crates/bitwarden-vault/Cargo.toml
+++ b/crates/bitwarden-vault/Cargo.toml
@@ -19,14 +19,18 @@ uniffi = [
     "bitwarden-crypto/uniffi",
     "dep:uniffi",
 ] # Uniffi bindings
-state = ["bitwarden-core/state", "dep:tokio"] # Persistent state
+state = [
+    "bitwarden-core/state",
+    "dep:tokio",
+    "dep:bitwarden-db",
+] # Persistent state
 
 [dependencies]
 base64 = ">=0.22.1, <0.23"
 bitwarden-api-api = { workspace = true }
 bitwarden-core = { workspace = true, features = ["internal"] }
 bitwarden-crypto = { workspace = true }
-bitwarden-db = { workspace = true }
+bitwarden-db = { workspace = true, optional = true }
 chrono = { version = ">=0.4.26, <0.5", features = [
     "clock",
     "serde",
diff --git a/crates/bitwarden-vault/src/sync.rs b/crates/bitwarden-vault/src/sync.rs
index 54c1ba90b..6b4845d35 100644
--- a/crates/bitwarden-vault/src/sync.rs
+++ b/crates/bitwarden-vault/src/sync.rs
@@ -46,9 +46,7 @@ pub(crate) async fn sync(client: &Client, input: &SyncRequest) -> Result<SyncRes
 
     let enc = client.internal.initialize_org_crypto(org_keys)?;
 
-    let res = SyncResponse::process_response(sync, &enc)?;
-
-    Ok(res)
+    SyncResponse::process_response(sync, &enc)
 }
 
 #[derive(Serialize, Deserialize, Debug, JsonSchema)]
diff --git a/crates/bitwarden/Cargo.toml b/crates/bitwarden/Cargo.toml
index 3bd1f02fa..583ec519f 100644
--- a/crates/bitwarden/Cargo.toml
+++ b/crates/bitwarden/Cargo.toml
@@ -36,6 +36,7 @@ uniffi = [
     "bitwarden-vault/uniffi",
 ] # Uniffi bindings
 secrets = ["bitwarden-core/secrets", "dep:bitwarden-sm"] # Secrets manager API
+state = ["bitwarden-core/state", "bitwarden-vault/state"] # Persistent state
 
 [dependencies]
 bitwarden-api-api = { workspace = true }