Make CommitProcessor another variant of ReceivedMessage.

mls-rs/examples/api_1x.rs

@@ -42,7 +42,10 @@ fn main() -> Result<(), MlsError> {
 
     // Alice and bob can chat
     let msg = alice_group.encrypt_application_message(b"hello world", Default::default())?;
-    let msg = bob_group.process_incoming_message(msg)?;
+
+    let msg = bob_group
+        .process_incoming_message(msg)?
+        .into_received_message();
 
     println!("Received message: {:?}", msg);
 

mls-rs/examples/basic_server_usage.rs

@@ -60,9 +60,12 @@ impl BasicServer {
         let mut group = server.load_group(group_state)?;
 
         let proposal_msg = MlsMessage::from_bytes(&proposal)?;
-        let res = group.process_incoming_message(proposal_msg)?;
 
-        let ExternalReceivedMessage::Proposal(proposal_desc) = res else {
+        let res = group
+            .process_incoming_message(proposal_msg)?
+            .into_received_message();
+
+        let Some(ExternalReceivedMessage::Proposal(proposal_desc)) = res else {
             panic!("expected proposal message!")
         };
 
@@ -86,9 +89,12 @@ impl BasicServer {
         }
 
         let commit_msg = MlsMessage::from_bytes(&commit)?;
-        let res = group.process_incoming_message(commit_msg)?;
 
-        let ExternalReceivedMessage::Commit(_commit_desc) = res else {
+        let res = group
+            .process_incoming_message(commit_msg)?
+            .into_received_message();
+
+        let Some(ExternalReceivedMessage::Commit(_commit_desc)) = res else {
             panic!("expected commit message!")
         };
 
@@ -184,7 +190,10 @@ fn main() -> Result<(), MlsError> {
     // Bob downloads the commit
     let message = server.download_messages(1).first().unwrap();
 
-    let res = bob_group.process_incoming_message(MlsMessage::from_bytes(message)?)?;
+    let res = bob_group
+        .process_incoming_message(MlsMessage::from_bytes(message)?)?
+        .into_received_message()
+        .unwrap();
 
     let ReceivedMessage::Commit(commit_desc) = res else {
         panic!("expected commit message")

mls-rs/examples/basic_usage.rs

@@ -72,7 +72,9 @@ fn main() -> Result<(), MlsError> {
     let msg = alice_group.encrypt_application_message(b"hello world", Default::default())?;
 
     // Bob decrypts the application message from Alice.
-    let msg = bob_group.process_incoming_message(msg)?;
+    let msg = bob_group
+        .process_incoming_message(msg)?
+        .into_received_message();
 
     println!("Received message: {:?}", msg);
 

mls-rs/examples/custom.rs

@@ -408,7 +408,11 @@ fn main() -> Result<(), CustomError> {
 
     alice_tablet_group.apply_pending_commit()?;
 
-    let mut processor = alice_pc_group.commit_processor(commit.commit_message)?;
+    let mut processor = alice_pc_group
+        .process_incoming_message(commit.commit_message)?
+        .into_processor()
+        .ok_or(CustomError)?;
+
     handle_custom_proposals(&processor.context().clone(), processor.proposals_mut())?;
     processor.process()?;
 

mls-rs/src/client.rs

@@ -958,7 +958,7 @@ mod tests {
             .unwrap();
 
         assert_matches!(
-            message,
+            message.into_received_message().unwrap(),
             ReceivedMessage::Proposal(ProposalMessageDescription {
                 proposal: Proposal::Add(p), ..}
             ) if p.key_package.leaf_node.signing_identity == bob_identity
@@ -1020,10 +1020,9 @@ mod tests {
 
         assert_eq!(new_group.roster().members_iter().count(), num_members);
 
-        let _ = alice_group
+        alice_group
             .commit_processor(external_commit.clone())
             .await
-            .unwrap()
             .with_external_psk(psk_id.clone(), psk.clone())
             .process()
             .await
@@ -1034,7 +1033,6 @@ mod tests {
         let message = bob_group
             .commit_processor(external_commit.clone())
             .await
-            .unwrap()
             .with_external_psk(psk_id, psk)
             .process()
             .await
@@ -1045,9 +1043,6 @@ mod tests {
         if !do_remove {
             assert!(bob_group.roster().members_iter().count() == num_members);
         } else {
-            // Bob was removed so his epoch must stay the same
-            assert_eq!(bob_group.current_epoch(), bob_current_epoch);
-
             assert_matches!(
                 message,
                 CommitMessageDescription {
@@ -1058,6 +1053,11 @@ mod tests {
                     ..
                 }
             );
+
+            core::mem::drop(message);
+
+            // Bob was removed so his epoch must stay the same
+            assert_eq!(bob_group.current_epoch(), bob_current_epoch);
         }
 
         // Comparing epoch authenticators is sufficient to check that members are in sync.