Update deps

Author: Ash-L2L

Cargo.lock

@@ -22,15 +22,15 @@ futures = { version = "0.3.30", default-features = false }
 http = "1.2.0"
 jsonrpsee = { version = "0.25.1", features = ["tracing"] }
 parking_lot = "0.12.1"
-prost = "0.13.3"
+prost = "0.14.1"
 serde = "1.0.179"
 serde_json = "1.0.113"
-strum = { version = "0.26.3", features = ["derive"] }
+strum = { version = "0.27.2", features = ["derive"] }
 thiserror = "2.0.11"
 tiny-bip39 = "2.0.0"
 tokio = { version = "1.29.1", default-features = false, features = ["signal"] }
 tokio-util = "0.7.10"
-tonic = "0.12.3"
+tonic = "0.14.2"
 tracing = "0.1.40"
 tracing-subscriber = "0.3.20"
 utoipa = { version = "5.2.0", default-features = false }
@@ -39,12 +39,12 @@ uuid = "1.13.1"
 [workspace.dependencies.bip300301_enforcer_lib]
 default-features = false
 git = "https://github.com/LayerTwo-Labs/bip300301_enforcer"
-rev = "efc538e2b10619a2984acb197b9392cb17e05313"
+rev = "65ebb34f574b3e4368e3b2b1c915c85e8184b6ef"
 
 [workspace.dependencies.bip300301_enforcer_integration_tests]
 default-features = false
 git = "https://github.com/LayerTwo-Labs/bip300301_enforcer"
-rev = "efc538e2b10619a2984acb197b9392cb17e05313"
+rev = "65ebb34f574b3e4368e3b2b1c915c85e8184b6ef"
 
 [workspace.dependencies.l2l-openapi]
 git = "https://github.com/Ash-L2L/l2l-openapi"

Cargo.toml

@@ -34,7 +34,7 @@ tiny-bip39 = { workspace = true }
 tokio = { workspace = true, features = ["macros", "rt-multi-thread"] }
 tokio-util = { workspace = true, features = ["rt"] }
 tonic = { workspace = true }
-tonic-health = "0.12.3"
+tonic-health = "0.14.2"
 # needs to line up with jsonrpsee tower version...
 tower = "0.5.2"
 tower-http = { version = "0.6.2", features = ["request-id", "trace"] }

app/Cargo.toml

@@ -115,14 +115,15 @@ confidence-threshold = 0.8
 exceptions = [
     # Each entry is the crate and version constraint, and its specific allow
     # list
+    { allow = ["CDLA-Permissive-2.0"], name = "webpki-roots", version = "1.0.4" },
+    { allow = ["CDLA-Permissive-2.0"], name = "webpki-root-certs", version = "0.26.11" },
+    { allow = ["CDLA-Permissive-2.0"], name = "webpki-root-certs", version = "1.0.4" },
     { allow = ["LicenseRef-UFL-1.0", "OFL-1.1"], name = "epaint_default_fonts", version = "0.30.0" },
     { allow = ["MPL-2.0"], name = "bitmaps", version = "3.2.1" },
     { allow = ["MPL-2.0"], name = "imbl", version = "3.0.0" },
     { allow = ["MPL-2.0"], name = "imbl-sized-chunks", version = "0.1.3" },
     { allow = ["MPL-2.0"], name = "option-ext", version = "0.2.0" },
-    { allow = ["MPL-2.0"], name = "webpki-root-certs", version = "0.26.7" },
     { allow = ["MPL-2.0"], name = "webpki-roots", version = "0.25.4" },
-    { allow = ["MPL-2.0"], name = "webpki-roots", version = "0.26.7" },
     { allow = ["Zlib"], name = "foldhash" },
     { allow = ["Zlib"], name = "slotmap", version = "1.0.7" },
     { allow = ["Zlib"], name = "typewit", version = "1.11.0" },

deny.toml

@@ -8,7 +8,7 @@ use bip300301_enforcer_integration_tests::{
         Mode, Network, PostSetup as EnforcerPostSetup, Sidechain as _,
         setup as setup_enforcer,
     },
-    util::{AbortOnDrop, AsyncTrial},
+    util::{AbortOnDrop, AsyncTrial, TestFailureCollector, TestFileRegistry},
 };
 use futures::{FutureExt, StreamExt as _, channel::mpsc, future::BoxFuture};
 use thunder_app_rpc_api::RpcClient as _;
@@ -162,11 +162,14 @@ async fn initial_block_download_task(
     }
     drop(thunder_nodes.syncer);
     drop(thunder_nodes.sender);
