Reduce duplication of maybe_update_installations

xmtp · Oct 2, 2024 · 24ea88e · 24ea88e
1 parent 71478f1
commit 24ea88e
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 21 deletions.
diff --git a/xmtp_mls/src/client.rs b/xmtp_mls/src/client.rs
@@ -755,10 +755,6 @@ where
                         mls_group.epoch()
                     );
                     if mls_group.is_active() {
-                        group
-                            .maybe_update_installations(provider_ref, None, self)
-                            .await?;
-
                         group.sync_with_conn(provider_ref, self).await?;
                         active_group_count.fetch_add(1, Ordering::SeqCst);
                     }

diff --git a/xmtp_mls/src/groups/mod.rs b/xmtp_mls/src/groups/mod.rs
@@ -493,9 +493,6 @@ impl MlsGroup {
     {
         let conn = self.context.store.conn()?;
         let provider = XmtpOpenMlsProvider::from(conn);
-        let update_interval_ns = Some(SEND_MESSAGE_UPDATE_INSTALLATIONS_INTERVAL_NS);
-        self.maybe_update_installations(&provider, update_interval_ns, client)
-            .await?;
         self.sync_until_last_intent_resolved(&provider, client)
             .await?;
 
@@ -506,6 +503,7 @@ impl MlsGroup {
     }
 
     /// Update group installations
+    #[cfg(test)]
     pub async fn update_installations<ApiClient>(
         &self,
         client: &Client<ApiClient>,
@@ -515,7 +513,7 @@ impl MlsGroup {
     {
         let conn = self.context.store.conn()?;
         let provider = XmtpOpenMlsProvider::from(conn);
-        self.maybe_update_installations(&provider, Some(0), client)
+        self.maybe_update_installations(&provider, 0 /*interval_ns*/, client)
             .await?;
         Ok(())
     }
@@ -1042,9 +1040,12 @@ impl MlsGroup {
         }
 
         let provider: XmtpOpenMlsProvider = conn.into();
-        let update_interval_ns = Some(SEND_MESSAGE_UPDATE_INSTALLATIONS_INTERVAL_NS);
-        self.maybe_update_installations(&provider, update_interval_ns, client)
-            .await?;
+        self.maybe_update_installations(
+            &provider,
+            SEND_MESSAGE_UPDATE_INSTALLATIONS_INTERVAL_NS,
+            client,
+        )
+        .await?;
 
         Ok(PreIntentComplete {})
     }

diff --git a/xmtp_mls/src/groups/sync.rs b/xmtp_mls/src/groups/sync.rs
@@ -39,6 +39,7 @@ use crate::{
     xmtp_openmls_provider::XmtpOpenMlsProvider,
     Client, Delete, Fetch, StoreOrIgnore, XmtpApi,
 };
+use async_recursion::async_recursion;
 use futures::future::try_join_all;
 use openmls::{
     credentials::BasicCredential,
@@ -99,13 +100,11 @@ impl MlsGroup {
             client.inbox_id(),
             self.load_mls_group(&mls_provider)?.epoch()
         );
-        self.maybe_update_installations(&mls_provider, None, client)
-            .await?;
-
         self.sync_with_conn(&mls_provider, client).await
     }
 
     #[tracing::instrument(level = "trace", skip(self, provider, client))]
+    #[async_recursion]
     pub(crate) async fn sync_with_conn<ApiClient>(
         &self,
         provider: &XmtpOpenMlsProvider,
@@ -114,6 +113,9 @@ impl MlsGroup {
     where
         ApiClient: XmtpApi,
     {
+        self.maybe_update_installations(provider, SYNC_UPDATE_INSTALLATIONS_INTERVAL_NS, client)
+            .await?;
+
         let _mutex = self.mutex.lock().await;
         let mut errors: Vec<GroupError> = vec![];
 
@@ -979,18 +981,12 @@ impl MlsGroup {
     pub async fn maybe_update_installations<ApiClient>(
         &self,
         provider: &XmtpOpenMlsProvider,
-        update_interval_ns: Option<i64>,
+        interval_ns: i64,
         client: &Client<ApiClient>,
     ) -> Result<(), GroupError>
     where
         ApiClient: XmtpApi,
     {
-        // determine how long of an interval in time to use before updating list
-        let interval_ns = match update_interval_ns {
-            Some(val) => val,
-            None => SYNC_UPDATE_INSTALLATIONS_INTERVAL_NS,
-        };
-
         let now_ns = crate::utils::time::now_ns();
         let last_ns = provider
             .conn_ref()