Remove test code and merge conflict

Author: dani-garcia

Cargo.lock

@@ -20,7 +20,7 @@ log = { workspace = true }
 thiserror = { workspace = true }
 
 [dev-dependencies]
-tokio = { workspace = true }
+tokio = { workspace = true, features = ["rt"] }
 
 [lints]
 workspace = true

crates/bitwarden-state/Cargo.toml

@@ -71,8 +71,4 @@ impl VaultClient {
             .generate_totp_cipher_view(view, time)
             .map_err(Error::Totp)?)
     }
-
-    pub async fn print_the_ciphers(&self) -> String {
-        self.0.print_the_ciphers().await
-    }
 }

crates/bitwarden-uniffi/src/vault/mod.rs

@@ -18,13 +18,12 @@ keywords.workspace = true
 uniffi = [
     "bitwarden-core/uniffi",
     "bitwarden-crypto/uniffi",
-    "dep:uniffi",
+    "dep:uniffi"
 ] # Uniffi bindings
 wasm = [
     "bitwarden-core/wasm",
     "dep:tsify-next",
-    "dep:wasm-bindgen",
-    "dep:wasm-bindgen-futures",
+    "dep:wasm-bindgen"
 ] # WASM support
 
 [dependencies]
@@ -49,7 +48,6 @@ tsify-next = { workspace = true, optional = true }
 uniffi = { workspace = true, optional = true }
 uuid = { workspace = true }
 wasm-bindgen = { workspace = true, optional = true }
-wasm-bindgen-futures = { workspace = true, optional = true }
 
 [dev-dependencies]
 tokio = { workspace = true, features = ["rt"] }

crates/bitwarden-vault/Cargo.toml

@@ -4,8 +4,8 @@ use wasm_bindgen::prelude::*;
 
 use crate::{
     sync::{sync, SyncError},
-    AttachmentsClient, Cipher, CiphersClient, CollectionsClient, FoldersClient,
-    PasswordHistoryClient, SyncRequest, SyncResponse, TotpClient,
+    AttachmentsClient, CiphersClient, CollectionsClient, FoldersClient, PasswordHistoryClient,
+    SyncRequest, SyncResponse, TotpClient,
 };
 
 #[allow(missing_docs)]
@@ -69,22 +69,6 @@ impl VaultClient {
             client: self.client.clone(),
         }
     }
-
-    /// Test method, prints all ciphers in the vault
-    pub async fn print_the_ciphers(&self) -> String {
-        let store = self
-            .client
-            .platform()
-            .state()
-            .get_client_managed::<Cipher>()
-            .expect("msg");
-        let mut result = String::new();
-        let ciphers = store.list().await.expect("msg");
-        for cipher in ciphers {
-            result.push_str(format!("{cipher:?}\n").as_str());
-        }
-        result
-    }
 }
 
 #[allow(missing_docs)]