Merge pull request #36 from zancas/darkside_reloaded_2

guess that we want &self, and toss in implementations, could maybe be…

Author: fluidvanadium

darkside-tests/src/chain_generics.rs

@@ -61,7 +61,7 @@ pub(crate) mod conduct_chain {
             elf
         }
 
-        fn lightserver_uri() -> Option<Uri> {
+        fn lightserver_uri(&self) -> Option<http::Uri> {
             Some(self.client_builder.server_id.clone())
         }
 
@@ -87,10 +87,11 @@ pub(crate) mod conduct_chain {
         }
 
         async fn bump_chain(&mut self) {
-            let height_before = zingolib::grpc_connector::get_latest_block(self.lightserver_uri())
-                .await
-                .unwrap()
-                .height;
+            let height_before =
+                zingolib::grpc_connector::get_latest_block(self.lightserver_uri().unwrap())
+                    .await
+                    .unwrap()
+                    .height;
 
             let blocks_to_add = 1;
 

zingolib/src/lightclient/send.rs

@@ -238,7 +238,7 @@ pub mod send_with_proposal {
                                 match crate::utils::conversion::txid_from_hex_encoded_str(
                                     serverz_txid_string.as_str(),
                                 ) {
-                                    Ok(reported_txid) => {
+                                    Ok(_reported_txid) => {
                                         // happens during darkside tests
                                         // If this option is enabled, the LightClient will replace outgoing TxId records with the TxId picked by the server. necessary for darkside.
                                         // #[cfg(feature = "darkside_tests")]

zingolib/src/testutils/chain_generics/conduct_chain.rs

@@ -17,7 +17,7 @@ pub trait ConductChain {
     async fn setup() -> Self;
 
     /// used to connect to server via grpc
-    fn lightserver_uri() -> Option<Uri>;
+    fn lightserver_uri(&self) -> Option<http::Uri>;
 
     /// builds a faucet (funded from mining)
     async fn create_faucet(&mut self) -> LightClient;

zingolib/src/testutils/chain_generics/libtonode.rs

@@ -66,4 +66,8 @@ impl ConductChain for LibtonodeEnvironment {
             start_height + 1
         );
     }
+
+    fn lightserver_uri(&self) -> Option<http::Uri> {
+        todo!()
+    }
 }

zingolib/src/testutils/chain_generics/live_chain.rs

@@ -25,4 +25,8 @@ impl ConductChain for LiveChain {
         // average block time is 75 seconds. we do this twice here to insist on a new block
         tokio::time::sleep(std::time::Duration::from_secs(150)).await;
     }
+
+    fn lightserver_uri(&self) -> Option<http::Uri> {
+        todo!()
+    }
 }

zingolib/src/testutils/chain_generics/with_assertions.rs

@@ -77,10 +77,12 @@ where
         .expect("record is ok");
 
     dbg!(
-        crate::grpc_connector::get_latest_block(sender.config.lightwalletd_uri.read().unwrap())
-            .await
-            .unwrap()
-            .height
+        crate::grpc_connector::get_latest_block(
+            sender.config.lightwalletd_uri.read().unwrap().to_owned()
+        )
+        .await
+        .unwrap()
+        .height
     );
 
     lookup_statuses(sender, txids.clone()).await.map(|status| {