test: content-based retries for indexer merkle-data lag (reinit close, zk-id credential proof)

Author: ananas-block

basic-operations/anchor/reinit/programs/reinit/tests/test.rs

@@ -136,12 +136,31 @@ async fn test_reinit() {
     // Wait for the indexer to index the close before reading it back.
     wait_for_indexer_catchup(&rpc).await;
 
-    let closed = rpc
+    // The close zeroes the account, but the indexer's merkle-tree data can lag
+    // the slot marker, so retry until the zeroed (closed) state is reflected.
+    let mut closed = rpc
         .get_compressed_account(address, None)
         .await
         .unwrap()
         .value
         .unwrap();
+    for _ in 0..30 {
+        if closed
+            .data
+            .as_ref()
+            .map(|d| d.discriminator == [0u8; 8])
+            .unwrap_or(false)
+        {
+            break;
+        }
+        tokio::time::sleep(Duration::from_millis(500)).await;
+        closed = rpc
+            .get_compressed_account(address, None)
+            .await
+            .unwrap()
+            .value
+            .unwrap();
+    }
     assert_eq!(closed.address.as_ref().unwrap(), &address);
     assert_eq!(closed.owner, reinit::ID);
 

zk/zk-id/tests/test.rs

@@ -235,6 +235,21 @@ async fn test_create_issuer_and_add_credential() {
         .value
         .expect("Credential account not found");
     println!("credential_account {:?}", credential_account);
+
+    // The credential account is indexed before its merkle-tree leaf/proof is,
+    // so wait until the proof is available before verifying (avoids
+    // "Leaf nodes not found for hashes").
+    for _ in 0..30 {
+        if rpc
+            .get_multiple_compressed_account_proofs(vec![credential_account.hash], None)
+            .await
+            .is_ok()
+        {
+            break;
+        }
+        tokio::time::sleep(Duration::from_millis(500)).await;
+    }
+
     verify_credential(
         &mut rpc,
         &payer,