refactor: store test utils under a new crate

Cargo.toml

@@ -16,6 +16,7 @@ members = [
     "sn_registers",
     "sn_service_management",
     "sn_transfers",
+    "test_utils",
     "token_supplies",
 ]
 

sn_client/Cargo.toml

@@ -14,7 +14,7 @@ version = "0.104.29-alpha.1"
 default=[]
 local-discovery=["sn_networking/local-discovery"]
 open-metrics = ["sn_networking/open-metrics", "prometheus-client"]
-test-utils=["sn_protocol/test-utils", "sn_peers_acquisition", "lazy_static", "eyre"]
+test-utils=["sn_peers_acquisition", "lazy_static", "eyre"]
 # required to pass on flag to node builds
 websockets = ["sn_networking/websockets", "sn_protocol/websockets"]
 

sn_node/Cargo.toml

@@ -74,10 +74,10 @@ color-eyre = "0.6.2"
 
 [dev-dependencies]
 assert_matches = "1.5.0"
-tempfile = "3.6.0"
 reqwest = { version="0.11.18", default-features=false, features = ["rustls"] }
-sn_protocol = { path = "../sn_protocol", version = "0.15.3", features = ["test-utils", "rpc"]}
 serde_json = "1.0"
+tempfile = "3.6.0"
+test_utils = { version = "0.1.0", path = "../test_utils"}
 
 [lints]
 workspace = true

sn_node/tests/common/client.rs

@@ -11,15 +11,13 @@ use lazy_static::lazy_static;
 use libp2p::PeerId;
 use sn_client::{send, Client};
 use sn_peers_acquisition::parse_peer_addr;
-use sn_protocol::{
-    safenode_proto::{NodeInfoRequest, RestartRequest},
-    test_utils::DeploymentInventory,
-};
+use sn_protocol::safenode_proto::{NodeInfoRequest, RestartRequest};
 use sn_service_management::{
     get_local_node_registry_path, safenode_manager_proto::NodeServiceRestartRequest, NodeRegistry,
 };
 use sn_transfers::{create_faucet_wallet, HotWallet, NanoTokens, Transfer};
 use std::{net::SocketAddr, path::Path};
+use test_utils::testnet::DeploymentInventory;
 use tokio::{
     sync::Mutex,
     time::{Duration, Instant},

sn_node/tests/common/mod.rs

@@ -23,7 +23,6 @@ use sn_client::{Client, FilesApi};
 use sn_protocol::{
     safenode_proto::{safe_node_client::SafeNodeClient, NodeInfoRequest},
     storage::ChunkAddress,
-    test_utils::DeploymentInventory,
 };
 use sn_service_management::{
     get_local_node_registry_path,
@@ -36,6 +35,7 @@ use std::{
     path::{Path, PathBuf},
     time::Duration,
 };
+use test_utils::testnet::DeploymentInventory;
 use tonic::Request;
 use tracing::{debug, error, warn};
 use xor_name::XorName;

sn_node_manager/Cargo.toml

@@ -66,6 +66,7 @@ assert_cmd = "2.0.12"
 assert_fs = "1.0.13"
 assert_matches = "1.5.0"
 async-trait = "0.1"
+test_utils = { version = "0.1.0", path = "../test_utils"}
 mockall = "0.11.3"
 reqwest = { version = "0.11", default-features = false, features = [
     "json",

sn_node_manager/examples/churn.rs

@@ -12,7 +12,6 @@ use color_eyre::{
     Result,
 };
 use libp2p::PeerId;
-use sn_protocol::test_utils::DeploymentInventory;
 use sn_service_management::{
     safenode_manager_proto::{
         safe_node_manager_client::SafeNodeManagerClient, GetStatusRequest,
@@ -21,6 +20,7 @@ use sn_service_management::{
     ServiceStatus,
 };
 use std::{collections::BTreeSet, net::SocketAddr, time::Duration};
+use test_utils::testnet::DeploymentInventory;
 use tonic::{transport::Channel, Request};
 
 #[derive(Parser, Debug)]
@@ -44,6 +44,7 @@ struct Opt {
     churn_cycles: usize,
 }
 
+// Run using `cargo run --release --example churn -- --inventory <inventory name/path> --churn-cycles 2`
 #[tokio::main]
 async fn main() -> Result<()> {
     let opt = Opt::parse();

sn_protocol/Cargo.toml

@@ -11,7 +11,6 @@ version = "0.15.3"
 
 [features]
 default = []
-test-utils=[]
 websockets=[]
 rpc=["tonic", "prost"]
 

sn_protocol/src/lib.rs

@@ -19,9 +19,6 @@ pub mod node;
 pub mod node_rpc;
 /// Storage types for spends, chunks and registers.
 pub mod storage;
-#[cfg(feature = "test-utils")]
-/// Test utilities used among crates
-pub mod test_utils;
 
 // this includes code generated from .proto files
 #[allow(clippy::unwrap_used)]

test_utils/Cargo.toml

@@ -0,0 +1,17 @@
+[package]
+authors = ["MaidSafe Developers <[email protected]>"]
+description = "Safe Network Test Utilities"
+edition = "2021"
+homepage = "https://maidsafe.net"
+license = "GPL-3.0"
+name = "test_utils"
+readme = "README.md"
+repository = "https://github.com/maidsafe/safe_network"
+version = "0.1.0"
+
+[dependencies]
+color-eyre = "~0.6.2"
+dirs-next = "~2.0.0"
+libp2p = { version="0.53", features = ["identify", "kad"] }
+serde = { version = "1.0.133", features = [ "derive"]}
+serde_json = "1.0"

test_utils/README.md

@@ -0,0 +1,2 @@
+# Test utilities
+A place to store test utilities that are shared among crates.

test_utils/src/lib.rs

@@ -0,0 +1,9 @@
+// Copyright 2024 MaidSafe.net limited.
+//
+// This SAFE Network Software is licensed to you under The General Public License (GPL), version 3.
+// Unless required by applicable law or agreed to in writing, the SAFE Network Software distributed
+// under the GPL Licence is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. Please review the Licences for the specific language governing
+// permissions and limitations relating to use of the SAFE Network Software.
+
+pub mod testnet;

token_supplies/src/main.rs

@@ -1,3 +1,11 @@
+// Copyright 2024 MaidSafe.net limited.
+//
+// This SAFE Network Software is licensed to you under The General Public License (GPL), version 3.
+// Unless required by applicable law or agreed to in writing, the SAFE Network Software distributed
+// under the GPL Licence is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. Please review the Licences for the specific language governing
+// permissions and limitations relating to use of the SAFE Network Software.
+
 use serde::{Deserialize, Serialize};
 use std::fs::{self, File};
 use std::io::{self, Read};