-    tracing::info!("Removing {}", enforcer_post_setup.out_dir.path().display());
+    tracing::info!(
+        "Removing {}",
+        enforcer_post_setup.directories.base_dir.path().display()
+    );
     drop(enforcer_post_setup.tasks);
     // Wait for tasks to die
     sleep(std::time::Duration::from_secs(1)).await;
-    enforcer_post_setup.out_dir.cleanup()?;
+    enforcer_post_setup.directories.base_dir.cleanup()?;
     Ok(())
 }
 
@@ -189,6 +192,13 @@ async fn ibd(bin_paths: BinPaths) -> anyhow::Result<()> {
 
 pub fn ibd_trial(
     bin_paths: BinPaths,
+    file_registry: TestFileRegistry,
+    failure_collector: TestFailureCollector,
 ) -> AsyncTrial<BoxFuture<'static, anyhow::Result<()>>> {
-    AsyncTrial::new("initial_block_download", ibd(bin_paths).boxed())
+    AsyncTrial::new(
+        "initial_block_download",
+        ibd(bin_paths).boxed(),
+        file_registry,
+        failure_collector,
+    )
 }

integration_tests/ibd.rs

@@ -1,6 +1,6 @@
 use bip300301_enforcer_integration_tests::{
     setup::{Mode, Network},
-    util::AsyncTrial,
+    util::{AsyncTrial, TestFailureCollector, TestFileRegistry},
 };
 use futures::{FutureExt, future::BoxFuture};
 
@@ -13,24 +13,48 @@ use crate::{
 
 fn deposit_withdraw_roundtrip(
     bin_paths: BinPaths,
+    file_registry: TestFileRegistry,
+    failure_collector: TestFailureCollector,
 ) -> AsyncTrial<BoxFuture<'static, anyhow::Result<()>>> {
-    AsyncTrial::new("deposit_withdraw_roundtrip", async move {
-        bip300301_enforcer_integration_tests::integration_test::deposit_withdraw_roundtrip::<PostSetup>(
-                bin_paths.others, Network::Regtest, Mode::Mempool,
-                Init {
-                    thunder_app: bin_paths.thunder,
-                    data_dir_suffix: None,
-                },
-            ).await
-    }.boxed())
+    AsyncTrial::new(
+        "deposit_withdraw_roundtrip",
+        async move {
+            let (res_tx, _) = futures::channel::mpsc::unbounded();
+            let post_setup = bip300301_enforcer_integration_tests::setup::setup(
+                &bin_paths.others,
+                Network::Regtest,
+                Mode::Mempool,
+                res_tx
+            ).await?;
+            bip300301_enforcer_integration_tests::integration_test::deposit_withdraw_roundtrip::<PostSetup>(
+                    post_setup,
+                    Init {
+                        thunder_app: bin_paths.thunder,
+                        data_dir_suffix: None,
+                    },
+                ).await
+        }.boxed(),
+        file_registry,
+        failure_collector,
+    )
 }
 
 pub fn tests(
     bin_paths: BinPaths,
+    file_registry: TestFileRegistry,
+    failure_collector: TestFailureCollector,
 ) -> Vec<AsyncTrial<BoxFuture<'static, anyhow::Result<()>>>> {
     vec![
-        deposit_withdraw_roundtrip(bin_paths.clone()),
-        ibd_trial(bin_paths.clone()),
-        unknown_withdrawal_trial(bin_paths),
+        deposit_withdraw_roundtrip(
+            bin_paths.clone(),
+            file_registry.clone(),
+            failure_collector.clone(),
+        ),
+        ibd_trial(
+            bin_paths.clone(),
+            file_registry.clone(),
+            failure_collector.clone(),
+        ),
+        unknown_withdrawal_trial(bin_paths, file_registry, failure_collector),
     ]
 }

integration_tests/integration_test.rs

@@ -1,3 +1,6 @@
+use bip300301_enforcer_integration_tests::util::{
+    TestFailureCollector, TestFileRegistry,
+};
 use clap::Parser;
 use tracing_subscriber::{filter as tracing_filter, layer::SubscriberExt};
 
