Upgrade testcontainers from 0.12 to 0.14

monero-harness/Cargo.toml

@@ -11,7 +11,7 @@ futures = "0.3"
 monero-rpc = { path = "../monero-rpc" }
 rand = "0.7"
 spectral = "0.6"
-testcontainers = "0.12"
+testcontainers = "0.14"
 tokio = { version = "1", default-features = false, features = [ "rt-multi-thread", "time", "macros" ] }
 tracing = "0.1"
 tracing-subscriber = { version = "0.2", default-features = false, features = [ "fmt", "ansi", "env-filter", "tracing-log" ] }

monero-harness/src/image.rs

@@ -1,6 +1,4 @@
-use std::collections::HashMap;
-use testcontainers::core::{Container, Docker, WaitForMessage};
-use testcontainers::Image;
+use testcontainers::{core::WaitFor, Image, ImageArgs};
 
 pub const MONEROD_DAEMON_CONTAINER_NAME: &str = "monerod";
 pub const MONEROD_DEFAULT_NETWORK: &str = "monero_network";
@@ -13,43 +11,22 @@ pub const MONEROD_DEFAULT_NETWORK: &str = "monero_network";
 /// this doesn't matter.
 pub const RPC_PORT: u16 = 18081;
 
-#[derive(Debug, Default)]
-pub struct Monerod {
-    args: MonerodArgs,
-}
+#[derive(Clone, Copy, Debug, Default)]
+pub struct Monerod;
 
 impl Image for Monerod {
     type Args = MonerodArgs;
-    type EnvVars = HashMap<String, String>;
-    type Volumes = HashMap<String, String>;
-    type EntryPoint = str;
-
-    fn descriptor(&self) -> String {
-        "rinocommunity/monero:v0.18.1.2".to_owned()
-    }
-
-    fn wait_until_ready<D: Docker>(&self, container: &Container<'_, D, Self>) {
-        container
-            .logs()
-            .stdout
-            .wait_for_message("RPC server started ok")
-            .unwrap();
-    }
-
-    fn args(&self) -> <Self as Image>::Args {
-        self.args.clone()
-    }
 
-    fn volumes(&self) -> Self::Volumes {
-        HashMap::new()
+    fn name(&self) -> String {
+        "rinocommunity/monero".into()
     }
 
-    fn env_vars(&self) -> Self::EnvVars {
-        HashMap::new()
+    fn tag(&self) -> String {
+        "v0.18.1.2".into()
     }
 
-    fn with_args(self, args: <Self as Image>::Args) -> Self {
-        Self { args }
+    fn ready_conditions(&self) -> Vec<WaitFor> {
+        vec![WaitFor::message_on_stdout("RPC server started ok")]
     }
 
     fn entrypoint(&self) -> Option<String> {
@@ -58,43 +35,22 @@ impl Image for Monerod {
     }
 }
 
-#[derive(Debug, Default)]
-pub struct MoneroWalletRpc {
-    args: MoneroWalletRpcArgs,
-}
+#[derive(Clone, Copy, Debug)]
+pub struct MoneroWalletRpc;
 
 impl Image for MoneroWalletRpc {
     type Args = MoneroWalletRpcArgs;
-    type EnvVars = HashMap<String, String>;
-    type Volumes = HashMap<String, String>;
-    type EntryPoint = str;
-
-    fn descriptor(&self) -> String {
-        "rinocommunity/monero:v0.18.1.2".to_owned()
-    }
-
-    fn wait_until_ready<D: Docker>(&self, container: &Container<'_, D, Self>) {
-        container
-            .logs()
-            .stdout
-            .wait_for_message("Run server thread name: RPC")
-            .unwrap();
-    }
-
-    fn args(&self) -> <Self as Image>::Args {
-        self.args.clone()
-    }
 
-    fn volumes(&self) -> Self::Volumes {
-        HashMap::new()
+    fn name(&self) -> String {
+        "rinocommunity/monero".into()
     }
 
-    fn env_vars(&self) -> Self::EnvVars {
-        HashMap::new()
+    fn tag(&self) -> String {
+        "v0.18.1.2".into()
     }
 
-    fn with_args(self, args: <Self as Image>::Args) -> Self {
-        Self { args }
+    fn ready_conditions(&self) -> Vec<WaitFor> {
+        vec![WaitFor::message_on_stdout("Run server thread name: RPC")]
     }
 
     fn entrypoint(&self) -> Option<String> {
@@ -104,10 +60,9 @@ impl Image for MoneroWalletRpc {
 }
 
 impl MoneroWalletRpc {
-    pub fn new(name: &str, daemon_address: String) -> Self {
-        Self {
-            args: MoneroWalletRpcArgs::new(name, daemon_address),
-        }
+    pub fn new(name: &str, daemon_address: String) -> (Self, MoneroWalletRpcArgs) {
+        let args = MoneroWalletRpcArgs::new(name, daemon_address);
+        (Self, args)
     }
 }
 
@@ -191,6 +146,12 @@ impl IntoIterator for MonerodArgs {
     }
 }
 
+impl ImageArgs for MonerodArgs {
+    fn into_iterator(self) -> Box<dyn Iterator<Item = String>> {
+        Box::new(self.into_iter())
+    }
+}
+
 #[derive(Debug, Clone)]
 pub struct MoneroWalletRpcArgs {
     pub disable_rpc_login: bool,
@@ -200,12 +161,6 @@ pub struct MoneroWalletRpcArgs {
     pub daemon_address: String,
 }
 
-impl Default for MoneroWalletRpcArgs {
-    fn default() -> Self {
-        unimplemented!("A default instance for `MoneroWalletRpc` doesn't make sense because we always need to connect to a node.")
-    }
-}
-
 impl MoneroWalletRpcArgs {
     pub fn new(wallet_name: &str, daemon_address: String) -> Self {
         Self {
@@ -247,3 +202,9 @@ impl IntoIterator for MoneroWalletRpcArgs {
         args.into_iter()
     }
 }
+
+impl ImageArgs for MoneroWalletRpcArgs {
+    fn into_iterator(self) -> Box<dyn Iterator<Item = String>> {
+        Box::new(self.into_iter())
+    }
+}

monero-harness/src/lib.rs

@@ -20,17 +20,20 @@
 //! every BLOCK_TIME_SECS seconds.
 //!
 //! Also provides standalone JSON RPC clients for monerod and monero-wallet-rpc.
-pub mod image;
+use std::time::Duration;
 
-use crate::image::{MONEROD_DAEMON_CONTAINER_NAME, MONEROD_DEFAULT_NETWORK, RPC_PORT};
 use anyhow::{anyhow, bail, Context, Result};
+use testcontainers::clients::Cli;
+use testcontainers::{Container, RunnableImage};
+use tokio::time;
+
 use monero_rpc::monerod;
 use monero_rpc::monerod::MonerodRpc as _;
 use monero_rpc::wallet::{self, GetAddress, MoneroWalletRpc as _, Refreshed, Transfer};
-use std::time::Duration;
-use testcontainers::clients::Cli;
-use testcontainers::{Container, Docker, RunArgs};
-use tokio::time;
+
+use crate::image::{MONEROD_DAEMON_CONTAINER_NAME, MONEROD_DEFAULT_NETWORK, RPC_PORT};
+
+pub mod image;
 
 /// How often we mine a block.
 const BLOCK_TIME_SECS: u64 = 1;
@@ -56,8 +59,8 @@ impl<'c> Monero {
         additional_wallets: Vec<&'static str>,
     ) -> Result<(
         Self,
-        Container<'c, Cli, image::Monerod>,
-        Vec<Container<'c, Cli, image::MoneroWalletRpc>>,
+        Container<'c, image::Monerod>,
+        Vec<Container<'c, image::MoneroWalletRpc>>,
     )> {
         let prefix = format!("{}_", random_prefix());
         let monerod_name = format!("{}{}", prefix, MONEROD_DAEMON_CONTAINER_NAME);
@@ -221,15 +224,14 @@ impl<'c> Monerod {
         cli: &'c Cli,
         name: String,
         network: String,
-    ) -> Result<(Self, Container<'c, Cli, image::Monerod>)> {
+    ) -> Result<(Self, Container<'c, image::Monerod>)> {
         let image = image::Monerod::default();
-        let run_args = RunArgs::default()
-            .with_name(name.clone())
+        let image: RunnableImage<image::Monerod> = RunnableImage::from(image)
+            .with_container_name(name.clone())
             .with_network(network.clone());
-        let container = cli.run_with_args(image, run_args);
-        let monerod_rpc_port = container
-            .get_host_port(RPC_PORT)
-            .context("port not exposed")?;
+
+        let container = cli.run(image);
+        let monerod_rpc_port = container.get_host_port_ipv4(RPC_PORT);
 
         Ok((
             Self {
@@ -262,19 +264,15 @@ impl<'c> MoneroWalletRpc {
         name: &str,
         monerod: &Monerod,
         prefix: String,
-    ) -> Result<(Self, Container<'c, Cli, image::MoneroWalletRpc>)> {
+    ) -> Result<(Self, Container<'c, image::MoneroWalletRpc>)> {
         let daemon_address = format!("{}:{}", monerod.name, RPC_PORT);
-        let image = image::MoneroWalletRpc::new(name, daemon_address);
+        let (image, args) = image::MoneroWalletRpc::new(name, daemon_address);
+        let image = RunnableImage::from((image, args))
+            .with_container_name(format!("{}{}", prefix, name))
+            .with_network(monerod.network.clone());
 
-        let network = monerod.network.clone();
-        let run_args = RunArgs::default()
-            // prefix the container name so we can run multiple tests
-            .with_name(format!("{}{}", prefix, name))
-            .with_network(network.clone());
-        let container = cli.run_with_args(image, run_args);
-        let wallet_rpc_port = container
-            .get_host_port(RPC_PORT)
-            .context("port not exposed")?;
+        let container = cli.run(image);
+        let wallet_rpc_port = container.get_host_port_ipv4(RPC_PORT);
 
         let client = wallet::Client::localhost(wallet_rpc_port)?;
 

monero-wallet/Cargo.toml

@@ -14,6 +14,6 @@ rand = "0.7"
 curve25519-dalek = "3"
 monero-harness = { path = "../monero-harness" }
 rand = "0.7"
-testcontainers = "0.12"
+testcontainers = "0.14"
 tokio = { version = "1", features = [ "rt-multi-thread", "time", "macros", "sync", "process", "fs" ] }
 tracing-subscriber = { version = "0.2", default-features = false, features = [ "fmt", "ansi", "env-filter", "chrono", "tracing-log" ] }

monero-wallet/src/lib.rs

@@ -61,13 +61,12 @@ mod tests {
     use monero_harness::image::Monerod;
     use monero_rpc::monerod::{Client, GetOutputsOut};
     use testcontainers::clients::Cli;
-    use testcontainers::Docker;
 
     #[tokio::test]
     async fn get_outs_for_key_offsets() {
         let cli = Cli::default();
         let container = cli.run(Monerod::default());
-        let rpc_client = Client::localhost(container.get_host_port(18081).unwrap()).unwrap();
+        let rpc_client = Client::localhost(container.get_host_port_ipv4(18081)).unwrap();
         rpc_client.generateblocks(150, "498AVruCDWgP9Az9LjMm89VWjrBrSZ2W2K3HFBiyzzrRjUJWUcCVxvY1iitfuKoek2FdX6MKGAD9Qb1G1P8QgR5jPmmt3Vj".to_owned()).await.unwrap();
         let wallet = Wallet {
             client: rpc_client.clone(),

swap/Cargo.toml

@@ -85,7 +85,7 @@ serde_cbor = "0.11"
 serial_test = "3.0"
 spectral = "0.6"
 tempfile = "3"
-testcontainers = "0.12"
+testcontainers = "0.14"
 
 [build-dependencies]
 anyhow = "1"