Use Network::Isolated for all dockertest instances

serai-dex · Oct 23, 2023 · e5159c9 · e5159c9
1 parent fbca6e5
commit e5159c9
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/substrate/client/tests/common/mod.rs b/substrate/client/tests/common/mod.rs
@@ -36,8 +36,8 @@ macro_rules! serai_test {
           source: LogSource::Both,
         }));
 
-        let mut test = DockerTest::new();
-        test.provide_container(composition);
+        let mut test = DockerTest::new().with_network(dockertest::Network::Isolated);
+        test.add_composition(composition);
         test.run_async(|ops| async move {
           // Sleep until the Substrate RPC starts
           let serai_rpc = ops.handle(handle).host_port(9944).unwrap();

diff --git a/tests/coordinator/src/tests/mod.rs b/tests/coordinator/src/tests/mod.rs
@@ -22,7 +22,7 @@ pub(crate) static ONE_AT_A_TIME: OnceLock<Mutex<()>> = OnceLock::new();
 
 pub(crate) fn new_test() -> (Vec<(Handles, <Ristretto as Ciphersuite>::F)>, DockerTest) {
   let mut coordinators = vec![];
-  let mut test = DockerTest::new();
+  let mut test = DockerTest::new().with_network(dockertest::Network::Isolated);
   for i in 0 .. COORDINATORS {
     let (handles, coord_key, compositions) = coordinator_stack(match i {
       0 => "Alice",

diff --git a/tests/full-stack/src/tests/mod.rs b/tests/full-stack/src/tests/mod.rs
@@ -13,7 +13,7 @@ pub(crate) static ONE_AT_A_TIME: OnceLock<Mutex<()>> = OnceLock::new();
 
 pub(crate) fn new_test() -> (Vec<Handles>, DockerTest) {
   let mut validators = vec![];
-  let mut test = DockerTest::new();
+  let mut test = DockerTest::new().with_network(dockertest::Network::Isolated);
   for i in 0 .. VALIDATORS {
     let (handles, compositions) = full_stack(match i {
       0 => "Alice",

diff --git a/tests/message-queue/src/lib.rs b/tests/message-queue/src/lib.rs
@@ -66,7 +66,7 @@ fn basic_functionality() {
 
   use serai_message_queue::{Service, Metadata, client::MessageQueue};
 
-  let mut test = DockerTest::new();
+  let mut test = DockerTest::new().with_network(dockertest::Network::Isolated);
   let (coord_key, priv_keys, composition) = instance();
   test.provide_container(composition);
   test.run(|ops| async move {

diff --git a/tests/processor/src/tests/mod.rs b/tests/processor/src/tests/mod.rs
@@ -19,7 +19,7 @@ pub(crate) const THRESHOLD: usize = ((COORDINATORS * 2) / 3) + 1;
 
 fn new_test(network: NetworkId) -> (Vec<(Handles, <Ristretto as Ciphersuite>::F)>, DockerTest) {
   let mut coordinators = vec![];
-  let mut test = DockerTest::new();
+  let mut test = DockerTest::new().with_network(dockertest::Network::Isolated);
   for _ in 0 .. COORDINATORS {
     let (handles, coord_key, compositions) = processor_stack(network);
     coordinators.push((handles, coord_key));

diff --git a/tests/reproducible-runtime/src/lib.rs b/tests/reproducible-runtime/src/lib.rs
@@ -16,7 +16,7 @@ pub fn reproducibly_builds() {
     OsRng.fill_bytes(id);
   }
 
-  let mut test = DockerTest::new();
+  let mut test = DockerTest::new().with_network(dockertest::Network::Isolated);
   for id in &ids {
     test.provide_container(
       TestBodySpecification::with_image(