From 62510c7892dbfb38ba526645b0c55f3f98f49437 Mon Sep 17 00:00:00 2001 From: DanGould Date: Wed, 1 Jan 2025 17:06:06 -0500 Subject: [PATCH 1/2] Test _danger-local-https only for v2 integration 1. payjoin/_danger-local-https not required in v1 integrations 2. payjoin/contrib/test.sh was not running v1 integration tests since it only specifies send,receive features This was accidentally disabled in fdcc566e364269750afee77e3f26da7d1a715974 Note: this change is not required for payjoin-cli/tests/e2e because there is both a v1 and v2 _danger-local-https in payjoin-cli. --- payjoin/tests/integration.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/payjoin/tests/integration.rs b/payjoin/tests/integration.rs index abcf4d7e6..b3c6f447d 100644 --- a/payjoin/tests/integration.rs +++ b/payjoin/tests/integration.rs @@ -1,4 +1,4 @@ -#[cfg(all(feature = "send", feature = "receive", feature = "_danger-local-https"))] +#[cfg(all(feature = "send", feature = "receive"))] mod integration { use std::collections::HashMap; use std::env; @@ -171,7 +171,7 @@ mod integration { } } - #[cfg(all(feature = "io", feature = "v2"))] + #[cfg(all(feature = "io", feature = "v2", feature = "_danger-local-https"))] mod v2 { use std::sync::Arc; use std::time::Duration; From 4538929caff09165589b4d734643047b2419690a Mon Sep 17 00:00:00 2001 From: DanGould Date: Wed, 1 Jan 2025 17:23:25 -0500 Subject: [PATCH 2/2] Include io in v2 integration test requirement This feature is required to run the v2 test suite and went overlooked in fdcc566e364269750afee77e3f26da7d1a715974 --- payjoin/contrib/test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payjoin/contrib/test.sh b/payjoin/contrib/test.sh index c4789812d..df2a30285 100755 --- a/payjoin/contrib/test.sh +++ b/payjoin/contrib/test.sh @@ -3,4 +3,4 @@ set -e cargo test --locked --package payjoin --verbose --all-features --lib cargo test --locked --package payjoin --verbose --features=send,receive --test integration -cargo test --locked --package payjoin --verbose --no-default-features --features=send,receive,_danger-local-https,v2 --test integration +cargo test --locked --package payjoin --verbose --no-default-features --features=send,receive,_danger-local-https,v2,io --test integration