Remove redundant _test-util feature flag

Author: spacebear21

payjoin-mailroom/Cargo.toml

@@ -18,8 +18,7 @@ default = ["bootstrap"]
 bootstrap = ["connect-bootstrap", "ws-bootstrap"]
 connect-bootstrap = []
 ws-bootstrap = ["dep:tokio-tungstenite", "dep:rustls"]
-_test-util = []
-_manual-tls = ["dep:axum-server", "dep:rustls", "_test-util"]
+_manual-tls = ["dep:axum-server", "dep:rustls"]
 acme = ["dep:tokio-rustls-acme", "dep:axum-server", "dep:rustls"]
 access-control = ["dep:flate2", "dep:ipnet", "dep:maxminddb", "dep:reqwest"]
 telemetry = ["dep:opentelemetry-otlp"]

payjoin-mailroom/src/ohttp_relay/gateway_prober.rs

@@ -14,9 +14,8 @@ use tokio::time::Instant;
 
 use super::gateway_uri::GatewayUri;
 
-// these are only pub for the integration test
-pub const MAGIC_BIP77_PURPOSE: &[u8] = b"BIP77 454403bb-9f7b-4385-b31f-acd2dae20b7e";
-pub const ALLOWED_PURPOSES_CONTENT_TYPE: &str = "application/x-ohttp-allowed-purposes";
+const MAGIC_BIP77_PURPOSE: &[u8] = b"BIP77 454403bb-9f7b-4385-b31f-acd2dae20b7e";
+const ALLOWED_PURPOSES_CONTENT_TYPE: &str = "application/x-ohttp-allowed-purposes";
 const DEFAULT_CAPACITY: usize = 1000;
 
 #[derive(PartialEq, Eq, Clone, Copy, Debug)]

payjoin-mailroom/src/ohttp_relay/mod.rs

@@ -23,10 +23,7 @@ use hyper_util::rt::TokioExecutor;
 use tracing::instrument;
 
 pub mod error;
-#[cfg(not(feature = "_test-util"))]
 mod gateway_prober;
-#[cfg(feature = "_test-util")]
-pub mod gateway_prober;
 mod gateway_uri;
 pub mod sentinel;
 pub use sentinel::SentinelTag;
@@ -80,7 +77,7 @@ impl Service {
         Self { config: Arc::new(config) }
     }
 
-    #[cfg(feature = "_test-util")]
+    #[cfg(feature = "_manual-tls")]
     pub async fn new_with_roots(
         sentinel_tag: SentinelTag,
         root_store: rustls::RootCertStore,

payjoin-mailroom/tests/integration.rs

@@ -1,5 +1,4 @@
 #[cfg(test)]
-#[cfg(feature = "_test-util")]
 mod integration {
     use std::fs::File;
     use std::io::Read;
@@ -18,9 +17,6 @@ mod integration {
     use hyper_rustls::HttpsConnectorBuilder;
     use hyper_util::client::legacy::Client;
     use hyper_util::rt::{TokioExecutor, TokioIo};
-    use payjoin_mailroom::ohttp_relay::gateway_prober::{
-        ALLOWED_PURPOSES_CONTENT_TYPE, MAGIC_BIP77_PURPOSE,
-    };
     use payjoin_mailroom::ohttp_relay::*;
     use payjoin_test_utils::init_ohttp_relay;
     use rcgen::Certificate;
@@ -42,6 +38,8 @@ mod integration {
     const ENCAPSULATED_REQ: &str = "010020000100014b28f881333e7c164ffc499ad9796f877f4e1051ee6d31bad19dec96c208b4726374e469135906992e1268c594d2a10c695d858c40a026e7965e7d86b83dd440b2c0185204b4d63525";
     const ENCAPSULATED_RES: &str =
         "c789e7151fcba46158ca84b04464910d86f9013e404feea014e7be4a441f234f857fbd";
+    const MAGIC_BIP77_PURPOSE: &[u8] = b"BIP77 454403bb-9f7b-4385-b31f-acd2dae20b7e";
+    const ALLOWED_PURPOSES_CONTENT_TYPE: &str = "application/x-ohttp-allowed-purposes";
 
     /// See: https://www.ietf.org/rfc/rfc9458.html#name-complete-example-of-a-reque
     #[tokio::test]