Skip to content
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

Remove unnecessary "async" from GroupStateRepository constructor #126

Merged
merged 1 commit into from
Mar 20, 2024
+14 −24
Merged

Remove unnecessary "async" from GroupStateRepository constructor #126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 2 additions & 4 deletions mls-rs/src/group/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,8 +345,7 @@ where
config.group_state_storage(),
config.key_package_repo(),
None,
)
.await?;
)?;

let key_schedule_result = KeySchedule::from_random_epoch_secret(
&cipher_suite_provider,
Expand Down Expand Up @@ -608,8 +607,7 @@ where
config.group_state_storage(),
config.key_package_repo(),
used_key_package_ref,
)
.await?;
)?;

let group = Group {
config,
Expand Down
3 changes: 1 addition & 2 deletions mls-rs/src/group/snapshot.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,8 +186,7 @@ where
config.group_state_storage(),
config.key_package_repo(),
None,
)
.await?;
)?;

Ok(Group {
config,
Expand Down
24 changes: 10 additions & 14 deletions mls-rs/src/group/state_repo.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,7 @@ where
S: GroupStateStorage,
K: KeyPackageStorage,
{
#[cfg_attr(not(mls_build_async), maybe_async::must_be_sync)]
pub async fn new(
pub fn new(
group_id: Vec<u8>,
storage: S,
key_package_repo: K,
Expand Down Expand Up @@ -257,8 +256,7 @@ mod tests {

use super::*;

#[cfg_attr(not(mls_build_async), maybe_async::must_be_sync)]
async fn test_group_state_repo(
fn test_group_state_repo(
retention_limit: usize,
) -> GroupStateRepository<InMemoryGroupStateStorage, InMemoryKeyPackageStorage> {
GroupStateRepository::new(
Expand All @@ -269,7 +267,6 @@ mod tests {
InMemoryKeyPackageStorage::default(),
None,
)
.await
.unwrap()
}

Expand All @@ -284,7 +281,7 @@ mod tests {

#[maybe_async::test(not(mls_build_async), async(mls_build_async, crate::futures_test))]
async fn test_epoch_inserts() {
let mut test_repo = test_group_state_repo(1).await;
let mut test_repo = test_group_state_repo(1);
let test_epoch = test_epoch(0);

test_repo.insert(test_epoch.clone()).await.unwrap();
Expand Down Expand Up @@ -352,7 +349,7 @@ mod tests {

#[maybe_async::test(not(mls_build_async), async(mls_build_async, crate::futures_test))]
async fn test_updates() {
let mut test_repo = test_group_state_repo(2).await;
let mut test_repo = test_group_state_repo(2);
let test_epoch_0 = test_epoch(0);

test_repo.insert(test_epoch_0.clone()).await.unwrap();
Expand Down Expand Up @@ -417,7 +414,7 @@ mod tests {

#[maybe_async::test(not(mls_build_async), async(mls_build_async, crate::futures_test))]
async fn test_insert_and_update() {
let mut test_repo = test_group_state_repo(2).await;
let mut test_repo = test_group_state_repo(2);
let test_epoch_0 = test_epoch(0);

test_repo.insert(test_epoch_0).await.unwrap();
Expand Down Expand Up @@ -475,7 +472,7 @@ mod tests {
async fn test_many_epochs_in_storage() {
let epochs = (0..10).map(test_epoch).collect::<Vec<_>>();

let mut test_repo = test_group_state_repo(10).await;
let mut test_repo = test_group_state_repo(10);

for epoch in epochs.iter().cloned() {
test_repo.insert(epoch).await.unwrap()
Expand All @@ -495,7 +492,7 @@ mod tests {

#[maybe_async::test(not(mls_build_async), async(mls_build_async, crate::futures_test))]
async fn test_stored_groups_list() {
let mut test_repo = test_group_state_repo(2).await;
let mut test_repo = test_group_state_repo(2);
let test_epoch_0 = test_epoch(0);

test_repo.insert(test_epoch_0.clone()).await.unwrap();
Expand All @@ -513,7 +510,7 @@ mod tests {

#[maybe_async::test(not(mls_build_async), async(mls_build_async, crate::futures_test))]
async fn reducing_retention_limit_takes_effect_on_epoch_access() {
let mut repo = test_group_state_repo(1).await;
let mut repo = test_group_state_repo(1);

repo.insert(test_epoch(0)).await.unwrap();
repo.insert(test_epoch(1)).await.unwrap();
Expand All @@ -522,7 +519,7 @@ mod tests {

let mut repo = GroupStateRepository {
storage: repo.storage,
..test_group_state_repo(1).await
..test_group_state_repo(1)
};

let res = repo.get_epoch_mut(0).await.unwrap();
Expand All @@ -532,7 +529,7 @@ mod tests {

#[maybe_async::test(not(mls_build_async), async(mls_build_async, crate::futures_test))]
async fn in_memory_storage_obeys_retention_limit_after_saving() {
let mut repo = test_group_state_repo(1).await;
let mut repo = test_group_state_repo(1);

repo.insert(test_epoch(0)).await.unwrap();
repo.write_to_storage(test_snapshot(0).await).await.unwrap();
Expand Down Expand Up @@ -565,7 +562,6 @@ mod tests {
key_package_repo,
Some(key_package.reference.clone()),
)
.await
.unwrap();

repo.key_package_repo.get(&key_package.reference).unwrap();
Expand Down
5 changes: 1 addition & 4 deletions mls-rs/src/group/state_repo_light.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,7 @@ where
S: GroupStateStorage,
K: KeyPackageStorage,
{
#[cfg_attr(not(mls_build_async), maybe_async::must_be_sync)]
pub async fn new(
pub fn new(
storage: S,
key_package_repo: K,
// Set to `None` if restoring from snapshot; set to `Some` when joining a group.
Expand Down Expand Up @@ -95,7 +94,6 @@ mod tests {
InMemoryKeyPackageStorage::default(),
None,
)
.await
.unwrap();

test_repo
Expand Down Expand Up @@ -123,7 +121,6 @@ mod tests {
key_package_repo,
Some(key_package.reference.clone()),
)
.await
.unwrap();

repo.key_package_repo.get(&key_package.reference).unwrap();
Expand Down
Loading