.github/workflows/cont_integration.yml

@@ -41,7 +41,6 @@ jobs:
       - 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=proxy,use-rustls,use-rustls-ring
 
   fmt:
     name: Rust fmt
@@ -62,10 +61,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: dtolnay/rust-toolchain@v1
+      - uses: dtolnay/rust-toolchain@stable
         with:
-          toolchain: 1.90.0
+          toolchain: 1.84.0
           components: clippy
       - name: Rust Cache
         uses: Swatinem/rust-cache@v2.2.1
-      - run: cargo clippy --all-features --all-targets -- -D warnings
+      - uses: actions-rs/clippy-check@v1
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          args: --all-features --all-targets -- -D warnings

CHANGELOG.md

@@ -9,9 +9,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
-## [0.24.1]
- - Default to `ring` if multiple `rustls` features are set #183
-
 ## [0.24.0]
  - Use default `CryptoProvider` if available, otherwise install `rustls`'s `CryptoProvider` based on features #171
  - Add a new batch method for `blockchain.transaction.get_merkle` #170
@@ -62,5 +59,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 [0.23.0]: https://github.com/bitcoindevkit/rust-electrum-client/compare/0.22.0...0.23.0
 [0.23.1]: https://github.com/bitcoindevkit/rust-electrum-client/compare/0.23.0...0.23.1
 [0.24.0]: https://github.com/bitcoindevkit/rust-electrum-client/compare/0.23.1...0.24.0
-[0.24.1]: https://github.com/bitcoindevkit/rust-electrum-client/compare/0.24.0...0.24.1
-[Unreleased]: https://github.com/bitcoindevkit/rust-electrum-client/compare/0.24.1...HEAD
+[Unreleased]: https://github.com/bitcoindevkit/rust-electrum-client/compare/0.24.0...HEAD

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "electrum-client"
-version = "0.24.1"
+version = "0.24.0"
 authors = ["Alekos Filini <alekos.filini@gmail.com>"]
 license = "MIT"
 homepage = "https://github.com/bitcoindevkit/rust-electrum-client"

justfile

@@ -1,34 +0,0 @@
-alias b := build
-alias c := check
-alias f := fmt
-alias t := test
-alias p := pre-push
-
-_default:
-   @just --list
-
-# Build the project
-build:
-   cargo build
-
-# Check code: formatting, compilation, linting, doc comments, and commit signature
-check:
-   cargo +nightly fmt --all -- --check
-   cargo check --all-features --all-targets
-   cargo clippy --all-features --all-targets -- -D warnings
-   RUSTDOCFLAGS="-D warnings" cargo doc --all-features --no-deps
-   @[ "$(git log --pretty='format:%G?' -1 HEAD)" = "N" ] && \
-       echo "\n⚠️  Unsigned commit: BDK requires that commits be signed." || \
-       true
-
-# Format all code
-fmt:
-   cargo +nightly fmt
-
-# Run all tests on the workspace with all features
-test:
-   cargo test --all-features -- --test-threads=1
-
-# Run pre-push suite: format, check, and test
-pre-push: fmt check test
-

src/batch.rs

@@ -88,7 +88,7 @@ impl Batch {
     }
 
     /// Returns an iterator on the batch