@@ -91,10 +94,16 @@ async fn main() -> anyhow::Result<std::process::ExitCode> {
 
     // Create a list of tests
     let mut tests = Vec::<libtest_mimic::Trial>::new();
+    let file_registry = TestFileRegistry::new();
+    let failure_collector = TestFailureCollector::new();
     tests.extend(
-        integration_test::tests(util::BinPaths::from_env()?)
-            .into_iter()
-            .map(|trial| trial.run_blocking(rt_handle.clone())),
+        integration_test::tests(
+            util::BinPaths::from_env()?,
+            file_registry,
+            failure_collector,
+        )
+        .into_iter()
+        .map(|trial| trial.run_blocking(rt_handle.clone())),
     );
     // Run all tests and exit the application appropriatly.
     let exit_code = libtest_mimic::run(&args.test_args, tests).exit_code();

integration_tests/main.rs

@@ -148,9 +148,13 @@ impl Sidechain for PostSetup {
     ) -> Result<Self, Self::SetupError> {
         let reserved_ports = ReservedPorts::new()?;
         let thunder_dir = if let Some(suffix) = init.data_dir_suffix {
-            post_setup.out_dir.path().join(format!("thunder-{suffix}"))
+            post_setup
+                .directories
+                .base_dir
+                .path()
+                .join(format!("thunder-{suffix}"))
         } else {
-            post_setup.out_dir.path().join("thunder")
+            post_setup.directories.base_dir.path().join("thunder")
         };
         std::fs::create_dir(&thunder_dir)
             .map_err(Self::SetupError::CreateThunderDir)?;

integration_tests/setup.rs

@@ -9,7 +9,7 @@ use bip300301_enforcer_integration_tests::{
         Mode, Network, PostSetup as EnforcerPostSetup, Sidechain as _,
         setup as setup_enforcer,
     },
-    util::{AbortOnDrop, AsyncTrial},
+    util::{AbortOnDrop, AsyncTrial, TestFailureCollector, TestFileRegistry},
 };
 use futures::{
     FutureExt as _, StreamExt as _, channel::mpsc, future::BoxFuture,
@@ -141,11 +141,14 @@ async fn unknown_withdrawal_task(
     }
     drop(sidechain_successor);
     drop(sidechain_withdrawer);
-    tracing::info!("Removing {}", enforcer_post_setup.out_dir.path().display());
+    tracing::info!(
+        "Removing {}",
+        enforcer_post_setup.directories.base_dir.path().display()
+    );
     drop(enforcer_post_setup.tasks);
     // Wait for tasks to die
     sleep(std::time::Duration::from_secs(1)).await;
-    enforcer_post_setup.out_dir.cleanup()?;
+    enforcer_post_setup.directories.base_dir.cleanup()?;
     Ok(())
 }
 
@@ -167,6 +170,13 @@ async fn unknown_withdrawal(bin_paths: BinPaths) -> anyhow::Result<()> {
 
 pub fn unknown_withdrawal_trial(
     bin_paths: BinPaths,
+    file_registry: TestFileRegistry,
+    failure_collector: TestFailureCollector,
 ) -> AsyncTrial<BoxFuture<'static, anyhow::Result<()>>> {
-    AsyncTrial::new("unknown_withdrawal", unknown_withdrawal(bin_paths).boxed())
+    AsyncTrial::new(
+        "unknown_withdrawal",
+        unknown_withdrawal(bin_paths).boxed(),
+        file_registry,
+        failure_collector,
+    )
 }

integration_tests/unknown_withdrawal.rs

@@ -8,9 +8,9 @@ version.workspace = true
 
 [build-dependencies]
 prost = { workspace = true }
-prost-build = "0.13.3"
-protox = "0.7.1"
-tonic-build = "0.12.3"
+prost-build = "0.14.1"
+protox = "0.9.0"
+tonic-prost-build = "0.14.2"
 
 [dependencies]
 anyhow = { workspace = true, features = ["backtrace"] }
@@ -35,7 +35,7 @@ merkle-cbt = "0.3.2"
 nonempty = { version = "0.11.0", features = ["serialize"] }
 parking_lot = { workspace = true }
 prost = { workspace = true }
-prost-types = "0.13.3"
+prost-types = "0.14.1"
 quinn = "0.11.6"
 rayon = "1.7.0"
 rcgen = "0.13.2"
@@ -54,6 +54,7 @@ tokio = { workspace = true, features = ["rt-multi-thread", "sync"] }
 tokio-stream = { version = "0.1.15", features = ["sync"] }
 tokio-util = { workspace = true, features = ["rt"] }
 tonic = { workspace = true }
+tonic-prost = "0.14.2"
 tracing = { workspace = true }
 transitive = "1.0.1"
 utoipa = { workspace = true, features = ["macros", "non_strict_integers"] }