From 332fa729cb88c79e7dc29df5f3e00d5ccac71a07 Mon Sep 17 00:00:00 2001
From: Alexandru Vasile <alexandru.vasile@parity.io>
Date: Fri, 1 Mar 2024 13:39:53 +0200
Subject: [PATCH] testing: Retry constructing lightclient on read-proof errors

Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io>
---
 .../integration-tests/src/utils/node_proc.rs  | 24 ++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/testing/integration-tests/src/utils/node_proc.rs b/testing/integration-tests/src/utils/node_proc.rs
index 0531b89102..ae64ba8ce0 100644
--- a/testing/integration-tests/src/utils/node_proc.rs
+++ b/testing/integration-tests/src/utils/node_proc.rs
@@ -244,7 +244,7 @@ async fn build_light_client<T: Config>(proc: &SubstrateNode) -> Result<LightClie
     // Wait for at least 3 blocks before starting the light client.
     // Otherwise, the lightclient might error with
     // `"Error when retrieving the call proof: No node available for call proof query"`.
-    super::wait_for_number_of_blocks(&client, 3).await;
+    super::wait_for_number_of_blocks(&client, 4).await;
 
     // Step 2. Construct the light client.
     // P2p bootnode.
@@ -254,9 +254,27 @@ async fn build_light_client<T: Config>(proc: &SubstrateNode) -> Result<LightClie
         proc.p2p_address()
     );
 
-    LightClientBuilder::new()
+    let mut result = LightClientBuilder::new()
         .bootnodes([bootnode.as_str()])
         .build_from_url(ws_url.as_str())
         .await
-        .map_err(|e| format!("Failed to construct light client {}", e))
+        .map_err(|e| format!("Failed to construct light client {}", e));
+
+    for _ in 0..3 {
+        if let Err(e) = &result {
+            if e.contains("Error when retrieving the call proof") {
+                tokio::time::sleep(std::time::Duration::from_secs(5)).await;
+
+                result = LightClientBuilder::new()
+                    .bootnodes([bootnode.as_str()])
+                    .build_from_url(ws_url.as_str())
+                    .await
+                    .map_err(|e| format!("Failed to construct light client {}", e));
+            }
+        } else {
+            break;
+        }
+    }
+
+    result
 }