src/tool/subcommands/api_cmd/stateful_tests.rs (2)

407-411: Avoid false positives: re-poll once if both lists are empty before passing

Allowing both empty is reasonable post-GoldenWeek, but it weakens the assertion: the test can pass even if the filter never yields hashes after an apply. Do a single extra tipset wait and re-poll to reduce flakiness while still accommodating empty deltas.

Apply this diff:

                 if let EthFilterResult::Hashes(hashes) = filter_result {
                     verify_hashes(&hashes).await?;
-                    anyhow::ensure!(
-                        (prev_hashes.is_empty() && hashes.is_empty()) || prev_hashes != hashes,
-                    );
+                    if prev_hashes.is_empty() && hashes.is_empty() {
+                        // Second-chance: avoid passing on transient emptiness (ref. #6069)
+                        next_tipset(client).await?;
+                        let filter_result2 = client
+                            .call(EthGetFilterChanges::request((filter_id.clone(),))?)
+                            .await?;
+                        if let EthFilterResult::Hashes(hashes2) = filter_result2 {
+                            verify_hashes(&hashes2).await?;
+                            anyhow::ensure!(
+                                !(prev_hashes.is_empty() && hashes2.is_empty()),
+                                "eth_newBlockFilter produced no hashes after two consecutive tipsets"
+                            );
+                        } else {
+                            anyhow::bail!("expecting blocks");
+                        }
+                    } else {
+                        anyhow::ensure!(prev_hashes != hashes);
+                    }

---

637-641: Good to un-ignore; optionally include EthGetBlockByHash in used_methods for accurate filtering

This test uses EthGetBlockByHash in verify_hashes; adding it improves method-based filtering/discovery.

         with_methods!(
-            eth_new_block_filter().name("eth_newBlockFilter works"),
+            eth_new_block_filter().name("eth_newBlockFilter works"),
             EthNewBlockFilter,
             EthGetFilterChanges,
-            EthUninstallFilter
+            EthUninstallFilter,
+            EthGetBlockByHash
         ),

Configuration used: CodeRabbit UI

Review profile: CHILL

Plan: Pro