Skip to content

refactor: conversation_mut takes a closure [WPB-23149] #2048

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
coriolinus merged 4 commits into from
Apr 21, 2026
Merged

refactor: conversation_mut takes a closure [WPB-23149] #2048

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f24c068
refactor(crypto): `conversation_mut` takes a closure
coriolinus Apr 20, 2026
90c8e87
chore(crypto): use closures in `conversation_mut` calls
coriolinus Apr 20, 2026
1960ac9
chore(crypto): use closures in `conversation_mut` calls in tests
coriolinus Apr 21, 2026
6ef84f9
chore(crypto): `cargo +nightly fmt`
coriolinus Apr 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
115 changes: 54 additions & 61 deletions crypto/src/mls/conversation/conversation_guard/commit.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,37 +107,30 @@ impl ConversationGuard {
self.ensure_no_pending_commit().await?;
let backend = self.crypto_provider().await?;
let credential = self.credential().await?;
let signer = credential.signature_key();
let database = self.database().await?;
let mut conversation = self.conversation_mut().await;

let (commit, welcome, group_info) = conversation
.group
.add_members(&backend, signer, key_packages.clone())
.await
.map_err(|err| {
if Self::err_is_duplicate_signature_key(&err) {
let affected_clients = Self::clients_with_duplicate_signature_keys(key_packages.as_ref());
Error::DuplicateSignature { affected_clients }
} else {
MlsError::wrap("group add members")(err).into()
}
})?;

// commit requires an optional welcome
let welcome = Some(welcome);
let group_info = Self::group_info(group_info)?;

conversation.persist_group_when_changed(&database, false).await?;

let commit = MlsCommitBundle {
commit,
welcome,
group_info,
encrypted_message: None,
};
self.conversation_mut(async move |conversation, _database| {
let signer = credential.signature_key();
let (commit, welcome, group_info) = conversation
.group
.add_members(&backend, signer, key_packages.clone())
.await
.map_err(|err| {
if Self::err_is_duplicate_signature_key(&err) {
let affected_clients = Self::clients_with_duplicate_signature_keys(key_packages.as_ref());
Error::DuplicateSignature { affected_clients }
} else {
MlsError::wrap("group add members")(err).into()
}
})?;

Ok(commit)
Ok(MlsCommitBundle {
commit,
welcome: Some(welcome),
group_info: Self::group_info(group_info)?,
encrypted_message: None,
})
})
.await
}

fn err_is_duplicate_signature_key(
Expand Down Expand Up @@ -239,42 +232,42 @@ impl ConversationGuard {
/// committed.
pub(crate) async fn set_credential_inner(&mut self, credential: &Credential) -> Result<MlsCommitBundle> {
self.ensure_no_pending_commit().await?;
let backend = &self.crypto_provider().await?;
let database = self.database().await?;
let mut conversation = self.conversation_mut().await;

// If the credential remains the same and we still want to update, we explicitly need to pass `None` to openmls,
// if we just passed an unchanged leaf node, no update commit would be created.
// Also, we can avoid cloning in the case we don't need to create a new leaf node.
let updated_leaf_node = {
let leaf_node = conversation.group.own_leaf().ok_or(LeafError::InternalMlsError)?;
if leaf_node.credential() == &credential.mls_credential {
None
} else {
let mut leaf_node = leaf_node.clone();
leaf_node.set_credential_with_key(credential.to_mls_credential_with_key());
Some(leaf_node)
}
};

let (commit, welcome, group_info) = conversation
.group
.explicit_self_update(backend, &credential.signature_key_pair, updated_leaf_node)
.await
.map_err(MlsError::wrap("group self update"))?;
let backend = self.crypto_provider().await?;
let credential = credential.clone();

self.conversation_mut(async move |conversation, _database| {
// If the credential remains the same and we still want to update, we explicitly need to pass `None` to
// openmls, if we just passed an unchanged leaf node, no update commit would be created.
// Also, we can avoid cloning in the case we don't need to create a new leaf node.
let updated_leaf_node = {
let leaf_node = conversation.group.own_leaf().ok_or(LeafError::InternalMlsError)?;
if leaf_node.credential() == &credential.mls_credential {
None
} else {
let mut leaf_node = leaf_node.clone();
leaf_node.set_credential_with_key(credential.to_mls_credential_with_key());
Some(leaf_node)
}
};

// We should always have ratchet tree extension turned on hence GroupInfo should always be present
let group_info = group_info.ok_or(LeafError::MissingGroupInfo)?;
let group_info = MlsGroupInfoBundle::try_new_full_plaintext(group_info)?;
let (commit, welcome, group_info) = conversation
.group
.explicit_self_update(&backend, &credential.signature_key_pair, updated_leaf_node)
.await
.map_err(MlsError::wrap("group self update"))?;

conversation.persist_group_when_changed(&database, false).await?;
// We should always have ratchet tree extension turned on hence GroupInfo should always be present
let group_info = group_info.ok_or(LeafError::MissingGroupInfo)?;
let group_info = MlsGroupInfoBundle::try_new_full_plaintext(group_info)?;

Ok(MlsCommitBundle {
welcome,
commit,
group_info,
encrypted_message: None,
Ok(MlsCommitBundle {
welcome,
commit,
group_info,
encrypted_message: None,
})
})
.await
}

/// Commits all pending proposals of the group
Expand Down
Loading
Loading