From da7e06e495684331b1ad67780a8f3f1089e3a815 Mon Sep 17 00:00:00 2001
From: Jazz Turner-Baggs <473256+jazzz@users.noreply.github.com>
Date: Fri, 24 Apr 2026 17:03:49 -0700
Subject: [PATCH] Wrap constructor in result

---
 core/conversations/src/conversation/group_v1.rs | 16 ++++++++--------
 core/conversations/src/inbox_v2.rs              |  5 ++---
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/core/conversations/src/conversation/group_v1.rs b/core/conversations/src/conversation/group_v1.rs
index f54c56d..b3e461f 100644
--- a/core/conversations/src/conversation/group_v1.rs
+++ b/core/conversations/src/conversation/group_v1.rs
@@ -78,7 +78,7 @@ where
         ctx: Rc<RefCell<MlsCtx>>,
         ds: Rc<RefCell<DS>>,
         keypkg_provider: Rc<RefCell<KP>>,
-    ) -> Self {
+    ) -> Result<Self, ChatError> {
         let config = Self::mls_create_config();
         let mls_group = {
             let ctx_ref = ctx.borrow();
@@ -91,7 +91,7 @@ where
             .unwrap()
         };
         let convo_id = hex::encode(mls_group.group_id().as_slice());
-        Self::subscribe(&mut ds.borrow_mut(), &convo_id);
+        Self::subscribe(&mut ds.borrow_mut(), &convo_id)?;
 
         println!(
             "@   Create Convo: {}.  {}.  d:{}  dc:{}",
@@ -100,13 +100,13 @@ where
             Self::delivery_address_from_id(&convo_id),
             Self::ctrl_delivery_address_from_id(&convo_id)
         );
-        Self {
+        Ok(Self {
             ctx,
             ds,
             keypkg_provider,
             mls_group,
             convo_id,
-        }
+        })
     }
 
     pub fn new_from_welcome(
@@ -114,7 +114,7 @@ where
         ds: Rc<RefCell<DS>>,
         keypkg_provider: Rc<RefCell<KP>>,
         welcome: Welcome,
-    ) -> Self {
+    ) -> Result<Self, ChatError> {
         let mls_group = {
             let ctx_borrow = ctx.borrow();
             let provider = ctx_borrow.provider();
@@ -128,7 +128,7 @@ where
         };
 
         let convo_id = hex::encode(mls_group.group_id().as_slice());
-        Self::subscribe(&mut *ds.borrow_mut(), &convo_id);
+        Self::subscribe(&mut *ds.borrow_mut(), &convo_id)?;
 
         println!(
             "@   Welcome Convo: I:{}.  {}.  d:{}  dc:{}",
@@ -138,13 +138,13 @@ where
             Self::ctrl_delivery_address_from_id(&convo_id)
         );
 
-        GroupV1Convo {
+        Ok(Self {
             ctx,
             ds,
             keypkg_provider,
             mls_group,
             convo_id,
-        }
+        })
     }
 
     pub fn load(
diff --git a/core/conversations/src/inbox_v2.rs b/core/conversations/src/inbox_v2.rs
index 4aea37a..7413c22 100644
--- a/core/conversations/src/inbox_v2.rs
+++ b/core/conversations/src/inbox_v2.rs
@@ -141,8 +141,7 @@ where
     }
 
     pub fn create_group_v1(&self) -> Result<GroupV1Convo<PqMlsContext, DS, RS>, ChatError> {
-        let convo = GroupV1Convo::new(self.ctx.clone(), self.ds.clone(), self.reg_service.clone());
-        Ok(convo)
+        GroupV1Convo::new(self.ctx.clone(), self.ds.clone(), self.reg_service.clone())
     }
 
     pub fn handle_frame(&self, payload_bytes: &[u8]) -> Result<(), ChatError> {
@@ -187,7 +186,7 @@ where
             self.ds.clone(),
             self.reg_service.clone(),
             welcome,
-        );
+        )?;
         self.persist_convo(convo)
     }