Merge remote-tracking branch 'zingolabs/dev' into darkside_reloaded_2

Author: zancas

Cargo.lock

@@ -91,10 +91,10 @@ tokio = "1"
 tokio-rustls = "0.26"
 tonic = {version = "0.12", features = ["tls", "tls-roots", "tls-webpki-roots"]}
 tonic-build = "0.12"
-tower = { version = "0.4" }
+tower = { version = "0.5" }
 tracing = "0.1"
 tracing-subscriber = "0.3"
-webpki-roots = "0.25"
+webpki-roots = "0.26"
 
 # Parallel processing
 crossbeam-channel = "0.5"

Cargo.toml

@@ -59,7 +59,7 @@ async fn reorg_changes_incoming_tx_height() {
         }
     );
 
-    let before_reorg_transactions = light_client.sorted_value_transfers(true).await.0;
+    let before_reorg_transactions = light_client.sorted_value_transfers(true).await;
 
     assert_eq!(before_reorg_transactions.len(), 1);
     assert_eq!(
@@ -94,7 +94,7 @@ async fn reorg_changes_incoming_tx_height() {
         }
     );
 
-    let after_reorg_transactions = light_client.sorted_value_transfers(true).await.0;
+    let after_reorg_transactions = light_client.sorted_value_transfers(true).await;
 
     assert_eq!(after_reorg_transactions.len(), 1);
     assert_eq!(
@@ -215,7 +215,7 @@ async fn reorg_changes_incoming_tx_index() {
         }
     );
 
-    let before_reorg_transactions = light_client.sorted_value_transfers(true).await.0;
+    let before_reorg_transactions = light_client.sorted_value_transfers(true).await;
 
     assert_eq!(before_reorg_transactions.len(), 1);
     assert_eq!(
@@ -250,7 +250,7 @@ async fn reorg_changes_incoming_tx_index() {
         }
     );
 
-    let after_reorg_transactions = light_client.sorted_value_transfers(true).await.0;
+    let after_reorg_transactions = light_client.sorted_value_transfers(true).await;
 
     assert_eq!(after_reorg_transactions.len(), 1);
     assert_eq!(
@@ -370,7 +370,7 @@ async fn reorg_expires_incoming_tx() {
         }
     );
 
-    let before_reorg_transactions = light_client.sorted_value_transfers(true).await.0;
+    let before_reorg_transactions = light_client.sorted_value_transfers(true).await;
 
     assert_eq!(before_reorg_transactions.len(), 1);
     assert_eq!(
@@ -405,7 +405,7 @@ async fn reorg_expires_incoming_tx() {
         }
     );
 
-    let after_reorg_transactions = light_client.sorted_value_transfers(true).await.0;
+    let after_reorg_transactions = light_client.sorted_value_transfers(true).await;
 
     assert_eq!(after_reorg_transactions.len(), 0);
 }
@@ -548,7 +548,7 @@ async fn reorg_changes_outgoing_tx_height() {
         }
     );
 
-    let before_reorg_transactions = light_client.sorted_value_transfers(true).await.0;
+    let before_reorg_transactions = light_client.sorted_value_transfers(true).await;
 
     assert_eq!(before_reorg_transactions.len(), 1);
     assert_eq!(
@@ -662,7 +662,7 @@ async fn reorg_changes_outgoing_tx_height() {
         expected_after_reorg_balance
     );
 
-    let after_reorg_transactions = light_client.sorted_value_transfers(true).await.0;
+    let after_reorg_transactions = light_client.sorted_value_transfers(true).await;
 
     assert_eq!(after_reorg_transactions.len(), 3);
 
@@ -787,7 +787,7 @@ async fn reorg_expires_outgoing_tx_height() {
     light_client.do_sync(true).await.unwrap();
     assert_eq!(light_client.do_balance().await, expected_initial_balance);
 
-    let before_reorg_transactions = light_client.sorted_value_transfers(true).await.0;
+    let before_reorg_transactions = light_client.sorted_value_transfers(true).await;
 
     assert_eq!(before_reorg_transactions.len(), 1);
     assert_eq!(
@@ -873,7 +873,7 @@ async fn reorg_expires_outgoing_tx_height() {
     // sent transaction was never mined and has expired.
     assert_eq!(light_client.do_balance().await, expected_initial_balance);
 
-    let after_reorg_transactions = light_client.sorted_value_transfers(true).await.0;
+    let after_reorg_transactions = light_client.sorted_value_transfers(true).await;
 
     assert_eq!(after_reorg_transactions.len(), 1);
 
@@ -965,7 +965,7 @@ async fn reorg_changes_outgoing_tx_index() {
         }
     );
 
-    let before_reorg_transactions = light_client.sorted_value_transfers(true).await.0;
+    let before_reorg_transactions = light_client.sorted_value_transfers(true).await;
 
     assert_eq!(before_reorg_transactions.len(), 1);
     assert_eq!(