Merge branch 'dev' of github.com:zingolabs/zaino into compact_block_c…

…ache_pt1
zingolabs · Jan 14, 2025 · 3e12e92 · 3e12e92
2 parents 4f08cf9 + f33b067
commit 3e12e92
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/zaino-fetch/src/jsonrpc/response.rs b/zaino-fetch/src/jsonrpc/response.rs
@@ -502,6 +502,9 @@ impl<'de> serde::Deserialize<'de> for GetTransactionResponse {
             // Convert `mempool tx height = -1` (Zcashd) to `None` (Zebrad).
             let height = match tx_value.get("height").and_then(|v| v.as_i64()) {
                 Some(-1) | None => None,
+                Some(h) if h < -1 => {
+                    return Err(serde::de::Error::custom("invalid height returned in block"))
+                }
                 Some(h) => Some(h as i32),
             };
 

diff --git a/zaino-serve/src/server/director.rs b/zaino-serve/src/server/director.rs
@@ -59,8 +59,6 @@ impl ServerStatus {
 pub struct Server {
     /// Listens for incoming gRPC requests over HTTP.
     tcp_ingestor: Option<TcpIngestor>,
-    /// Chain fetch service subscriber.
-    _service_subscriber: IndexerSubscriber<FetchServiceSubscriber>,
     /// Dynamically sized pool of workers.
     worker_pool: WorkerPool,
     /// Request queue.
@@ -127,7 +125,6 @@ impl Server {
         )
         .await;
         Ok(Server {
-            _service_subscriber: service_subscriber,
             tcp_ingestor,
             worker_pool,
             request_queue,

diff --git a/zaino-serve/src/server/worker.rs b/zaino-serve/src/server/worker.rs
@@ -33,8 +33,6 @@ pub(crate) struct Worker {
     queue: QueueReceiver<ZingoIndexerRequest>,
     /// Used to requeue requests.
     requeue: QueueSender<ZingoIndexerRequest>,
-    /// Chain fetch service subscriber.
-    _service_subscriber: IndexerSubscriber<FetchServiceSubscriber>,
     /// Service status.
     _service_status: AtomicStatus,
     /// gRPC client used for processing requests received over http.
@@ -65,7 +63,6 @@ impl Worker {
             _worker_id,
             queue,
             requeue,
-            _service_subscriber: service_subscriber,
             _service_status: service_status,
             grpc_client,
             atomic_status,