fix fmt

xmtp · Dec 13, 2024 · d288c6b · d288c6b
1 parent 7ef4f3c
commit d288c6b
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 12 deletions.
diff --git a/bindings_node/src/conversation.rs b/bindings_node/src/conversation.rs
@@ -167,10 +167,9 @@ impl Conversation {
       self.created_at_ns,
     );
     let provider = group.mls_provider().map_err(ErrorWrapper::from)?;
-    let conversation_type = tokio::task::block_in_place(|| {
-      futures::executor::block_on(group.conversation_type(&provider))
-    })
-    .map_err(ErrorWrapper::from)?;
+    let conversation_type = group
+      .conversation_type(&provider)
+      .map_err(ErrorWrapper::from)?;
     let kind = match conversation_type {
       ConversationType::Group => None,
       ConversationType::Dm => Some(XmtpGroupMessageKind::Application),
@@ -611,8 +610,8 @@ impl Conversation {
     );
 
     let metadata = group
-        .metadata(&group.mls_provider().map_err(ErrorWrapper::from)?)
-        .map_err(ErrorWrapper::from)?;
+      .metadata(&group.mls_provider().map_err(ErrorWrapper::from)?)
+      .map_err(ErrorWrapper::from)?;
 
     Ok(GroupMetadata { inner: metadata })
   }

diff --git a/bindings_wasm/src/conversation.rs b/bindings_wasm/src/conversation.rs
@@ -191,7 +191,6 @@ impl Conversation {
       .map_err(|e| JsError::new(&format!("{e}")))?;
     let conversation_type = group
       .conversation_type(&provider)
-      .await
       .map_err(|e| JsError::new(&format!("{e}")))?;
     let kind = match conversation_type {
       ConversationType::Group => None,

diff --git a/xmtp_mls/src/groups/mod.rs b/xmtp_mls/src/groups/mod.rs
@@ -1183,10 +1183,7 @@ impl<ScopedClient: ScopedGroupClient> MlsGroup<ScopedClient> {
     }
 
     /// Get the `GroupMetadata` of the group.
-    pub fn metadata(
-        &self,
-        provider: &XmtpOpenMlsProvider,
-    ) -> Result<GroupMetadata, GroupError> {
+    pub fn metadata(&self, provider: &XmtpOpenMlsProvider) -> Result<GroupMetadata, GroupError> {
         self.load_mls_group_with_lock(provider, |mls_group| {
             extract_group_metadata(&mls_group).map_err(Into::into)
         })

diff --git a/xmtp_mls/src/lib.rs b/xmtp_mls/src/lib.rs
@@ -106,10 +106,10 @@ pub trait Delete<Model> {
 }
 
 use crate::groups::GroupError;
+use crate::groups::GroupError::LockUnavailable;
 pub use stream_handles::{
     spawn, AbortHandle, GenericStreamHandle, StreamHandle, StreamHandleError,
 };
-use crate::groups::GroupError::LockUnavailable;
 
 #[cfg(test)]
 pub(crate) mod tests {