Depend on bitreq

We just forked `minreq` into this repository to create an HTTP crate
that is specifically designed to be used by Bitcoin projects. As such
we called it `bitreq`.

Depend on the local `bitreq` crate instead of `minreq`. Done directly
in `node` and `jsonrpc`. Indirectly in `client`, including rename of
a million macros that have `minreq` in the name.

Author: tcharding

Cargo-minimal.lock

@@ -279,11 +279,11 @@ version = "0.10.0"
 dependencies = [
  "anyhow",
  "bitcoin_hashes",
+ "bitreq",
  "corepc-client",
  "env_logger",
  "flate2",
  "log",
- "minreq",
  "serde_json",
  "tar",
  "tempfile",
@@ -451,7 +451,7 @@ name = "jsonrpc"
 version = "0.18.0"
 dependencies = [
  "base64 0.22.1",
- "minreq",
+ "bitreq",
  "serde",
  "serde_json",
  "socks",
@@ -501,21 +501,6 @@ dependencies = [
  "adler2",
 ]
 
-[[package]]
-name = "minreq"
-version = "2.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fdef521c74c2884a4f3570bcdb6d2a77b3c533feb6b27ac2ae72673cc221c64"
-dependencies = [
- "log",
- "once_cell",
- "rustls",
- "rustls-webpki",
- "serde",
- "serde_json",
- "webpki-roots",
-]
-
 [[package]]
 name = "mio"
 version = "1.0.2"

Cargo-recent.lock

@@ -279,11 +279,11 @@ version = "0.10.0"
 dependencies = [
  "anyhow",
  "bitcoin_hashes",
+ "bitreq",
  "corepc-client",
  "env_logger",
  "flate2",
  "log",
- "minreq",
  "serde_json",
  "tar",
  "tempfile",
@@ -456,7 +456,7 @@ name = "jsonrpc"
 version = "0.18.0"
 dependencies = [
  "base64 0.22.1",
- "minreq",
+ "bitreq",
  "serde",
  "serde_json",
  "socks",
@@ -506,21 +506,6 @@ dependencies = [
  "adler2",
 ]
 
-[[package]]
-name = "minreq"
-version = "2.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da0c420feb01b9fb5061f8c8f452534361dd783756dcf38ec45191ce55e7a161"
-dependencies = [
- "log",
- "once_cell",
- "rustls",
- "rustls-webpki",
- "serde",
- "serde_json",
- "webpki-roots",
-]
-
 [[package]]
 name = "mio"
 version = "1.1.0"

client/Cargo.toml

@@ -27,6 +27,6 @@ serde = { version = "1.0.103", default-features = false, features = [ "derive",
 serde_json = { version = "1.0.117" }
 types = { package = "corepc-types", version = "0.10.0", path = "../types", default-features = false, features = ["std"] }
 
-jsonrpc = { version = "0.18.0", path = "../jsonrpc", features = ["minreq_http"], optional = true }
+jsonrpc = { version = "0.18.0", path = "../jsonrpc", features = ["bitreq_http"], optional = true }
 
 [dev-dependencies]

client/src/client_sync/mod.rs

@@ -55,9 +55,9 @@ impl Auth {
     }
 }
 
-/// Defines a `jsonrpc::Client` using `minreq`.
+/// Defines a `jsonrpc::Client` using `bitreq`.
 #[macro_export]
-macro_rules! define_jsonrpc_minreq_client {
+macro_rules! define_jsonrpc_bitreq_client {
     ($version:literal) => {
         use std::fmt;
 
@@ -81,7 +81,7 @@ macro_rules! define_jsonrpc_minreq_client {
         impl Client {
             /// Creates a client to a bitcoind JSON-RPC server without authentication.
             pub fn new(url: &str) -> Self {
-                let transport = jsonrpc::http::minreq_http::Builder::new()
+                let transport = jsonrpc::http::bitreq_http::Builder::new()
                     .url(url)
                     .expect("jsonrpc v0.18, this function does not error")
                     .timeout(std::time::Duration::from_secs(60))
@@ -98,7 +98,7 @@ macro_rules! define_jsonrpc_minreq_client {
                 }
                 let (user, pass) = auth.get_user_pass()?;
 
-                let transport = jsonrpc::http::minreq_http::Builder::new()
+                let transport = jsonrpc::http::bitreq_http::Builder::new()
                     .url(url)
                     .expect("jsonrpc v0.18, this function does not error")
                     .timeout(std::time::Duration::from_secs(60))

client/src/client_sync/v17/blockchain.rs

@@ -7,7 +7,7 @@
 //!
 //! All macros require `Client` to be in scope.
 //!
-//! See or use the `define_jsonrpc_minreq_client!` macro to define a `Client`.
+//! See or use the `define_jsonrpc_bitreq_client!` macro to define a `Client`.
 
 /// Implements Bitcoin Core JSON-RPC API method `getblockchaininfo`.
 #[macro_export]

client/src/client_sync/v17/control.rs

@@ -7,7 +7,7 @@
 //!
 //! All macros require `Client` to be in scope.
 //!
-//! See or use the `define_jsonrpc_minreq_client!` macro to define a `Client`.
+//! See or use the `define_jsonrpc_bitreq_client!` macro to define a `Client`.
 
 /// Implements Bitcoin Core JSON-RPC API method `getmemoryinfo`.
 #[macro_export]

client/src/client_sync/v17/generating.rs

@@ -7,7 +7,7 @@
 //!
 //! All macros require `Client` to be in scope.
 //!
-//! See or use the `define_jsonrpc_minreq_client!` macro to define a `Client`.
+//! See or use the `define_jsonrpc_bitreq_client!` macro to define a `Client`.
 
 /// Implements Bitcoin Core JSON-RPC API method `generatetoaddress`.
 #[macro_export]

client/src/client_sync/v17/mining.rs

@@ -7,7 +7,7 @@
 //!
 //! All macros require `Client` to be in scope.
 //!
-//! See or use the `define_jsonrpc_minreq_client!` macro to define a `Client`.
+//! See or use the `define_jsonrpc_bitreq_client!` macro to define a `Client`.
 
 /// Implements Bitcoin Core JSON-RPC API method `getblocktemplate`.
 #[macro_export]

client/src/client_sync/v17/mod.rs

@@ -25,7 +25,7 @@ use serde::{Deserialize, Serialize, Serializer};
 use crate::client_sync::into_json;
 use crate::types::v17::*;
 
-crate::define_jsonrpc_minreq_client!("v17");
+crate::define_jsonrpc_bitreq_client!("v17");
 crate::impl_client_check_expected_server_version!({ [170200] });
 
 // == Blockchain ==

client/src/client_sync/v17/network.rs

@@ -7,7 +7,7 @@
 //! Specifically this is methods found under the `== Network ==` section of the
 //! API docs of Bitcoin Core `v0.17`.
 //!
-//! See, or use the `define_jsonrpc_minreq_client!` macro to define a `Client`.
+//! See, or use the `define_jsonrpc_bitreq_client!` macro to define a `Client`.
 
 /// Implements Bitcoin Core JSON-RPC API method `addnode`.
 #[macro_export]