From be978f3667e66cd6d8730fe762f8526146fa7fc0 Mon Sep 17 00:00:00 2001
From: idky137 <idky137@gmail.com>
Date: Wed, 30 Oct 2024 17:12:31 +0000
Subject: [PATCH] fixed block order bug

---
 zaino-serve/src/rpc/service.rs | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/zaino-serve/src/rpc/service.rs b/zaino-serve/src/rpc/service.rs
index 7fa2fb5..3d90072 100644
--- a/zaino-serve/src/rpc/service.rs
+++ b/zaino-serve/src/rpc/service.rs
@@ -223,15 +223,23 @@ impl CompactTxStreamer for GrpcClient {
                 .end
                 .map(|e| e.height as u32)
                 .ok_or(tonic::Status::invalid_argument("End block not specified"))?;
-            if start > end {
+            let rev_order = if start > end {
                 (start, end) = (end, start);
-            }
+                true
+            } else {
+                false
+            };
             println!("[TEST] Fetching blocks in range: {}-{}.", start, end);
             let (channel_tx, channel_rx) = tokio::sync::mpsc::channel(32);
             tokio::spawn(async move {
                 // NOTE: This timeout is so slow due to the blockcache not being implemented. This should be reduced to 30s once functionality is in place.
                 let timeout = timeout(std::time::Duration::from_secs(120), async {
-                    for height in (start..=end).rev() {
+                    for height in start..=end {
+                        let height = if rev_order {
+                            end - (height - start)
+                        } else {
+                            height
+                        };
                         println!("[TEST] Fetching block at height: {}.", height);
                         let compact_block = get_block_from_node(&zebrad_uri, &height).await;
                         match compact_block {
@@ -308,14 +316,22 @@ impl CompactTxStreamer for GrpcClient {
                 .end
                 .map(|e| e.height as u32)
                 .ok_or(tonic::Status::invalid_argument("End block not specified"))?;
-            if start > end {
+            let rev_order = if start > end {
                 (start, end) = (end, start);
-            }
+                true
+            } else {
+                false
+            };
             let (channel_tx, channel_rx) = tokio::sync::mpsc::channel(32);
             tokio::spawn(async move {
                 // NOTE: This timeout is so slow due to the blockcache not being implemented. This should be reduced to 30s once functionality is in place.
                 let timeout = timeout(std::time::Duration::from_secs(120), async {
                     for height in start..=end {
+                        let height = if rev_order {
+                            end - (height - start)
+                        } else {
+                            height
+                        };
                         let compact_block = get_nullifiers_from_node(&zebrad_uri, &height).await;
                         match compact_block {
                             Ok(block) => {