-    pub fn iter(&self) -> BatchIter<'_> {
+    pub fn iter(&self) -> BatchIter {
         BatchIter {
             batch: self,
             index: 0,

src/client.rs

@@ -448,9 +448,7 @@ mod tests {
         let now = Instant::now();
         let client = Client::from_config(
             &endpoint,
-            crate::config::ConfigBuilder::new()
-                .timeout(Some(Duration::from_secs(5)))
-                .build(),
+            crate::config::ConfigBuilder::new().timeout(Some(5)).build(),
         );
         let elapsed = now.elapsed();
 

src/config.rs

@@ -55,8 +55,8 @@ impl ConfigBuilder {
     }
 
     /// Sets the timeout
-    pub fn timeout(mut self, timeout: Option<Duration>) -> Self {
-        self.config.timeout = timeout;
+    pub fn timeout(mut self, timeout: Option<u8>) -> Self {
+        self.config.timeout = timeout.map(|t| Duration::from_secs(t as u64));
         self
     }
 

src/raw_client.rs

@@ -408,7 +408,7 @@ impl RawClient<ElectrumSslStream> {
 
         if rustls::crypto::CryptoProvider::get_default().is_none() {
             // We install a crypto provider depending on the set feature.
-            #[cfg(all(feature = "use-rustls", not(feature = "use-rustls-ring")))]
+            #[cfg(feature = "use-rustls")]
             rustls::crypto::CryptoProvider::install_default(
                 rustls::crypto::aws_lc_rs::default_provider(),
             )
@@ -449,7 +449,7 @@ impl RawClient<ElectrumSslStream> {
             builder
                 .dangerous()
                 .with_custom_certificate_verifier(std::sync::Arc::new(
-                    #[cfg(all(feature = "use-rustls", not(feature = "use-rustls-ring")))]
+                    #[cfg(feature = "use-rustls")]
                     danger::NoCertificateVerification::new(rustls::crypto::aws_lc_rs::default_provider()),
                     #[cfg(feature = "use-rustls-ring")]
                     danger::NoCertificateVerification::new(rustls::crypto::ring::default_provider()),
@@ -1249,7 +1249,7 @@ mod test {
         let client = RawClient::new(get_test_server(), None).unwrap();
 
         let resp = client.relay_fee().unwrap();
-        assert!(resp > 0.0);
+        assert_eq!(resp, 0.00001);
     }
 
     #[test]

src/socks/v4.rs

@@ -18,7 +18,12 @@ fn read_response(socket: &mut TcpStream) -> io::Result<SocketAddrV4> {
 
     match response.read_u8()? {
         90 => {}
-        91 => return Err(io::Error::other("request rejected or failed")),
+        91 => {
+            return Err(io::Error::new(
+                io::ErrorKind::Other,
+                "request rejected or failed",
+            ))
+        }
         92 => {
             return Err(io::Error::new(
                 io::ErrorKind::PermissionDenied,

src/socks/v5.rs

@@ -37,7 +37,10 @@ fn read_addr<R: Read>(socket: &mut R) -> io::Result<TargetAddr> {
                 ip, port, 0, 0,
             ))))
         }
-        _ => Err(io::Error::other("unsupported address type")),
+        _ => Err(io::Error::new(
+            io::ErrorKind::Other,
+            "unsupported address type",
+        )),
     }
 }
 
@@ -51,15 +54,35 @@ fn read_response(socket: &mut TcpStream) -> io::Result<TargetAddr> {
 
     match socket.read_u8()? {
         0 => {}
-        1 => return Err(io::Error::other("general SOCKS server failure")),
-        2 => return Err(io::Error::other("connection not allowed by ruleset")),
-        3 => return Err(io::Error::other("network unreachable")),
-        4 => return Err(io::Error::other("host unreachable")),
-        5 => return Err(io::Error::other("connection refused")),
-        6 => return Err(io::Error::other("TTL expired")),
-        7 => return Err(io::Error::other("command not supported")),
-        8 => return Err(io::Error::other("address kind not supported")),
-        _ => return Err(io::Error::other("unknown error")),
+        1 => {
+            return Err(io::Error::new(
+                io::ErrorKind::Other,
+                "general SOCKS server failure",
+            ))
+        }
+        2 => {
+            return Err(io::Error::new(
+                io::ErrorKind::Other,
+                "connection not allowed by ruleset",
+            ))
+        }
+        3 => return Err(io::Error::new(io::ErrorKind::Other, "network unreachable")),
+        4 => return Err(io::Error::new(io::ErrorKind::Other, "host unreachable")),
+        5 => return Err(io::Error::new(io::ErrorKind::Other, "connection refused")),
+        6 => return Err(io::Error::new(io::ErrorKind::Other, "TTL expired")),
+        7 => {
+            return Err(io::Error::new(
+                io::ErrorKind::Other,
+                "command not supported",
+            ))
+        }
+        8 => {
+            return Err(io::Error::new(
+                io::ErrorKind::Other,
+                "address kind not supported",
+            ))
+        }
+        _ => return Err(io::Error::new(io::ErrorKind::Other, "unknown error")),
     }
 
     if socket.read_u8()? != 0 {
@@ -204,11 +227,14 @@ impl Socks5Stream {
         }
 
         if selected_method == 0xff {
-            return Err(io::Error::other("no acceptable auth methods"));
+            return Err(io::Error::new(
+                io::ErrorKind::Other,
+                "no acceptable auth methods",
+            ));
         }
 
         if selected_method != auth.id() && selected_method != Authentication::None.id() {
-            return Err(io::Error::other("unknown auth method"));
+            return Err(io::Error::new(io::ErrorKind::Other, "unknown auth method"));
         }
 
         match *auth {

src/utils.rs

@@ -13,7 +13,7 @@ use bitcoin::Txid;
 /// otherwise.
 ///
 /// [`transaction_get_merkle`]: crate::ElectrumApi::transaction_get_merkle
-/// [`BlockHeader`]: bitcoin::block::Header
+/// [`BlockHeader`]: bitcoin::BlockHeader
 pub fn validate_merkle_proof(
     txid: &Txid,
     merkle_root: &TxMerkleNode,