Moving ClientPool to grpc/client

Author: someone235

Cargo.lock

@@ -77,7 +77,7 @@ include = [
 mimalloc = { version = "0.1.39", default-features = false, features = [
     'override',
 ] }
-kaspa-testing-integration = { version = "0.13.1", path = "testing/integration" }
+# kaspa-testing-integration = { version = "0.13.1", path = "testing/integration" }
 kaspa-addresses = { version = "0.13.1", path = "crypto/addresses" }
 kaspa-addressmanager = { version = "0.13.1", path = "components/addressmanager" }
 kaspa-bip32 = { version = "0.13.1", path = "wallet/bip32" }

Cargo.toml

@@ -145,16 +145,7 @@ impl Transaction {
         gas: u64,
         payload: Vec<u8>,
     ) -> Self {
-        let mut tx = Self {
-            version,
-            inputs,
-            outputs,
-            lock_time,
-            subnetwork_id,
-            gas,
-            payload,
-            id: Default::default(), // Temp init before the finalize below
-        };
+        let mut tx = Self::new_non_finalized(version, inputs, outputs, lock_time, subnetwork_id, gas, payload);
         tx.finalize();
         tx
     }

consensus/core/src/tx.rs

@@ -15,7 +15,6 @@ kaspa-rpc-core.workspace = true
 kaspa-addresses.workspace = true
 kaspa-txscript.workspace = true
 kaspa-utils.workspace = true
-kaspa-testing-integration.workspace = true
 async-channel.workspace = true
 parking_lot.workspace = true
 
@@ -32,4 +31,4 @@ criterion.workspace = true
 
 [[bench]]
 name = "bench"
-harness = false
+harness = false

rothschild/Cargo.toml

@@ -11,9 +11,8 @@ use kaspa_consensus_core::{
     tx::{MutableTransaction, Transaction, TransactionInput, TransactionOutpoint, TransactionOutput, UtxoEntry},
 };
 use kaspa_core::{info, kaspad_env::version, time::unix_now, warn};
-use kaspa_grpc_client::GrpcClient;
+use kaspa_grpc_client::{ClientPool, GrpcClient};
 use kaspa_rpc_core::{api::rpc::RpcApi, notify::mode::NotificationMode};
-use kaspa_testing_integration::common::client_pool::ClientPool;
 use kaspa_txscript::pay_to_address_script;
 use parking_lot::Mutex;
 use rayon::prelude::*;

rothschild/src/main.rs

@@ -27,7 +27,13 @@ prost.workspace = true
 rand.workspace = true
 regex.workspace = true
 thiserror.workspace = true
-tokio = { workspace = true, features = ["rt-multi-thread", "macros", "sync", "time"] }
+tokio = { workspace = true, features = [
+    "rt-multi-thread",
+    "macros",
+    "sync",
+    "time",
+] }
 tokio-stream.workspace = true
 tonic = { workspace = true, features = ["gzip"] }
 triggered.workspace = true
+futures-util.workspace = true

rpc/grpc/client/Cargo.toml

@@ -1,7 +1,7 @@
+use super::GrpcClient;
 use async_channel::{SendError, Sender};
 use futures_util::Future;
 use kaspa_core::trace;
-use kaspa_grpc_client::GrpcClient;
 use kaspa_utils::{any::type_name_short, channel::Channel};
 use std::sync::Arc;
 use tokio::task::JoinHandle;

testing/integration/src/common/client_pool.rs renamed to rpc/grpc/client/src/client_pool.rs

@@ -4,6 +4,7 @@ use self::{
 };
 use async_channel::{Receiver, Sender};
 use async_trait::async_trait;
+pub use client_pool::ClientPool;
 use connection_event::ConnectionEvent;
 use futures::{future::FutureExt, pin_mut, select};
 use kaspa_core::{debug, trace};
@@ -55,6 +56,8 @@ mod resolver;
 #[macro_use]
 mod route;
 
+mod client_pool;
+
 pub type GrpcClientCollector = CollectorFrom<RpcCoreConverter>;
 pub type GrpcClientNotify = DynNotify<Notification>;
 pub type GrpcClientNotifier = Notifier<Notification, ChannelConnection>;

rpc/grpc/client/src/lib.rs

@@ -8,7 +8,7 @@ use kaspad_lib::{args::Args, daemon::create_core_with_runtime};
 use std::{sync::Arc, time::Duration};
 use tempfile::TempDir;
 
-use super::client_pool::ClientPool;
+use kaspa_grpc_client::ClientPool;
 
 pub struct Daemon {
     // Type and suffix of the daemon network

testing/integration/src/common/daemon.rs

@@ -5,7 +5,6 @@ use std::{
 };
 
 pub mod client_notify;
-pub mod client_pool;
 pub mod daemon;
 pub mod utils;