Refurbish indexerconfig

integration-tests/tests/chain_cache.rs

@@ -9,7 +9,6 @@ async fn create_test_manager_and_connector(
     chain_cache: Option<std::path::PathBuf>,
     enable_zaino: bool,
     zaino_no_sync: bool,
-    zaino_no_db: bool,
     enable_clients: bool,
 ) -> (TestManager, JsonRpSeeConnector) {
     let test_manager = TestManager::launch(
@@ -19,18 +18,17 @@ async fn create_test_manager_and_connector(
         activation_heights,
         chain_cache,
         enable_zaino,
-        false,
-        false,
+        false, //enable_zaino_jsonrpc_server: bool,
+        false, //enable_zaino_jsonrpc_server_cookie_auth: bool,
         zaino_no_sync,
-        zaino_no_db,
         enable_clients,
     )
     .await
     .unwrap();
 
     let json_service = JsonRpSeeConnector::new_with_basic_auth(
         test_node_and_return_url(
-            test_manager.zebrad_rpc_listen_address,
+            test_manager.full_node_rpc_listen_address,
             false,
             None,
             Some("xxxxxx".to_string()),
@@ -78,7 +76,6 @@ mod chain_query_interface {
         chain_cache: Option<std::path::PathBuf>,
         enable_zaino: bool,
         zaino_no_sync: bool,
-        zaino_no_db: bool,
         enable_clients: bool,
     ) -> (
         TestManager,
@@ -122,7 +119,6 @@ mod chain_query_interface {
             chain_cache.clone(),
             enable_zaino,
             zaino_no_sync,
-            zaino_no_db,
             enable_clients,
         )
         .await;
@@ -148,8 +144,8 @@ mod chain_query_interface {
                         debug_stop_at_height: None,
                         debug_validity_check_interval: None,
                     },
-                    test_manager.zebrad_rpc_listen_address,
-                    test_manager.zebrad_grpc_listen_address,
+                    test_manager.full_node_rpc_listen_address,
+                    test_manager.full_node_grpc_listen_address,
                     false,
                     None,
                     None,
@@ -169,7 +165,6 @@ mod chain_query_interface {
                     },
                     network.into(),
                     true,
-                    true,
                 ))
                 .await
                 .unwrap();
@@ -186,7 +181,6 @@ mod chain_query_interface {
                     db_version: 1,
                     network: zaino_common::Network::Regtest(activation_heights),
                     no_sync: false,
-                    no_db: false,
                 };
                 let chain_index = NodeBackedChainIndex::new(
                     ValidatorConnector::State(chain_index::source::State {
@@ -223,7 +217,6 @@ mod chain_query_interface {
                     db_version: 1,
                     network: zaino_common::Network::Regtest(activation_heights),
                     no_sync: false,
-                    no_db: false,
                 };
                 let chain_index = NodeBackedChainIndex::new(
                     ValidatorConnector::Fetch(json_service.clone()),
@@ -251,7 +244,7 @@ mod chain_query_interface {
 
     async fn get_block_range(validator: &ValidatorKind) {
         let (test_manager, _json_service, _option_state_service, _chain_index, indexer) =
-            create_test_manager_and_chain_index(validator, None, false, false, false, false).await;
+            create_test_manager_and_chain_index(validator, None, false, false, false).await;
 
         // this delay had to increase. Maybe we tweak sync loop rerun time?
         test_manager.generate_blocks_with_delay(5).await;
@@ -293,7 +286,7 @@ mod chain_query_interface {
 
     async fn find_fork_point(validator: &ValidatorKind) {
         let (test_manager, _json_service, _option_state_service, _chain_index, indexer) =
-            create_test_manager_and_chain_index(validator, None, false, false, false, false).await;
+            create_test_manager_and_chain_index(validator, None, false, false, false).await;
 
         // this delay had to increase. Maybe we tweak sync loop rerun time?
         test_manager.generate_blocks_with_delay(5).await;
@@ -325,7 +318,7 @@ mod chain_query_interface {
 
     async fn get_raw_transaction(validator: &ValidatorKind) {
         let (test_manager, _json_service, _option_state_service, _chain_index, indexer) =
-            create_test_manager_and_chain_index(validator, None, false, false, false, false).await;
+            create_test_manager_and_chain_index(validator, None, false, false, false).await;
 
         // this delay had to increase. Maybe we tweak sync loop rerun time?
         test_manager.generate_blocks_with_delay(5).await;
@@ -379,7 +372,7 @@ mod chain_query_interface {
 
     async fn get_transaction_status(validator: &ValidatorKind) {
         let (test_manager, _json_service, _option_state_service, _chain_index, indexer) =
-            create_test_manager_and_chain_index(validator, None, false, false, false, false).await;
+            create_test_manager_and_chain_index(validator, None, false, false, false).await;
         let snapshot = indexer.snapshot_nonfinalized_state();
         // I don't know where this second block is generated. Somewhere in the
         // guts of create_test_manager_and_chain_index
@@ -419,7 +412,7 @@ mod chain_query_interface {
 
     async fn sync_large_chain(validator: &ValidatorKind) {
         let (test_manager, json_service, _option_state_service, _chain_index, indexer) =
-            create_test_manager_and_chain_index(validator, None, false, false, false, false).await;
+            create_test_manager_and_chain_index(validator, None, false, false, false).await;
 
         // this delay had to increase. Maybe we tweak sync loop rerun time?
         test_manager.generate_blocks_with_delay(5).await;