transfer tests to root in order for them to run

autonomys · Jan 23, 2024 · a4f120c · a4f120c
1 parent 8a02ee4
commit a4f120c
Show file tree

Hide file tree

Showing 13 changed files with 31 additions and 7 deletions.
diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml
@@ -174,11 +174,11 @@ jobs:
         run: cargo cache
 
       - name: Build and run tests (linux & windows)
-        run: cd sdk && cargo test --locked --release -- --test-threads=1 --nocapture && cd .. && cargo test --locked --release -- --test-threads=1 --nocapture
+        run: cargo test --locked --release -- --test-threads=1 --nocapture
         if: runner.os != 'macOS'
 
       - name: Build and run tests (macOS)
-        run: cd sdk && cargo test --locked --release --no-default-features -- --test-threads=1 --nocapture && cd .. && cargo test --locked --release --no-default-features -- --test-threads=1 --nocapture
+        run: cargo test --locked --release --no-default-features -- --test-threads=1 --nocapture
         if: runner.os == 'macOS'
 
       - name: Clean unused artifacts

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -43,6 +43,19 @@ zeroize = "1.6.0"
 
 [dev-dependencies]
 rand = "0.8.5"
+anyhow = "1"
+clap = { version = "4", features = ["derive"] }
+derive_builder = "0.12"
+derive_more = "0.99"
+fdlimit = "0.2"
+futures = "0.3"
+serde_json = "1"
+subspace-farmer-components = { git = "https://github.com/subspace/subspace", rev = "bd435100200b3dcce6d6f50534d52e3cd039ca8e" }
+tempfile = "3"
+tokio = { version = "1.34.0", features = ["rt-multi-thread", "macros"] }
+tracing = "0.1"
+tracing-futures = "0.2"
+tracing-subscriber = "0.3"
 
 [features]
 default = [

diff --git a/sdk/examples/complete.rs → examples/complete.rs b/sdk/examples/complete.rs → examples/complete.rs
diff --git a/sdk/examples/mini-farmer.rs → examples/mini-farmer.rs b/sdk/examples/mini-farmer.rs → examples/mini-farmer.rs
diff --git a/sdk/examples/simple.rs → examples/simple.rs b/sdk/examples/simple.rs → examples/simple.rs
diff --git a/sdk/examples/sync.rs → examples/sync.rs b/sdk/examples/sync.rs → examples/sync.rs
diff --git a/sdk/src/lib.rs b/sdk/src/lib.rs
@@ -45,3 +45,8 @@ pub mod node {
 
     pub use super::Node;
 }
+
+/// SDK utilities, mainly used by tests
+pub mod utils {
+    pub use sdk_utils::*;
+}
diff --git a/sdk/tests/integration/common.rs → tests/integration/common.rs b/sdk/tests/integration/common.rs → tests/integration/common.rs
@@ -4,10 +4,11 @@ use std::sync::Arc;
 
 use derive_builder::Builder;
 use derive_more::{Deref, DerefMut};
-use sdk_node::DomainConfigBuilder;
-use sdk_utils::ByteSize;
 use subspace_sdk::farmer::FarmDescription;
-use subspace_sdk::node::{chain_spec, ChainSpec, DsnBuilder, NetworkBuilder, Role};
+use subspace_sdk::node::{
+    chain_spec, ChainSpec, DomainConfigBuilder, DsnBuilder, NetworkBuilder, Role,
+};
+use subspace_sdk::utils::ByteSize;
 use subspace_sdk::MultiaddrWithPeerId;
 use tempfile::TempDir;
 use tracing_subscriber::layer::SubscriberExt;

diff --git a/sdk/tests/integration/domains.rs → tests/integration/domains.rs b/sdk/tests/integration/domains.rs → tests/integration/domains.rs
diff --git a/sdk/tests/integration/farmer.rs → tests/integration/farmer.rs b/sdk/tests/integration/farmer.rs → tests/integration/farmer.rs
@@ -1,5 +1,5 @@
 use futures::prelude::*;
-use sdk_utils::ByteSize;
+use subspace_sdk::utils::ByteSize;
 
 use crate::common::{Farmer, Node};
 

diff --git a/sdk/tests/integration/main.rs → tests/integration/main.rs b/sdk/tests/integration/main.rs → tests/integration/main.rs
diff --git a/sdk/tests/integration/node.rs → tests/integration/node.rs b/sdk/tests/integration/node.rs → tests/integration/node.rs
@@ -1,7 +1,7 @@
 use std::sync::Arc;
 
 use futures::prelude::*;
-use sdk_utils::ByteSize;
+use subspace_sdk::utils::ByteSize;
 use tempfile::TempDir;
 use tracing_futures::Instrument;