Simultaenously build Docker images used in tests

tests/coordinator/src/lib.rs

@@ -37,14 +37,18 @@ mod tests;
 
 static UNIQUE_ID: OnceLock<Mutex<u16>> = OnceLock::new();
 
-pub fn coordinator_instance(
+pub fn coordinator_docker_name() -> String {
+  "serai-dev-coordinator".to_string()
+}
+
+pub async fn coordinator_instance(
   name: &str,
   message_queue_key: <Ristretto as Ciphersuite>::F,
 ) -> TestBodySpecification {
-  serai_docker_tests::build("coordinator".to_string());
+  serai_docker_tests::build("coordinator".to_string()).await;
 
   TestBodySpecification::with_image(
-    Image::with_repository("serai-dev-coordinator").pull_policy(PullPolicy::Never),
+    Image::with_repository(coordinator_docker_name()).pull_policy(PullPolicy::Never),
   )
   .replace_env(
     [
@@ -63,11 +67,15 @@ pub fn coordinator_instance(
   )
 }
 
-pub fn serai_composition(name: &str) -> TestBodySpecification {
-  serai_docker_tests::build("serai".to_string());
+pub fn serai_docker_name() -> String {
+  "serai-dev-serai".to_string()
+}
+
+pub async fn serai_composition(name: &str) -> TestBodySpecification {
+  serai_docker_tests::build("serai".to_string()).await;
 
   TestBodySpecification::with_image(
-    Image::with_repository("serai-dev-serai").pull_policy(PullPolicy::Never),
+    Image::with_repository(serai_docker_name()).pull_policy(PullPolicy::Never),
   )
   .replace_cmd(vec![
     "serai-node".to_string(),
@@ -82,15 +90,22 @@ pub fn serai_composition(name: &str) -> TestBodySpecification {
 }
 
 pub type Handles = (String, String, String);
-pub fn coordinator_stack(
+pub async fn coordinator_stack(
   name: &str,
 ) -> (Handles, <Ristretto as Ciphersuite>::F, Vec<TestBodySpecification>) {
-  let serai_composition = serai_composition(name);
+  serai_docker_tests::build_batch(vec![
+    serai_docker_name(),
+    serai_message_queue_tests::docker_name(),
+    coordinator_docker_name(),
+  ])
+  .await;
+
+  let serai_composition = serai_composition(name).await;
 
   let (coord_key, message_queue_keys, message_queue_composition) =
-    serai_message_queue_tests::instance();
+    serai_message_queue_tests::instance().await;
 
-  let coordinator_composition = coordinator_instance(name, coord_key);
+  let coordinator_composition = coordinator_instance(name, coord_key).await;
 
   // Give every item in this stack a unique ID
   // Uses a Mutex as we can't generate a 8-byte random ID without hitting hostname length limits

tests/coordinator/src/tests/batch.rs

@@ -253,7 +253,7 @@ pub async fn batch(
 #[tokio::test]
 async fn batch_test() {
   let _one_at_a_time = ONE_AT_A_TIME.get_or_init(|| Mutex::new(())).lock();
-  let (processors, test) = new_test();
+  let (processors, test) = new_test().await;
 
   test
     .run_async(|ops| async move {

tests/coordinator/src/tests/key_gen.rs

@@ -222,7 +222,7 @@ pub async fn key_gen<C: Ciphersuite>(
 #[tokio::test]
 async fn key_gen_test() {
   let _one_at_a_time = ONE_AT_A_TIME.get_or_init(|| Mutex::new(())).lock();
-  let (processors, test) = new_test();
+  let (processors, test) = new_test().await;
 
   test
     .run_async(|ops| async move {

tests/coordinator/src/tests/mod.rs

@@ -21,7 +21,7 @@ pub(crate) const THRESHOLD: usize = ((COORDINATORS * 2) / 3) + 1;
 
 pub(crate) static ONE_AT_A_TIME: OnceLock<Mutex<()>> = OnceLock::new();
 
-pub(crate) fn new_test() -> (Vec<(Handles, <Ristretto as Ciphersuite>::F)>, DockerTest) {
+pub(crate) async fn new_test() -> (Vec<(Handles, <Ristretto as Ciphersuite>::F)>, DockerTest) {
   let mut coordinators = vec![];
   let mut test = DockerTest::new().with_network(dockertest::Network::Isolated);
   for i in 0 .. COORDINATORS {
@@ -33,7 +33,8 @@ pub(crate) fn new_test() -> (Vec<(Handles, <Ristretto as Ciphersuite>::F)>, Dock
       4 => "Eve",
       5 => "Ferdie",
       _ => panic!("needed a 7th name for a serai node"),
-    });
+    })
+    .await;
     coordinators.push((handles, coord_key));
     for composition in compositions {
       test.provide_container(composition);

tests/coordinator/src/tests/sign.rs

@@ -170,7 +170,7 @@ pub async fn sign(
 #[tokio::test]
 async fn sign_test() {
   let _one_at_a_time = ONE_AT_A_TIME.get_or_init(|| Mutex::new(())).lock();
-  let (processors, test) = new_test();
+  let (processors, test) = new_test().await;
 
   test
     .run_async(|ops| async move {