Fix broken imports

Author: MitchTurner

crates/fuel-core/src/service/config.rs

@@ -82,7 +82,7 @@ pub struct Config {
     pub block_producer: fuel_core_producer::Config,
     pub gas_price_config: GasPriceConfig,
     #[cfg(feature = "rpc")]
-    pub rpc_config: fuel_block_aggregator_api::integration::Config,
+    pub rpc_config: fuel_core_block_aggregator_api::integration::Config,
     pub da_compression: DaCompressionMode,
     pub block_importer: fuel_core_importer::Config,
     #[cfg(feature = "relayer")]
@@ -170,7 +170,7 @@ impl Config {
         const MAX_TXS_TTL: Duration = Duration::from_secs(60 * 100000000);
 
         #[cfg(feature = "rpc")]
-        let rpc_config = fuel_block_aggregator_api::integration::Config {
+        let rpc_config = fuel_core_block_aggregator_api::integration::Config {
             addr: free_local_addr(),
         };
 

crates/fuel-core/src/service/sub_services.rs

@@ -9,7 +9,7 @@ use crate::service::adapters::consensus_module::poa::pre_confirmation_signature:
     tx_receiver::PreconfirmationsReceiver,
 };
 #[cfg(feature = "rpc")]
-use fuel_block_aggregator_api::{
+use fuel_core_block_aggregator_api::{
     blocks::importer_and_db_source::serializer_adapter::SerializerAdapter,
     db::storage_db::StorageDB,
 };
@@ -466,7 +466,7 @@ pub fn init_sub_services(
         let serializer = SerializerAdapter;
         let onchain_db = database.on_chain().clone();
         let importer = importer_adapter.events_shared_result();
-        fuel_block_aggregator_api::integration::new_service(
+        fuel_core_block_aggregator_api::integration::new_service(
             &block_aggregator_config,
             db_adapter,
             serializer,

tests/tests/rpc.rs

@@ -1,16 +1,16 @@
 #![allow(non_snake_case)]
 
-use fuel_block_aggregator_api::api::protobuf_adapter::{
-    block_aggregator_client::BlockAggregatorClient,
-    block_response::Payload,
-};
 use fuel_core::{
     database::Database,
     service::{
         Config,
         FuelService,
     },
 };
+use fuel_core_block_aggregator_api::api::protobuf_adapter::{
+    block_aggregator_client::BlockAggregatorClient,
+    block_response::Payload,
+};
 use fuel_core_client::client::FuelClient;
 use fuel_core_types::{
     blockchain::block::Block,
@@ -47,10 +47,11 @@ async fn get_block_range__can_get_serialized_block_from_rpc() {
     let header = expected_block.header;
 
     // when
-    let request = fuel_block_aggregator_api::api::protobuf_adapter::BlockRangeRequest {
-        start: 1,
-        end: 1,
-    };
+    let request =
+        fuel_core_block_aggregator_api::api::protobuf_adapter::BlockRangeRequest {
+            start: 1,
+            end: 1,
+        };
     let actual_bytes = if let Some(Payload::Literal(block)) = rpc_client
         .get_block_range(request)
         .await
@@ -102,7 +103,8 @@ async fn get_block_height__can_get_value_from_rpc() {
         .expect("could not connect to server");
 
     // when
-    let request = fuel_block_aggregator_api::api::protobuf_adapter::BlockHeightRequest {};
+    let request =
+        fuel_core_block_aggregator_api::api::protobuf_adapter::BlockHeightRequest {};
     let expected_height = 1;
     let actual_height = rpc_client
         .get_block_height(request)
@@ -134,7 +136,7 @@ async fn new_block_subscription__can_get_expect_block() {
         .expect("could not connect to server");
 
     let request =
-        fuel_block_aggregator_api::api::protobuf_adapter::NewBlockSubscriptionRequest {};
+        fuel_core_block_aggregator_api::api::protobuf_adapter::NewBlockSubscriptionRequest {};
     let mut stream = rpc_client
         .new_block_subscription(request)
         .await