Merge #1301: Update dependencies

6e74f5f chore(deps): bump derive_more from 1.0.0 to 2.0.1 (Jose Celano)
66c70d9 chore(deps): bump testcontainers from 0.17.0 to 0.23.3 (Jose Celano)
d4ec44e chore(deps): udpate dependencies (Jose Celano)

Pull request description:

  Update dependencies.

ACKs for top commit:
  josecelano:
    ACK 6e74f5f

Tree-SHA512: 7d796b840b3c1ebca6df3fb8733a596fe2c3e3a8e6e8bda1c8e056eee657e4caa00f2247f84f34f2bfcf16848b21051c85a45e0995fec0049722ee8f3732e1bc

Author: josecelano

Cargo.lock

@@ -47,7 +47,7 @@ chrono = { version = "0", default-features = false, features = ["clock"] }
 clap = { version = "4", features = ["derive", "env"] }
 crossbeam-skiplist = "0"
 dashmap = "6"
-derive_more = { version = "1", features = ["as_ref", "constructor", "from"] }
+derive_more = { version = "2", features = ["as_ref", "constructor", "from"] }
 figment = "0"
 futures = "0"
 futures-util = "0"

Cargo.toml

@@ -22,7 +22,7 @@ bittorrent-http-tracker-core = { version = "3.0.0-develop", path = "../http-trac
 bittorrent-http-tracker-protocol = { version = "3.0.0-develop", path = "../http-protocol" }
 bittorrent-primitives = "0.1.0"
 bittorrent-tracker-core = { version = "3.0.0-develop", path = "../tracker-core" }
-derive_more = { version = "1", features = ["as_ref", "constructor", "from"] }
+derive_more = { version = "2", features = ["as_ref", "constructor", "from"] }
 futures = "0"
 hyper = "1"
 reqwest = { version = "0", features = ["json"] }

packages/axum-http-tracker-server/Cargo.toml

@@ -16,7 +16,7 @@ version.workspace = true
 
 [dependencies]
 camino = { version = "1", features = ["serde", "serde1"] }
-derive_more = { version = "1", features = ["constructor", "display"] }
+derive_more = { version = "2", features = ["constructor", "display"] }
 figment = { version = "0", features = ["env", "test", "toml"] }
 serde = { version = "1", features = ["derive"] }
 serde_json = { version = "1", features = ["preserve_order"] }

packages/configuration/Cargo.toml

@@ -18,7 +18,7 @@ version.workspace = true
 aquatic_udp_protocol = "0"
 bittorrent-primitives = "0.1.0"
 bittorrent-tracker-core = { version = "3.0.0-develop", path = "../tracker-core" }
-derive_more = { version = "1", features = ["as_ref", "constructor", "from"] }
+derive_more = { version = "2", features = ["as_ref", "constructor", "from"] }
 multimap = "0"
 percent-encoding = "2"
 serde = { version = "1", features = ["derive"] }

packages/http-protocol/Cargo.toml

@@ -18,7 +18,7 @@ version.workspace = true
 aquatic_udp_protocol = "0"
 binascii = "0"
 bittorrent-primitives = "0.1.0"
-derive_more = { version = "1", features = ["constructor"] }
+derive_more = { version = "2", features = ["constructor"] }
 serde = { version = "1", features = ["derive"] }
 tdyne-peer-id = "1"
 tdyne-peer-id-registry = "0"

packages/primitives/Cargo.toml

@@ -14,7 +14,7 @@ rust-version.workspace = true
 version.workspace = true
 
 [dependencies]
-derive_more = { version = "1", features = ["as_ref", "constructor", "from"] }
+derive_more = { version = "2", features = ["as_ref", "constructor", "from"] }
 tokio = { version = "1", features = ["macros", "net", "rt-multi-thread", "signal", "sync"] }
 tower-http = { version = "0", features = ["compression-full", "cors", "propagate-header", "request-id", "trace"] }
 tracing = "0"

packages/server-lib/Cargo.toml

@@ -17,7 +17,7 @@ version.workspace = true
 [dependencies]
 aquatic_udp_protocol = "0"
 bittorrent-primitives = "0.1.0"
-derive_more = { version = "1", features = ["as_ref", "constructor", "from"] }
+derive_more = { version = "2", features = ["as_ref", "constructor", "from"] }
 hyper = "1"
 percent-encoding = "2"
 reqwest = { version = "0", features = ["json"] }

packages/tracker-client/Cargo.toml

@@ -1,14 +1,14 @@
 [package]
-description = "A library with the core functionality needed to implement a BitTorrent tracker."
-keywords = ["api", "bittorrent", "core", "library", "tracker"]
-name = "bittorrent-tracker-core"
-readme = "README.md"
 authors.workspace = true
+description = "A library with the core functionality needed to implement a BitTorrent tracker."
 documentation.workspace = true
 edition.workspace = true
 homepage.workspace = true
+keywords = ["api", "bittorrent", "core", "library", "tracker"]
 license.workspace = true
+name = "bittorrent-tracker-core"
 publish.workspace = true
+readme = "README.md"
 repository.workspace = true
 rust-version.workspace = true
 version.workspace = true
@@ -17,7 +17,7 @@ version.workspace = true
 aquatic_udp_protocol = "0"
 bittorrent-primitives = "0.1.0"
 chrono = { version = "0", default-features = false, features = ["clock"] }
-derive_more = { version = "1", features = ["as_ref", "constructor", "from"] }
+derive_more = { version = "2", features = ["as_ref", "constructor", "from"] }
 mockall = "0"
 r2d2 = "0"
 r2d2_mysql = "25"
@@ -26,13 +26,7 @@ rand = "0"
 serde = { version = "1", features = ["derive"] }
 serde_json = { version = "1", features = ["preserve_order"] }
 thiserror = "2"
-tokio = { version = "1", features = [
-    "macros",
-    "net",
-    "rt-multi-thread",
-    "signal",
-    "sync",
-] }
+tokio = { version = "1", features = ["macros", "net", "rt-multi-thread", "signal", "sync"] }
 torrust-tracker-clock = { version = "3.0.0-develop", path = "../clock" }
 torrust-tracker-configuration = { version = "3.0.0-develop", path = "../configuration" }
 torrust-tracker-located-error = { version = "3.0.0-develop", path = "../located-error" }
@@ -43,7 +37,7 @@ tracing = "0"
 [dev-dependencies]
 local-ip-address = "0"
 mockall = "0"
+testcontainers = "0"
 torrust-tracker-api-client = { version = "3.0.0-develop", path = "../tracker-api-client" }
 torrust-tracker-test-helpers = { version = "3.0.0-develop", path = "../test-helpers" }
-testcontainers = "0.17.0"
 url = "2.5.4"

packages/tracker-core/Cargo.toml

@@ -268,6 +268,7 @@ impl Database for Mysql {
 mod tests {
     use std::sync::Arc;
 
+    use testcontainers::core::IntoContainerPort;
     /*
     We run a MySQL container and run all the tests against the same container and database.
 
@@ -285,7 +286,7 @@ mod tests {
     If we increase the number of methods or the number or drivers.
     */
     use testcontainers::runners::AsyncRunner;
-    use testcontainers::{ContainerAsync, GenericImage};
+    use testcontainers::{ContainerAsync, GenericImage, ImageExt};
     use torrust_tracker_configuration::Core;
 
     use super::Mysql;
@@ -298,12 +299,12 @@ mod tests {
     impl StoppedMysqlContainer {
         async fn run(self, config: &MysqlConfiguration) -> Result<RunningMysqlContainer, Box<dyn std::error::Error + 'static>> {
             let container = GenericImage::new("mysql", "8.0")
+                .with_exposed_port(config.internal_port.tcp())
+                // todo: this does not work
+                //.with_wait_for(WaitFor::message_on_stdout("ready for connections"))
                 .with_env_var("MYSQL_ROOT_PASSWORD", config.db_root_password.clone())
                 .with_env_var("MYSQL_DATABASE", config.database.clone())
                 .with_env_var("MYSQL_ROOT_HOST", "%")
-                .with_exposed_port(config.internal_port)
-                // todo: this doesn't work
-                //.with_wait_for(WaitFor::message_on_stdout("ready for connections"))
                 .start()
                 .await?;