build: Feature-gate ClientType::SSL

Currently applies to any of
- `use-rustls`
- `use-rustls-ring`
- `use-openssl`

and further reduce feature gating of the `client` module.

Author: ValuedMammal

src/client.rs

@@ -22,6 +22,11 @@ pub enum ClientType {
     #[allow(missing_docs)]
     TCP(RawClient<ElectrumPlaintextStream>),
     #[allow(missing_docs)]
+    #[cfg(any(
+        feature = "use-rustls",
+        feature = "use-rustls-ring",
+        feature = "use-openssl",
+    ))]
     SSL(RawClient<ElectrumSslStream>),
     #[allow(missing_docs)]
     #[cfg(feature = "proxy")]
@@ -44,6 +49,11 @@ macro_rules! impl_inner_call {
             let read_client = $self.client_type.read().unwrap();
             let res = match &*read_client {
                 ClientType::TCP(inner) => inner.$name( $($args, )* ),
+                #[cfg(any(
+                    feature = "use-rustls",
+                    feature = "use-rustls-ring",
+                    feature = "use-openssl",
+                ))]
                 ClientType::SSL(inner) => inner.$name( $($args, )* ),
                 #[cfg(feature = "proxy")]
                 ClientType::Socks5(inner) => inner.$name( $($args, )* ),
@@ -110,8 +120,19 @@ impl ClientType {
     /// Constructor that supports multiple backends and allows configuration through
     /// the [Config]
     pub fn from_config(url: &str, config: &Config) -> Result<Self, Error> {
-        if url.starts_with("ssl://") {
+        // TLS.
+        #[cfg(any(
+            feature = "use-rustls",
+            feature = "use-rustls-ring",
+            feature = "use-openssl",
+        ))]
+        let client = {
             let url = url.replacen("ssl://", "", 1);
+
+            #[cfg(not(feature = "proxy"))]
+            let client =
+                RawClient::new_ssl(url.as_str(), config.validate_domain(), config.timeout())?;
+
             #[cfg(feature = "proxy")]
             let client = match config.socks5() {
                 Some(socks5) => RawClient::new_proxy_ssl(
@@ -124,12 +145,16 @@ impl ClientType {
                     RawClient::new_ssl(url.as_str(), config.validate_domain(), config.timeout())?
                 }
             };
-            #[cfg(not(feature = "proxy"))]
-            let client =
-                RawClient::new_ssl(url.as_str(), config.validate_domain(), config.timeout())?;
 
-            Ok(ClientType::SSL(client))
-        } else {
+            ClientType::SSL(client)
+        };
+        // Plain TCP.
+        #[cfg(not(any(
+            feature = "use-rustls",
+            feature = "use-rustls-ring",
+            feature = "use-openssl",
+        )))]
+        let client = {
             let url = url.replacen("tcp://", "", 1);
 
             #[cfg(feature = "proxy")]
@@ -145,8 +170,10 @@ impl ClientType {
             #[cfg(not(feature = "proxy"))]
             let client = ClientType::TCP(RawClient::new(url.as_str(), config.timeout())?);
 
-            Ok(client)
-        }
+            client
+        };
+
+        Ok(client)
     }
 }
 

src/lib.rs

@@ -57,11 +57,6 @@ pub mod socks;
 mod api;
 mod batch;
 
-#[cfg(any(
-    feature = "use-openssl",
-    feature = "use-rustls",
-    feature = "use-rustls-ring",
-))]
 pub mod client;
 
 mod config;
@@ -73,11 +68,6 @@ pub mod utils;
 
 pub use api::ElectrumApi;
 pub use batch::Batch;
-#[cfg(any(
-    feature = "use-openssl",
-    feature = "use-rustls",
-    feature = "use-rustls-ring",
-))]
 pub use client::*;
 pub use config::{Config, ConfigBuilder, Socks5Config};
 pub use types::*;