kairos: use cctl-rs

Cargo.toml

@@ -26,6 +26,7 @@ license = "MIT OR Apache-2.0"
 opt-level = 3
 
 [workspace.dependencies]
+cctl-rs = { git = "https://github.com/cspr-rad/cctl-rs" }
 casper-client = "2.0"
 casper-types = "4.0"
 casper-client-types = { package = "casper-types", version = "3.0" }

kairos-cli/Cargo.toml

@@ -26,6 +26,7 @@ tracing = "0.1"
 tracing-subscriber = { version = "0.3", features = ["std", "env-filter"] }
 casper-client.workspace = true
 casper-client-types = { workspace = true, features = ["std"] } # TODO: Change `std` -> `std-fs-io` in the future version.
+cctl-rs.workspace = true
 clap = { version = "4", features = ["derive", "deprecated"] }
 chrono = { version = "0.4", optional = true }
 hex = "0.4"

kairos-cli/src/commands/run_cctl.rs

@@ -1,7 +1,7 @@
 use std::path::PathBuf;
 
 use casper_client_types::{runtime_args, RuntimeArgs};
-use kairos_test_utils::cctl::{CCTLNetwork, DeployableContract};
+use cctl::{CCTLNetwork, DeployableContract};
 
 use crate::error::CliError;
 
@@ -19,7 +19,7 @@ pub fn run() -> Result<String, CliError> {
         let chainspec_path = PathBuf::from(std::env::var("CCTL_CHAINSPEC").unwrap());
         let config_path = PathBuf::from(std::env::var("CCTL_CONFIG").unwrap());
 
-        let network = CCTLNetwork::run(None, Some(contract_to_deploy), Some(chainspec_path.as_path()), Some(config_path.as_path()))
+        let network = CCTLNetwork::run(None, Some(contract_to_deploy), Some(chainspec_path), Some(config_path))
             .await
             .unwrap();
 

kairos-cli/tests/cli_tests.rs

@@ -5,12 +5,10 @@ use std::path::PathBuf;
 
 use casper_client::types::DeployHash;
 use casper_client_hashing::Digest;
+use cctl::{CCTLNetwork, DeployableContract};
+use kairos_test_utils::kairos::Kairos;
 #[cfg(feature = "database")]
 use kairos_test_utils::postgres::PostgresDB;
-use kairos_test_utils::{
-    cctl::{CCTLNetwork, DeployableContract},
-    kairos::Kairos,
-};
 
 // Helper function to get the path to a fixture file
 fn fixture_path(relative_path: &str) -> PathBuf {

kairos-server/Cargo.toml

@@ -56,3 +56,4 @@ proptest = "1"
 axum-test = "14"
 kairos-test-utils = { path = "../kairos-test-utils" }
 casper-client-types.workspace = true
+cctl-rs.workspace = true

kairos-server/tests/transactions.rs

@@ -15,14 +15,14 @@ use casper_client_types::{
     crypto::{PublicKey, SecretKey},
     AsymmetricType, ContractHash,
 };
+use cctl::CCTLNetwork;
 #[cfg(feature = "database")]
 use kairos_data::new as new_pool;
 use kairos_server::{
     config::{BatchConfig, ServerConfig},
     routes::deposit::DepositPath,
     state::{BatchStateManager, ServerStateInner},
 };
-use kairos_test_utils::cctl::CCTLNetwork;
 #[cfg(feature = "database")]
 use kairos_test_utils::postgres::PostgresDB;