Fix unit tests breaking due to grease

mls-rs/src/group/commit.rs

@@ -568,12 +568,12 @@ where
  // parent_hash extension.
 
  let new_leaf_node_extensions =
- new_leaf_node_extensions.or(external_leaf.map(|ln| ln.extensions.clone()));
+ new_leaf_node_extensions.or(external_leaf.map(|ln| ln.ungreased_extensions()));
 
  let new_leaf_node_extensions = match new_leaf_node_extensions {
  Some(extensions) => extensions,
  // If we are not setting new extensions and this is not an external leaf then the current node MUST exist.
- None => self.current_user_leaf_node()?.extensions.clone(),
+ None => self.current_user_leaf_node()?.ungreased_extensions(),
  };
 
  let encap_gen = TreeKem::new(

mls-rs/src/group/mod.rs

@@ -859,7 +859,7 @@ where
  let mut new_leaf_node: LeafNode = self.current_user_leaf_node()?.clone();
 
  let new_leaf_node_extensions =
- leaf_node_extensions.unwrap_or(new_leaf_node.extensions.clone());
+ leaf_node_extensions.unwrap_or(new_leaf_node.ungreased_extensions());
  let secret_key = new_leaf_node
  .update(
  &self.cipher_suite_provider,

mls-rs/src/group/resumption.rs

@@ -57,7 +57,7 @@ where
  extensions: &self.group_state().context.extensions,
  };
 
- let current_leaf_node_extensions = &self.current_user_leaf_node()?.extensions;
+ let current_leaf_node_extensions = &self.current_user_leaf_node()?.ungreased_extensions();
  resumption_create_group(
  self.config.clone(),
  new_key_packages,
@@ -182,6 +182,7 @@ impl<C: ClientConfig + Clone> ReinitClient<C> {
  pub async fn commit(
  self,
  new_key_packages: Vec<MlsMessage>,
+ new_leaf_node_extensions: ExtensionList,
  ) -> Result<(Group<C>, Vec<MlsMessage>), MlsError> {
  let new_group_params = ResumptionGroupParameters {
  group_id: self.reinit.group_id(),
@@ -190,17 +191,14 @@ impl<C: ClientConfig + Clone> ReinitClient<C> {
  extensions: self.reinit.new_group_context_extensions(),
  };
 
- let group = self.client.load_group(self.reinit.group_id())?;
- let current_leaf_node_extensions = &group.current_user_leaf_node()?.extensions;
-
  resumption_create_group(
  self.client.config.clone(),
  new_key_packages,
  &new_group_params,
  // These private fields are created with `Some(x)` by `get_reinit_client`
  self.client.signing_identity.unwrap().0,
  self.client.signer.unwrap(),
- current_leaf_node_extensions,
+ &new_leaf_node_extensions,
  #[cfg(any(feature = "private_message", feature = "psk"))]
  self.psk_input,
  )

mls-rs/src/group/test_utils.rs

@@ -246,7 +246,6 @@ pub(crate) async fn test_group_custom(
  let commit_options = commit_options.unwrap_or_default();
 
  let (signing_identity, secret_key) = get_test_signing_identity(cipher_suite, b"member").await;
-
  let group = TestClientBuilder::new_for_test()
  .mls_rules(DefaultMlsRules::default().with_commit_options(commit_options))
  .extension_types(extension_types)

mls-rs/test_harness_integration/src/branch_reinit.rs

@@ -174,7 +174,9 @@ pub(crate) mod inner {
  )
  .map_err(abort)?;
 
- client.commit(new_key_pkgs).map_err(abort)?
+ client
+ .commit(new_key_pkgs, Default::default())
+ .map_err(abort)?
  };
 
  let welcome = welcome

mls-rs/tests/client_tests.rs

@@ -697,7 +697,7 @@ async fn reinit_works() {
 
  // Bob produces key package, alice commits, bob joins
  let kp = bob2.generate_key_package().await.unwrap();
- let (mut alice_group, welcome) = alice2.commit(vec![kp]).await.unwrap();
+ let (mut alice_group, welcome) = alice2.commit(vec![kp], Default::default()).await.unwrap();
  let (mut bob_group, _) = bob2.join(&welcome[0], None).await.unwrap();
 
  assert!(bob_group.cipher_suite() == suite2);