undo this commit

keystore/src/connection/mod.rs

@@ -190,6 +190,36 @@ impl Connection {
  };
  transaction.child_groups(entity, persisted_records).await
  }
+
+ pub async fn save<E: Entity<ConnectionType = KeystoreDatabaseConnection> + Sync + EntityTransactionExt>(
+ &self,
+ entity: E,
+ ) -> CryptoKeystoreResult<E> {
+ let transaction_guard = self.transaction.lock().await;
+ let Some(transaction) = transaction_guard.as_ref() else {
+ return Err(CryptoKeystoreError::MutatingOperationWithoutTransaction);
+ };
+ transaction.save_mut(entity).await
+ }
+
+ pub async fn insert<E: Entity<ConnectionType = KeystoreDatabaseConnection> + std::marker::Sync>(
+ &self,
+ entity: E,
+ ) -> CryptoKeystoreResult<E::AutoGeneratedFields> {
+ let mut conn = self.conn.lock().await;
+ let fields = entity.insert(&mut conn).await?;
+ Ok(fields)
+ }
+
+ pub async fn remove<E: Entity<ConnectionType = KeystoreDatabaseConnection>, S: AsRef<[u8]>>(
+ &self,
+ id: S,
+ ) -> CryptoKeystoreResult<()> {
+ let mut conn = self.conn.lock().await;
+ E::delete(&mut conn, id.as_ref().into()).await?;
+ Ok(())
+ }
+
 }
 
 #[cfg_attr(target_family = "wasm", async_trait::async_trait(?Send))]

keystore/src/error.rs

@@ -65,6 +65,8 @@ pub enum CryptoKeystoreError {
  MissingKeyInStore(#[from] MissingKeyErrorKind),
  #[error("The given key doesn't contain valid utf-8")]
  KeyReprError(#[from] std::str::Utf8Error),
+ #[error("A transaction must be in progress to perform this operation.")]
+ MutatingOperationWithoutTransaction,
  #[error("A transaction is already in progress.")]
  TransactionInProgress,
  #[error(transparent)]

keystore/src/transaction.rs

@@ -235,15 +235,6 @@ impl KeystoreTransaction {
  let cached_records: Vec<E> = self.cache.find_many(ids).await?;
  Ok(Self::merge_records(cached_records, persisted_records, EntityFindParams::default()))
  }
-
- pub(crate) async fn count<E: crate::entities::Entity<ConnectionType = KeystoreDatabaseConnection>>(
- &self,
- persisted_records: Vec<E>,
- ) -> CryptoKeystoreResult<usize> {
- // Unfortunately, we have to do this. We cannot just add the counts of the cache and the db
- // because of possible record id overlap between cache and db.
- Ok(self.find_all::<E>(persisted_records, Default::default()).await?.len())
- }
 
  fn merge_records<E: crate::entities::Entity<ConnectionType = KeystoreDatabaseConnection>>(records_a: Vec<E>, records_b: Vec<E>, params: EntityFindParams) -> Vec<E> {
  let merged = records_a
@@ -340,7 +331,6 @@ impl KeystoreTransaction {
  &self,
  mut entity: E,
  ) -> CryptoKeystoreResult<E> {
- // If transaction is some, save entity there, otherwise throw error
  entity.pre_save().await?;
  let mut conn = self.cache.borrow_conn().await?;
  let transaction = conn.new_transaction().await?;