Fix zklogin tests (MystenLabs#16825)

StevenMia · Mar 25, 2024 · ebe6702 · ebe6702
1 parent 42ef811
commit ebe6702
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/crates/sui-core/src/authority/authority_per_epoch_store.rs b/crates/sui-core/src/authority/authority_per_epoch_store.rs
@@ -1967,7 +1967,7 @@ impl AuthorityPerEpochStore {
         let insert_result = jwk_aggregator.insert(authority, key.clone());
 
         if !previously_active && insert_result.is_quorum_reached() {
-            info!("jwk {:?} became active at round {:?}", key, round);
+            info!(epoch = ?self.epoch(), ?round, jwk = ?key, "jwk became active");
             batch.insert_batch(
                 &self.tables()?.active_jwks,
                 std::iter::once(((round, key), ())),

diff --git a/crates/sui-core/src/consensus_handler.rs b/crates/sui-core/src/consensus_handler.rs
@@ -306,9 +306,13 @@ impl<C: CheckpointServiceNotify + Send + Sync> ConsensusHandler<C> {
             .expect("Unrecoverable error in consensus handler");
 
         if !new_jwks.is_empty() {
-            debug!("adding AuthenticatorStateUpdate tx: {:?}", new_jwks);
             let authenticator_state_update_transaction =
                 self.authenticator_state_update_transaction(round, new_jwks);
+            debug!(
+                "adding AuthenticatorStateUpdate({:?}) tx: {:?}",
+                authenticator_state_update_transaction.digest(),
+                authenticator_state_update_transaction,
+            );
 
             transactions.push((
                 empty_bytes.as_slice(),

diff --git a/crates/sui-e2e-tests/tests/zklogin_tests.rs b/crates/sui-e2e-tests/tests/zklogin_tests.rs
@@ -85,13 +85,13 @@ async fn test_legacy_zklogin_address_accept() {
 #[sim_test]
 async fn zklogin_end_to_end_test() {
     let test_cluster = TestClusterBuilder::new()
-        .with_epoch_duration_ms(10000)
+        .with_epoch_duration_ms(15000)
         .with_default_jwks()
         .build()
         .await;
 
     // trigger reconfiguration that advanced epoch to 1.
-    test_cluster.trigger_reconfiguration().await;
+    test_cluster.wait_for_epoch_all_nodes(1).await;
 
     // load test vectors
     let (kp, pk_zklogin, inputs) =
@@ -188,7 +188,7 @@ async fn test_auth_state_creation() {
     // Create test cluster without auth state object in genesis
     let test_cluster = TestClusterBuilder::new()
         .with_protocol_version(23.into())
-        .with_epoch_duration_ms(10000)
+        .with_epoch_duration_ms(15000)
         .with_default_jwks()
         .build()
         .await;
@@ -253,7 +253,7 @@ async fn test_conflicting_jwks() {
     use tokio::time::Duration;
 
     let test_cluster = TestClusterBuilder::new()
-        .with_epoch_duration_ms(45000)
+        .with_epoch_duration_ms(30000)
         .with_jwk_fetch_interval(Duration::from_secs(5))
         .build()
         .await;