should never happen, but lets handle gracefully anyway

xmtp · Feb 3, 2025 · b75faed · b75faed
1 parent 1f0a2f8
commit b75faed
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/xmtp_mls/src/storage/encrypted_store/db_connection.rs b/xmtp_mls/src/storage/encrypted_store/db_connection.rs
@@ -60,7 +60,7 @@ where
         <Db as XmtpDb>::TransactionManager::begin_transaction(&mut *write)?;
 
         if self.in_transaction.swap(true, Ordering::SeqCst) {
-            panic!("Already in transaction.");
+            return Err(StorageError::AlreadyInTransaction);
         }
 
         Ok(TransactionGuard {

diff --git a/xmtp_mls/src/storage/errors.rs b/xmtp_mls/src/storage/errors.rs
@@ -50,6 +50,8 @@ pub enum StorageError {
     Duplicate(DuplicateItem),
     #[error(transparent)]
     OpenMlsStorage(#[from] SqlKeyStoreError),
+    #[error("Connection is already marked as in transaction")]
+    AlreadyInTransaction,
     #[error("Transaction was intentionally rolled back")]
     IntentionalRollback,
 }