Added a feature flag "rpc_authentication" so that diqwest dependency …

…is only compiled when the feature is needed
monero-rs · Nov 13, 2022 · df26564 · df26564
1 parent c7308a7
commit df26564
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 6 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -13,8 +13,8 @@ description = "RPC client for Monero daemon and wallet"
 [dependencies]
 anyhow = "1"
 chrono = { version = "0.4", features = ["serde"] }
-diqwest = "1.1"
-fixed-hash = "0.7"
+diqwest = { version = "1.1", optional = true }
+fixed-hash = "0.8"
 hex = "0.4"
 http = "0.2"
 jsonrpc-core = "18"
@@ -31,3 +31,6 @@ rand = "0.8.4"
 rustc-hex = "2.1"
 serde_test = "1.0"
 tokio = { version = "1.12.0", features = ["full"] }
+
+[features]
+rpc_authentication = ["dep:diqwest"]
diff --git a/src/lib.rs b/src/lib.rs
@@ -61,7 +61,9 @@ use std::{
 use tracing::*;
 use uuid::Uuid;
 
+#[cfg(feature = "rpc_authentication")]
 use crate::RpcAuthentication::Credentials;
+#[cfg(feature = "rpc_authentication")]
 use diqwest::WithDigestAuth;
 
 enum RpcParams {
@@ -106,6 +108,7 @@ impl From<RpcParams> for Params {
 struct RemoteCaller {
     http_client: reqwest::Client,
     addr: String,
+    #[allow(dead_code)]
     rpc_auth: RpcAuthentication,
 }
 
@@ -129,6 +132,10 @@ impl RemoteCaller {
 
         let req = client.post(&uri).json(&method_call);
 
+        #[cfg(not(feature = "rpc_authentication"))]
+        let rsp = req.send().await?.json::<response::Output>().await?;
+
+        #[cfg(feature = "rpc_authentication")]
         let rsp = if let Credentials { username, password } = &self.rpc_auth {
             req.send_with_digest_auth(username, password)
                 .await?
@@ -160,6 +167,10 @@ impl RemoteCaller {
 
         let req = client.post(uri).json(&json_params);
 
+        #[cfg(not(feature = "rpc_authentication"))]
+        let rsp = req.send().await?.json::<T>().await?;
+
+        #[cfg(feature = "rpc_authentication")]
         let rsp = if let Credentials { username, password } = &self.rpc_auth {
             req.send_with_digest_auth(username, password)
                 .await?

diff --git a/tests/docker-compose.yml b/tests/docker-compose.yml
@@ -1,7 +1,7 @@
 version: "3.7"
 services:
   monerod:
-    image: ghcr.io/farcaster-project/containers/monerod:${MONERO_VERSION:-0.18.1.2}
+    image: ghcr.io/farcaster-project/containers/monerod:${MONERO_VERSION:-0.18.0.0}
     environment:
       NETWORK: regtest
       MONEROD_RPC_PORT: 18081
@@ -12,7 +12,7 @@ services:
       - 18081:18081
 
   monero-wallet-rpc:
-    image: ghcr.io/farcaster-project/containers/monero-wallet-rpc:${MONERO_VERSION:-0.18.1.2}
+    image: ghcr.io/farcaster-project/containers/monero-wallet-rpc:${MONERO_VERSION:-0.18.0.0}
     environment:
       MONERO_DAEMON_ADDRESS: monerod:18081
       MONERO_DAEMON_HOST: monerod:18081
@@ -23,7 +23,7 @@ services:
       - 18083:18083
 
   monerod-rpc-authentication:
-    image: ghcr.io/farcaster-project/containers/monerod:${MONERO_VERSION:-0.18.1.2}
+    image: ghcr.io/farcaster-project/containers/monerod:${MONERO_VERSION:-0.18.0.0}
     depends_on:
       - "monerod"
     ports:
@@ -39,7 +39,7 @@ services:
               --fixed-difficulty 1
 
   monero-wallet-rpc-authentication:
-    image: ghcr.io/farcaster-project/containers/monero-wallet-rpc:${MONERO_VERSION:-0.18.1.2}
+    image: ghcr.io/farcaster-project/containers/monero-wallet-rpc:${MONERO_VERSION:-0.18.0.0}
     depends_on:
       - "monerod"
     ports:

diff --git a/tests/rpc.rs b/tests/rpc.rs
@@ -63,6 +63,7 @@ async fn main_functional_test() {
     clients_tests::all_clients_interaction::run().await;
 }
 
+#[cfg(feature = "rpc_authentication")]
 fn setup_rpc_auth_client(username: &str, password: &str, port: u32) -> RpcClient {
     let whost = env::var("MONERO_WALLET_HOST_1").unwrap_or_else(|_| "localhost".into());
     let rpc_credentials = RpcAuthentication::Credentials {
@@ -76,6 +77,7 @@ fn setup_rpc_auth_client(username: &str, password: &str, port: u32) -> RpcClient
 }
 
 #[tokio::test]
+#[cfg(feature = "rpc_authentication")]
 async fn test_daemon_rpc_auth() {
     let rpc_client = setup_rpc_auth_client("foo", "bar", 18085).daemon();
     let daemon_transactions = rpc_client.get_block_count().await;
@@ -84,6 +86,7 @@ async fn test_daemon_rpc_auth() {
 }
 
 #[tokio::test]
+#[cfg(feature = "rpc_authentication")]
 async fn test_daemon_rpc_auth_fail() {
     let rpc_client = setup_rpc_auth_client("invalid", "bar", 18085).daemon();
     let daemon_transactions = rpc_client.get_block_count().await;
@@ -92,6 +95,7 @@ async fn test_daemon_rpc_auth_fail() {
 }
 
 #[tokio::test]
+#[cfg(feature = "rpc_authentication")]
 async fn test_daemon_rpc_rpc_auth() {
     let rpc_client = setup_rpc_auth_client("foo", "bar", 18085).daemon_rpc();
     let transactions = vec![Hash::from_low_u64_be(1)];
@@ -103,6 +107,7 @@ async fn test_daemon_rpc_rpc_auth() {
 }
 
 #[tokio::test]
+#[cfg(feature = "rpc_authentication")]
 async fn test_rpc_auth() {
     let rpc_client = setup_rpc_auth_client("foo", "bar", 18084).wallet();
     assert!(rpc_client.get_version().await.is_ok());
@@ -112,6 +117,7 @@ async fn test_rpc_auth() {
 }
 
 #[tokio::test]
+#[cfg(feature = "rpc_authentication")]
 async fn test_rpc_auth_fail() {
     let rpc_client = setup_rpc_auth_client("invalid", "auth", 18084).wallet();