Move connect_to_lightwalletd to Server::connect_direct

src/commands/enhance.rs

@@ -21,7 +21,7 @@ use zcash_protocol::consensus::{BlockHeight, BranchId, Network};
 
 use crate::{
     data::{get_db_paths, get_wallet_network},
-    remote::{connect_to_lightwalletd, Servers},
+    remote::Servers,
 };
 
 // Options accepted for the `enhance` command
@@ -89,7 +89,7 @@ impl Command {
             anyhow!("Chain height must be available to perform transaction enhancement.")
         })?;
 
-        let mut client = connect_to_lightwalletd(self.server.pick(params)?).await?;
+        let mut client = self.server.pick(params)?.connect_direct().await?;
 
         let mut satisfied_requests = BTreeSet::new();
         loop {

src/commands/import_ufvk.rs

@@ -10,11 +10,7 @@ use zcash_client_sqlite::WalletDb;
 use zcash_keys::keys::UnifiedFullViewingKey;
 use zcash_primitives::consensus;
 
-use crate::{
-    data::get_db_paths,
-    error,
-    remote::{connect_to_lightwalletd, Servers},
-};
+use crate::{data::get_db_paths, error, remote::Servers};
 
 // Options accepted for the `import-ufvk` command
 #[derive(Debug, Options)]
@@ -56,7 +52,7 @@ impl Command {
         let birthday = {
             // Fetch the tree state corresponding to the last block prior to the wallet's
             // birthday height. NOTE: THIS APPROACH LEAKS THE BIRTHDAY TO THE SERVER!
-            let mut client = connect_to_lightwalletd(self.server.pick(params)?).await?;
+            let mut client = self.server.pick(params)?.connect_direct().await?;
             let request = service::BlockId {
                 height: (self.birthday - 1).into(),
                 ..Default::default()

src/commands/init.rs

@@ -15,7 +15,7 @@ use zcash_primitives::consensus::{self, Parameters};
 use crate::{
     data::{get_db_paths, init_wallet_config, Network},
     error,
-    remote::{connect_to_lightwalletd, Servers},
+    remote::Servers,
 };
 
 // Options accepted for the `init` command
@@ -50,7 +50,7 @@ impl Command {
         let params = consensus::Network::from(opts.network);
 
         // Get the current chain height (for the wallet's birthday).
-        let mut client = connect_to_lightwalletd(opts.server.pick(params)?).await?;
+        let mut client = opts.server.pick(params)?.connect_direct().await?;
         let birthday = if let Some(birthday) = opts.birthday {
             birthday
         } else {

src/commands/reset.rs

@@ -3,7 +3,7 @@ use gumdrop::Options;
 
 use crate::{
     data::{erase_wallet_state, read_config},
-    remote::{connect_to_lightwalletd, Servers},
+    remote::Servers,
 };
 
 // Options accepted for the `reset` command
@@ -27,7 +27,7 @@ impl Command {
         let params = keys.network();
 
         // Connect to the client (for re-initializing the wallet).
-        let client = connect_to_lightwalletd(self.server.pick(params)?).await?;
+        let client = self.server.pick(params)?.connect_direct().await?;
 
         // Erase the wallet state (excluding key material).
         erase_wallet_state(wallet_dir.as_ref()).await;

src/commands/send.rs

@@ -26,7 +26,7 @@ use crate::{
     commands::propose::{parse_fee_rule, FeeRule},
     data::{get_db_paths, read_config},
     error,
-    remote::{connect_to_lightwalletd, Servers},
+    remote::Servers,
     MIN_CONFIRMATIONS,
 };
 
@@ -87,7 +87,7 @@ impl Command {
         )
         .map_err(error::Error::from)?;
 
-        let mut client = connect_to_lightwalletd(self.server.pick(params)?).await?;
+        let mut client = self.server.pick(params)?.connect_direct().await?;
 
         // Create the transaction.
         println!("Creating transaction...");

src/commands/sync.rs

@@ -27,7 +27,7 @@ use zcash_protocol::consensus::{BlockHeight, Parameters};
 use crate::{
     data::{get_block_path, get_db_paths, get_wallet_network},
     error,
-    remote::{connect_to_lightwalletd, Servers},
+    remote::Servers,
     ShutdownListener,
 };
 
@@ -80,7 +80,7 @@ impl Command {
         let fsblockdb_root = fsblockdb_root.as_path();
         let mut db_cache = FsBlockDb::for_path(fsblockdb_root).map_err(error::Error::from)?;
         let mut db_data = WalletDb::for_path(db_data, params)?;
-        let mut client = connect_to_lightwalletd(self.server.pick(params)?).await?;
+        let mut client = self.server.pick(params)?.connect_direct().await?;
 
         #[cfg(any(feature = "transparent-inputs", feature = "tui"))]
         let wallet_birthday = db_data

src/remote.rs

@@ -135,25 +135,23 @@ impl<'a> Server<'a> {
             self.port
         )
     }
-}
 
-pub(crate) async fn connect_to_lightwalletd(
-    server: &Server<'_>,
-) -> Result<CompactTxStreamerClient<Channel>, anyhow::Error> {
-    info!("Connecting to {}", server);
+    pub(crate) async fn connect_direct(&self) -> anyhow::Result<CompactTxStreamerClient<Channel>> {
+        info!("Connecting to {}", self);
 
-    let channel = Channel::from_shared(server.endpoint())?;
+        let channel = Channel::from_shared(self.endpoint())?;
 
-    let channel = if server.use_tls() {
-        let tls = ClientTlsConfig::new()
-            .domain_name(server.host.to_string())
-            .with_webpki_roots();
-        channel.tls_config(tls)?
-    } else {
-        channel
-    };
+        let channel = if self.use_tls() {
+            let tls = ClientTlsConfig::new()
+                .domain_name(self.host.to_string())
+                .with_webpki_roots();
+            channel.tls_config(tls)?
+        } else {
+            channel
+        };
 
-    Ok(CompactTxStreamerClient::new(channel.connect().await?))
+        Ok(CompactTxStreamerClient::new(channel.connect().await?))
+    }
 }
 
 pub(crate) async fn tor_client<P: AsRef<Path>>(