Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove proxy as optional feature #143

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Remove proxy as optional feature #143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/cont_integration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,12 @@ jobs:
- name: Timeout test
run: cargo test -- --ignored test_local_timeout
- run: cargo check --verbose --features=use-openssl
- run: cargo check --verbose --no-default-features --features=proxy
- run: cargo check --verbose --no-default-features
- run: cargo check --verbose --no-default-features --features=minimal
- run: cargo check --verbose --no-default-features --features=minimal,debug-calls
- run: cargo check --verbose --no-default-features --features=proxy,use-openssl
- run: cargo check --verbose --no-default-features --features=proxy,use-rustls
- run: cargo check --verbose --no-default-features --features=proxy,use-rustls-ring
- run: cargo check --verbose --no-default-features --features=use-openssl
- run: cargo check --verbose --no-default-features --features=use-rustls
- run: cargo check --verbose --no-default-features --features=use-rustls-ring

fmt:
name: Rust fmt
Expand Down
9 changes: 4 additions & 5 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,19 +29,18 @@ openssl = { version = "0.10", optional = true }
rustls = { version = "0.23", optional = true, default-features = false }
webpki-roots = { version = "0.25", optional = true }

byteorder = { version = "1.0", optional = true }
byteorder = { version = "1.0" }

[target.'cfg(unix)'.dependencies]
libc = { version = "0.2", optional = true }
libc = { version = "0.2" }

[target.'cfg(windows)'.dependencies]
winapi = { version="0.3.9", features=["winsock2"], optional = true }
winapi = { version="0.3.9", features=["winsock2"] }

[features]
default = ["proxy", "use-rustls"]
default = ["use-rustls"]
minimal = []
debug-calls = []
proxy = ["byteorder", "winapi", "libc"]
use-rustls = ["webpki-roots", "rustls/default"]
use-rustls-ring = ["webpki-roots", "rustls/ring", "rustls/logging", "rustls/std", "rustls/tls12"]
use-openssl = ["openssl"]
2 changes: 1 addition & 1 deletion src/client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ use std::convert::TryFrom;
/// [`RawClient`](client/struct.RawClient.html) and provides a more user-friendly
/// constructor that can choose the right backend based on the url prefix.
///
/// **This is available only with the `default` features, or if `proxy` and one ssl implementation are enabled**
/// **This is available only with the `default` features, or if one ssl implementation are enabled**
pub enum ClientType {
#[allow(missing_docs)]
TCP(RawClient<ElectrumPlaintextStream>),
Expand Down
20 changes: 10 additions & 10 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,24 +43,24 @@ extern crate serde_json;
))]
extern crate webpki_roots;

#[cfg(any(feature = "default", feature = "proxy"))]
#[cfg(feature = "default")]
extern crate byteorder;

#[cfg(all(unix, any(feature = "default", feature = "proxy")))]
#[cfg(all(unix, feature = "default"))]
extern crate libc;
#[cfg(all(windows, any(feature = "default", feature = "proxy")))]
#[cfg(all(windows, feature = "default"))]
extern crate winapi;

#[cfg(any(feature = "default", feature = "proxy"))]
#[cfg(feature = "default")]
pub mod socks;

mod api;
mod batch;

#[cfg(any(
all(feature = "proxy", feature = "use-openssl"),
all(feature = "proxy", feature = "use-rustls"),
all(feature = "proxy", feature = "use-rustls-ring")
feature = "use-openssl",
feature = "use-rustls",
feature = "use-rustls-ring"
))]
pub mod client;

Expand All @@ -74,9 +74,9 @@ pub mod utils;
pub use api::ElectrumApi;
pub use batch::Batch;
#[cfg(any(
all(feature = "proxy", feature = "use-openssl"),
all(feature = "proxy", feature = "use-rustls"),
all(feature = "proxy", feature = "use-rustls-ring")
feature = "use-openssl",
feature = "use-rustls",
feature = "use-rustls-ring"
))]
pub use client::*;
pub use config::{Config, ConfigBuilder, Socks5Config};
Expand Down
10 changes: 4 additions & 6 deletions src/raw_client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ use rustls::{
ClientConfig, ClientConnection, RootCertStore, StreamOwned,
};

#[cfg(any(feature = "default", feature = "proxy"))]
#[cfg(feature = "default")]
use crate::socks::{Socks5Stream, TargetAddr, ToTargetAddr};

use crate::stream::ClonableStream;
Expand Down Expand Up @@ -93,7 +93,7 @@ impl ToSocketAddrsDomain for (&str, u16) {
}
}

#[cfg(any(feature = "default", feature = "proxy"))]
#[cfg(feature = "default")]
impl ToSocketAddrsDomain for TargetAddr {
fn domain(&self) -> Option<&str> {
match self {
Expand Down Expand Up @@ -398,8 +398,6 @@ impl RawClient<ElectrumSslStream> {
validate_domain: bool,
tcp_stream: TcpStream,
) -> Result<Self, Error> {
use std::convert::TryFrom;

let builder = ClientConfig::builder();

let config = if validate_domain {
Expand Down Expand Up @@ -438,10 +436,10 @@ impl RawClient<ElectrumSslStream> {
}
}

#[cfg(any(feature = "default", feature = "proxy"))]
#[cfg(feature = "default")]
/// Transport type used to establish a connection to a server through a socks proxy
pub type ElectrumProxyStream = Socks5Stream;
#[cfg(any(feature = "default", feature = "proxy"))]
#[cfg(feature = "default")]
impl RawClient<ElectrumProxyStream> {
Comment on lines +439 to 443
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IIUC this is the only place it's required to have the proxy feature, on both ElectrumProxyStream type and the RawClient<ElectrumProxyStream> implementation.

I think the default should the ElectrumSSlStream equivalent, as the use-rustls is a default feature.

/// Creates a new socks client and tries to connect to `target_addr` using `proxy_addr` as a
/// socks proxy server. The DNS resolution of `target_addr`, if required, is done
Expand Down
Loading