Skip to content

Commit

Permalink
Merge branch 'coda/asyncless-transactions' of github.com:xmtp/libxmtp…
Browse files Browse the repository at this point in the history
… into coda/asyncless-transactions
  • Loading branch information
codabrink committed Jan 29, 2025
2 parents 6a6e6da + 1b071e0 commit 0403629
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
2 changes: 2 additions & 0 deletions xmtp_mls/src/groups/mls_sync.rs
Original file line number Diff line number Diff line change
Expand Up @@ -554,6 +554,7 @@ where
if !matches!(result, Err(StorageError::IntentionalRollback)) {
result?;
}

let processed_message = processed_message.expect("Was just set to Some")?;

let (sender_inbox_id, sender_installation_id) =
Expand Down Expand Up @@ -600,6 +601,7 @@ where

provider.transaction(|provider| {
let processed_message = mls_group.process_message(provider, message)?;

let mut validated_commit = None;

if let ProcessedMessageContent::StagedCommitMessage(staged_commit) =
Expand Down
5 changes: 2 additions & 3 deletions xmtp_mls/src/groups/validated_commit.rs
Original file line number Diff line number Diff line change
Expand Up @@ -290,13 +290,12 @@ impl ValidatedCommit {
let group_permissions: GroupMutablePermissions = extensions.try_into()?;
let current_group_members = get_current_group_members(openmls_group);

let existing_group_extensions = openmls_group.extensions();
let new_group_extensions = staged_commit.group_context().extensions();

let metadata_changes = extract_metadata_changes(
&immutable_metadata,
&mutable_metadata,
existing_group_extensions,
extensions,
new_group_extensions,
)?;

Expand Down Expand Up @@ -507,7 +506,7 @@ fn get_latest_group_membership(
extract_group_membership(staged_commit.group_context().extensions())
}

pub(super) struct ExpectedDiff {
pub struct ExpectedDiff {
new_group_membership: GroupMembership,
expected_installation_diff: InstallationDiff,
added_inboxes: Vec<Inbox>,
Expand Down

0 comments on commit 0403629

Please sign in to comment.