From 03da9046c90e9c4cd0ffe30ade7e6f71dff93c7a Mon Sep 17 00:00:00 2001
From: Alexandru Vasile <alexandru.vasile@parity.io>
Date: Tue, 26 Mar 2024 18:18:55 +0200
Subject: [PATCH] testing: Adjust for the new interface

Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io>
---
 testing/integration-tests/src/full_client/blocks/mod.rs      | 3 ---
 testing/integration-tests/src/full_client/client/mod.rs      | 3 ---
 .../src/full_client/client/unstable_rpcs.rs                  | 3 ---
 testing/integration-tests/src/full_client/frame/balances.rs  | 3 ---
 .../integration-tests/src/full_client/metadata/validation.rs | 3 ---
 testing/integration-tests/src/utils/node_proc.rs             | 5 ++---
 6 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/testing/integration-tests/src/full_client/blocks/mod.rs b/testing/integration-tests/src/full_client/blocks/mod.rs
index d0ef601a38..0adb87395c 100644
--- a/testing/integration-tests/src/full_client/blocks/mod.rs
+++ b/testing/integration-tests/src/full_client/blocks/mod.rs
@@ -6,9 +6,6 @@ use crate::{subxt_test, test_context};
 use codec::{Compact, Encode};
 use futures::StreamExt;
 
-#[cfg(lightclient)]
-use subxt::client::OnlineClientT;
-
 #[cfg(fullclient)]
 use crate::utils::node_runtime;
 #[cfg(fullclient)]
diff --git a/testing/integration-tests/src/full_client/client/mod.rs b/testing/integration-tests/src/full_client/client/mod.rs
index 246191a280..954546d028 100644
--- a/testing/integration-tests/src/full_client/client/mod.rs
+++ b/testing/integration-tests/src/full_client/client/mod.rs
@@ -11,9 +11,6 @@ use codec::{Decode, Encode};
 #[cfg(fullclient)]
 use futures::StreamExt;
 
-#[cfg(lightclient)]
-use subxt::client::OnlineClientT;
-
 use subxt::{
     backend::BackendExt,
     error::{DispatchError, Error},
diff --git a/testing/integration-tests/src/full_client/client/unstable_rpcs.rs b/testing/integration-tests/src/full_client/client/unstable_rpcs.rs
index f87aff9ff5..71cff65f0a 100644
--- a/testing/integration-tests/src/full_client/client/unstable_rpcs.rs
+++ b/testing/integration-tests/src/full_client/client/unstable_rpcs.rs
@@ -19,9 +19,6 @@ use subxt::{
     SubstrateConfig,
 };
 
-#[cfg(lightclient)]
-use subxt::client::OfflineClientT;
-
 use subxt_signer::sr25519::dev;
 
 #[subxt_test]
diff --git a/testing/integration-tests/src/full_client/frame/balances.rs b/testing/integration-tests/src/full_client/frame/balances.rs
index 52d9fab7b3..5ed4f6423e 100644
--- a/testing/integration-tests/src/full_client/frame/balances.rs
+++ b/testing/integration-tests/src/full_client/frame/balances.rs
@@ -13,9 +13,6 @@ use subxt::{
 };
 use subxt_signer::sr25519::dev;
 
-#[cfg(lightclient)]
-use subxt::client::OfflineClientT;
-
 #[subxt_test]
 async fn tx_basic_transfer() -> Result<(), subxt::Error> {
     let alice = dev::alice();
diff --git a/testing/integration-tests/src/full_client/metadata/validation.rs b/testing/integration-tests/src/full_client/metadata/validation.rs
index 4b3e531efd..6fbda7bbe8 100644
--- a/testing/integration-tests/src/full_client/metadata/validation.rs
+++ b/testing/integration-tests/src/full_client/metadata/validation.rs
@@ -14,9 +14,6 @@ use scale_info::{
 };
 use subxt::{Metadata, OfflineClient, SubstrateConfig};
 
-#[cfg(lightclient)]
-use subxt::client::OfflineClientT;
-
 async fn metadata_to_api(metadata: Metadata, ctx: &TestContext) -> OfflineClient<SubstrateConfig> {
     OfflineClient::new(
         ctx.client().genesis_hash(),
diff --git a/testing/integration-tests/src/utils/node_proc.rs b/testing/integration-tests/src/utils/node_proc.rs
index 76588427c6..08b35e60fd 100644
--- a/testing/integration-tests/src/utils/node_proc.rs
+++ b/testing/integration-tests/src/utils/node_proc.rs
@@ -228,12 +228,11 @@ async fn build_light_client<T: Config>(proc: &SubstrateNode) -> Result<OnlineCli
         .await
         .map_err(|err| format!("Failed to connect to node rpc at {ws_url}: {err}"))?;
 
-        // Wait for at least 3 blocks before starting the light client.
+    // 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, 4).await;
 
-
     // Now, configure a light client; fetch the chain spec and modify the bootnodes.
     let bootnode = format!(
         "/ip4/127.0.0.1/tcp/{}/p2p/{}",
@@ -254,5 +253,5 @@ async fn build_light_client<T: Config>(proc: &SubstrateNode) -> Result<OnlineCli
         .map_err(|e| format!("Light client: cannot add relay chain: {e}"))?;
 
     // Instantiate subxt client from this.
-    build_unstable_client(rpc)
+    build_unstable_client(rpc.into()).await
 }