Skip to content

Commit

Permalink
Revert "skip empty key packages (#950)" (#954)
Browse files Browse the repository at this point in the history
This reverts commit 67ecf50.
  • Loading branch information
nplasterer authored Aug 13, 2024
1 parent 67ecf50 commit 5acd067
Showing 1 changed file with 3 additions and 46 deletions.
49 changes: 3 additions & 46 deletions xmtp_mls/src/api/mls.rs
Original file line number Diff line number Diff line change
Expand Up @@ -236,19 +236,11 @@ where
.key_packages
.into_iter()
.enumerate()
.filter_map(|(idx, key_package)| {
if key_package.key_package_tls_serialized.is_empty() {
log::warn!(
"installation key 0x{} has empty key package",
hex::encode(&installation_keys[idx])
);
return None;
}

Some((
.map(|(idx, key_package)| {
(
installation_keys[idx].to_vec(),
key_package.key_package_tls_serialized,
))
)
})
.collect();

Expand Down Expand Up @@ -691,39 +683,4 @@ pub mod tests {
.unwrap();
assert_eq!(result.len(), 50);
}

#[tokio::test]
async fn test_fetch_key_packages_skips_empty() {
let mut mock_api = MockApiClient::new();
let installation_keys: Vec<Vec<u8>> = vec![vec![1, 2, 3], vec![4, 5, 6], vec![1, 1, 1]];
mock_api.expect_fetch_key_packages().returning(move |_| {
Ok(FetchKeyPackagesResponse {
key_packages: vec![
KeyPackage {
key_package_tls_serialized: vec![7, 8, 9],
},
KeyPackage {
key_package_tls_serialized: vec![],
},
KeyPackage {
key_package_tls_serialized: vec![10, 11, 12],
},
],
})
});
let wrapper = ApiClientWrapper::new(mock_api, Retry::default());
let result = wrapper
.fetch_key_packages(installation_keys.clone())
.await
.unwrap();
assert_eq!(result.len(), 2);

for (k, v) in result {
if k.eq(&installation_keys[0]) {
assert_eq!(v, vec![7, 8, 9]);
} else {
assert_eq!(v, vec![10, 11, 12]);
}
}
}
}

0 comments on commit 5acd067

Please sign in to comment.