simplified broadcast fn

darkside-tests/src/chain_generics.rs

@@ -35,7 +35,7 @@ pub(crate) mod conduct_chain {
     //! known issues include
     //!   - transparent sends do not work
     //!   - txids are regenerated randomly. zingo can optionally accept_server_txid
-    //! these tests cannot portray the full range of network weather.
+    //!   - these tests cannot portray the full range of network weather.
 
     use zingolib::lightclient::LightClient;
     use zingolib::testutils::chain_generics::conduct_chain::ConductChain;

zingolib/src/lightclient/send.rs

@@ -97,12 +97,7 @@ pub mod send_with_proposal {
                 .send_to_addresses_inner(
                     build_result.transaction(),
                     submission_height,
-                    |transaction_bytes| {
-                        crate::grpc_connector::send_transaction(
-                            self.get_server_uri(),
-                            transaction_bytes,
-                        )
-                    },
+                    self.get_server_uri(),
                 )
                 .await
                 .map_err(CompleteAndBroadcastError::Broadcast)

zingolib/src/wallet/send.rs

@@ -1,9 +1,8 @@
 //! This mod contains pieces of the impl LightWallet that are invoked during a send.
 use crate::wallet::now;
 
-use futures::Future;
-
 use hdwallet::traits::Deserialize as _;
+use http::Uri;
 use log::error;
 use zcash_client_backend::proposal::Proposal;
 use zcash_keys::keys::UnifiedSpendingKey;
@@ -193,16 +192,13 @@ impl LightWallet {
         )
     }
 
-    pub(crate) async fn send_to_addresses_inner<F, Fut>(
+    pub(crate) async fn send_to_addresses_inner(
         &self,
         transaction: &Transaction,
         submission_height: BlockHeight,
-        broadcast_fn: F,
+        server_uri: Uri,
     ) -> Result<TxId, String>
-    where
-        F: Fn(Box<[u8]>) -> Fut,
-        Fut: Future<Output = Result<String, String>>,
-    {
+where {
         {
             self.send_progress.write().await.is_send_in_progress = false;
         }
@@ -212,7 +208,7 @@ impl LightWallet {
         transaction.write(&mut raw_transaction).unwrap();
 
         let serverz_transaction_id =
-            broadcast_fn(raw_transaction.clone().into_boxed_slice()).await?;
+            crate::grpc_connector::send_transaction(server_uri, raw_transaction.into()).await?;
 
         {
             let price = self.price.read().await.clone();