fix more tests

Author: aterga

src/internet_identity/tests/integration/v2_api/identity_register.rs

@@ -2,7 +2,7 @@ mod dynamic_captcha;
 
 use crate::v2_api::authn_method_test_helpers::{
     create_identity_with_authn_method, create_identity_with_authn_method_and_name,
-    test_authn_method,
+    sample_webauthn_authn_method, test_authn_method,
 };
 use candid::Principal;
 use canister_tests::api::internet_identity::{api_v2, get_anchor_info};
@@ -36,9 +36,10 @@ fn should_register_new_identity() {
 fn should_register_multiple_identities() {
     let env = env();
     let canister_id = install_ii_with_archive(&env, None, None);
-    let authn_method = test_authn_method();
-    let identity_number_1 = create_identity_with_authn_method(&env, canister_id, &authn_method);
-    let identity_number_2 = create_identity_with_authn_method(&env, canister_id, &authn_method);
+    let identity_number_1 =
+        create_identity_with_authn_method(&env, canister_id, &sample_webauthn_authn_method(0));
+    let identity_number_2 =
+        create_identity_with_authn_method(&env, canister_id, &sample_webauthn_authn_method(1));
 
     assert_ne!(identity_number_1, identity_number_2);
 }
@@ -88,9 +89,8 @@ fn should_not_exceed_configured_identity_range() {
     let canister_id =
         install_ii_canister_with_arg(&env, II_WASM.clone(), arg_with_anchor_range((42, 44)));
 
-    let authn_method = test_authn_method();
-    create_identity_with_authn_method(&env, canister_id, &authn_method);
-    create_identity_with_authn_method(&env, canister_id, &authn_method);
+    create_identity_with_authn_method(&env, canister_id, &sample_webauthn_authn_method(0));
+    create_identity_with_authn_method(&env, canister_id, &sample_webauthn_authn_method(1));
 
     let flow_principal = test_principal(0);
     api_v2::identity_registration_start(&env, canister_id, flow_principal)
@@ -105,7 +105,7 @@ fn should_not_exceed_configured_identity_range() {
         &env,
         canister_id,
         flow_principal,
-        &authn_method,
+        &sample_webauthn_authn_method(2),
         None,
     )
     .expect("API call failed");

src/internet_identity/tests/integration/v2_api/identity_register/dynamic_captcha.rs

@@ -1,5 +1,5 @@
 use crate::v2_api::authn_method_test_helpers::{
-    create_identity_with_authn_method, test_authn_method,
+    create_identity_with_authn_method, sample_webauthn_authn_method, test_authn_method,
 };
 use canister_tests::api::internet_identity::api_v2;
 use canister_tests::framework::{
@@ -38,11 +38,14 @@ fn should_require_captcha_above_threshold_rate() {
     let env = env();
     let canister_id =
         install_ii_canister_with_arg(&env, II_WASM.clone(), arg_with_dynamic_captcha());
-    let authn_method = test_authn_method();
 
     // initialize a base rate of one registration every 4 seconds for 100 seconds (reference rate)
-    for _ in 0..25 {
-        create_identity_with_authn_method(&env, canister_id, &authn_method);
+    for i in 0..25 {
+        create_identity_with_authn_method(
+            &env,
+            canister_id,
+            &sample_webauthn_authn_method(i as u8),
+        );
         env.advance_time(Duration::from_secs(4))
     }
 
@@ -60,7 +63,7 @@ fn should_require_captcha_above_threshold_rate() {
             &env,
             canister_id,
             flow_principal,
-            &authn_method,
+            &sample_webauthn_authn_method((25 + i) as u8),
             None,
         )
         .expect("API call failed")

src/internet_identity/tests/integration/v2_api/passkey_aaguid.rs

@@ -606,6 +606,19 @@ fn should_enforce_unique_passkey_pubkeys_in_registration_mode_flows() -> Result<
     let b0_initial = webauthn_authn_method(p1.clone(), test_credential_id(11).unwrap());
     let identity_b0 = create_identity_with_authn_method(&env, canister_id, &b0_initial);
 
+    // Enter registration mode for identity B0 (needed for both checks below).
+    let registration_mode_id = "0eZr5".to_string();
+    let intermediate_sender = Principal::self_authenticating([42; 32]);
+
+    canister_tests::api::internet_identity::api_v2::authn_method_registration_mode_enter(
+        &env,
+        canister_id,
+        b0_initial.principal(),
+        identity_b0,
+        Some(registration_mode_id.clone()),
+    )?
+    .unwrap();
+
     // 1. authn_method_register must reject registering a passkey whose pubkey is already used.
     let a1_same_p0 = webauthn_authn_method(p0.clone(), test_credential_id(12).unwrap());
     let result_register_conflict =
@@ -621,18 +634,6 @@ fn should_enforce_unique_passkey_pubkeys_in_registration_mode_flows() -> Result<
     );
 
     // 2. authn_method_registration_mode_exit must reject adding a passkey whose pubkey is already used.
-    let registration_mode_id = "0eZr5".to_string();
-    let intermediate_sender = Principal::self_authenticating([42; 32]);
-
-    // Enter registration mode for identity B0.
-    canister_tests::api::internet_identity::api_v2::authn_method_registration_mode_enter(
-        &env,
-        canister_id,
-        b0_initial.principal(),
-        identity_b0,
-        Some(registration_mode_id.clone()),
-    )?
-    .unwrap();
 
     // Create a session for B0 (this stores a confirmed session principal).
     let AuthnMethodConfirmationCode {