Remove unwrap from group_state.rs

awslabs · Feb 26, 2024 · 1b3bb15 · 1b3bb15
1 parent 659ed06
commit 1b3bb15
Showing 1 changed file with 14 additions and 7 deletions.
diff --git a/mls-rs-uniffi/src/config/group_state.rs b/mls-rs-uniffi/src/config/group_state.rs
@@ -101,18 +101,25 @@ impl mls_rs_core::group::GroupStateStorage for GroupStateStorageWrapper {
  {
  let state = Arc::new(GroupState {
  id: state.id(),
- data: state.mls_encode_to_vec().unwrap(),
+ data: state.mls_encode_to_vec()?,
  });
 
- let epoch_to_record = |v: ET| {
- Arc::new(EpochRecord {
+ let epoch_to_record = |v: ET| -> Result<_, Self::Error> {
+ Ok(Arc::new(EpochRecord {
  id: v.id(),
- data: v.mls_encode_to_vec().unwrap(),
- })
+ data: v.mls_encode_to_vec()?,
+ }))
  };
 
- let inserts = epoch_inserts.into_iter().map(epoch_to_record).collect();
- let updates = epoch_updates.into_iter().map(epoch_to_record).collect();
+ let inserts = epoch_inserts
+ .into_iter()
+ .map(epoch_to_record)
+ .collect::<Result<Vec<_>, _>>()?;
+
+ let updates = epoch_updates
+ .into_iter()
+ .map(epoch_to_record)
+ .collect::<Result<Vec<_>, _>>()?;
 
  self.0.write(state, inserts, updates)
  }