Chain index integration

integration-tests/tests/chain_cache.rs

@@ -198,7 +198,7 @@ mod chain_query_interface {
                 )
                 .await
                 .unwrap();
-                let index_reader = chain_index.subscriber().await;
+                let index_reader = chain_index.subscriber();
                 tokio::time::sleep(Duration::from_secs(3)).await;
 
                 (
@@ -231,7 +231,7 @@ mod chain_query_interface {
                 )
                 .await
                 .unwrap();
-                let index_reader = chain_index.subscriber().await;
+                let index_reader = chain_index.subscriber();
                 tokio::time::sleep(Duration::from_secs(3)).await;
 
                 (test_manager, json_service, None, chain_index, index_reader)

integration-tests/tests/fetch_service.rs

@@ -9,8 +9,8 @@ use zaino_proto::proto::service::{
     TransparentAddressBlockFilter, TxFilter,
 };
 use zaino_state::{
-    BackendType, FetchService, FetchServiceConfig, FetchServiceSubscriber, LightWalletIndexer,
-    StatusType, ZcashIndexer, ZcashService as _,
+    BackendType, ChainIndex as _, FetchService, FetchServiceConfig, FetchServiceSubscriber,
+    LightWalletIndexer, StatusType, ZcashIndexer, ZcashService as _,
 };
 use zaino_testutils::Validator as _;
 use zaino_testutils::{TestManager, ValidatorKind};
@@ -301,23 +301,28 @@ pub async fn test_get_mempool_info(validator: &ValidatorKind) {
     let info = fetch_service_subscriber.get_mempool_info().await.unwrap();
 
     // Derive expected values directly from the current mempool contents.
-    let entries = fetch_service_subscriber.mempool.get_mempool().await;
+
+    let keys = fetch_service_subscriber
+        .indexer
+        .get_mempool_txids()
+        .await
+        .unwrap();
+
+    let values = fetch_service_subscriber
+        .indexer
+        .get_mempool_transactions(Vec::new())
+        .await
+        .unwrap();
 
     // Size
-    assert_eq!(info.size, entries.len() as u64);
+    assert_eq!(info.size, values.len() as u64);
     assert!(info.size >= 1);
 
     // Bytes: sum of SerializedTransaction lengths
-    let expected_bytes: u64 = entries
-        .iter()
-        .map(|(_, value)| value.serialized_tx.as_ref().as_ref().len() as u64)
-        .sum();
+    let expected_bytes: u64 = values.iter().map(|entry| entry.len() as u64).sum();
 
     // Key heap bytes: sum of txid String capacities
-    let expected_key_heap_bytes: u64 = entries
-        .iter()
-        .map(|(key, _)| key.txid.capacity() as u64)
-        .sum();
+    let expected_key_heap_bytes: u64 = keys.iter().map(|key| key.0.len() as u64).sum();
 
     let expected_usage = expected_bytes.saturating_add(expected_key_heap_bytes);
 
@@ -478,12 +483,12 @@ async fn fetch_service_get_address_tx_ids(validator: &ValidatorKind) {
     test_manager.local_net.generate_blocks(1).await.unwrap();
     tokio::time::sleep(tokio::time::Duration::from_secs(1)).await;
 
-    let chain_height = fetch_service_subscriber
-        .block_cache
-        .get_chain_height()
-        .await
-        .unwrap()
-        .0;
+    let chain_height: u32 = fetch_service_subscriber
+        .indexer
+        .snapshot_nonfinalized_state()
+        .best_tip
+        .height
+        .into();
     dbg!(&chain_height);
 
     let fetch_service_txids = fetch_service_subscriber
@@ -994,12 +999,12 @@ async fn fetch_service_get_taddress_txids(validator: &ValidatorKind) {
     test_manager.local_net.generate_blocks(1).await.unwrap();
     tokio::time::sleep(tokio::time::Duration::from_secs(1)).await;
 
-    let chain_height = fetch_service_subscriber
-        .block_cache
-        .get_chain_height()
-        .await
-        .unwrap()
-        .0;
+    let chain_height: u32 = fetch_service_subscriber
+        .indexer
+        .snapshot_nonfinalized_state()
+        .best_tip
+        .height
+        .into();
     dbg!(&chain_height);
 
     let block_filter = TransparentAddressBlockFilter {

integration-tests/tests/json_server.rs

@@ -3,8 +3,8 @@
 use zaino_common::network::ActivationHeights;
 use zaino_common::{DatabaseConfig, ServiceConfig, StorageConfig};
 use zaino_state::{
-    BackendType, FetchService, FetchServiceConfig, FetchServiceSubscriber, ZcashIndexer,
-    ZcashService as _,
+    BackendType, ChainIndex, FetchService, FetchServiceConfig, FetchServiceSubscriber,
+    ZcashIndexer, ZcashService as _,
 };
 use zaino_testutils::{from_inputs, Validator as _};
 use zaino_testutils::{TestManager, ValidatorKind};
@@ -585,11 +585,11 @@ async fn get_address_tx_ids_inner() {
     tokio::time::sleep(tokio::time::Duration::from_secs(1)).await;
 
     let chain_height = zcashd_subscriber
-        .block_cache
-        .get_chain_height()
-        .await
-        .unwrap()
-        .0;
+        .indexer
+        .snapshot_nonfinalized_state()
+        .best_tip
+        .height
+        .into();
     dbg!(&chain_height);
 
     let zcashd_txids = zcashd_subscriber

integration-tests/tests/state_service.rs

@@ -1,6 +1,6 @@
 use zaino_common::network::ActivationHeights;
 use zaino_common::{DatabaseConfig, ServiceConfig, StorageConfig};
-use zaino_state::BackendType;
+use zaino_state::{BackendType, ChainIndex as _};
 use zaino_state::{
     FetchService, FetchServiceConfig, FetchServiceSubscriber, LightWalletIndexer, StateService,
     StateServiceConfig, StateServiceSubscriber, ZcashIndexer, ZcashService as _,
@@ -857,11 +857,12 @@ async fn state_service_get_address_tx_ids(validator: &ValidatorKind) {
     tokio::time::sleep(tokio::time::Duration::from_secs(1)).await;
 
     let chain_height = fetch_service_subscriber
-        .block_cache
-        .get_chain_height()
-        .await
-        .unwrap()
-        .0;
+        .indexer
+        .snapshot_nonfinalized_state()
+        .best_tip
+        .height
+        .into();
+
     dbg!(&chain_height);
 
     let fetch_service_txids = fetch_service_subscriber