Merge branch 'block-explorer-3' into integrate-explorer

nodes/explorer/src/api_backend/da.rs

@@ -1,14 +1,11 @@
 // crates
-use axum::extract::{Json, Query, State};
-use axum::response::{IntoResponse, Response};
-use hyper::StatusCode;
+use axum::extract::{Json, State};
+use axum::response::Response;
 use nomos_node::make_request_and_return_response;
-use serde::de::DeserializeOwned;
-use serde::{Deserialize, Serialize};
 // internal
-use full_replication::{Blob, Certificate};
+use full_replication::Blob;
 use nomos_api::http::da::da_blobs;
-use nomos_core::{da::blob, tx::Transaction};
+use nomos_core::da::blob;
 use overwatch_rs::overwatch::handle::OverwatchHandle;
 
 pub(crate) async fn blobs(

nodes/explorer/src/api_backend/store.rs

@@ -13,7 +13,6 @@ use full_replication::Certificate;
 use nomos_api::http::storage;
 use nomos_core::block::{Block, BlockId};
 use nomos_core::tx::Transaction;
-use nomos_node::make_request_and_return_response;
 use nomos_storage::backends::StorageSerde;
 use overwatch_rs::overwatch::handle::OverwatchHandle;
 

nodes/explorer/src/config.rs

@@ -4,7 +4,7 @@ use eyre::{eyre, Result};
 use nomos_api::ApiService;
 use nomos_log::{Logger, LoggerBackend, LoggerFormat};
 use nomos_node::config::LoggerBackendType;
-use nomos_node::{DataAvailability, HttpArgs, LogArgs, Tx, Wire};
+use nomos_node::{HttpArgs, LogArgs, Tx, Wire};
 use overwatch_rs::services::ServiceData;
 use serde::{Deserialize, Serialize};
 use tracing::Level;
@@ -15,7 +15,6 @@ pub type ApiArgs = HttpArgs;
 pub struct Config {
     pub log: <Logger as ServiceData>::Settings,
     pub api: <ApiService<AxumBackend<Tx, Wire>> as ServiceData>::Settings,
-    pub da: <DataAvailability as ServiceData>::Settings,
 }
 
 impl Config {

nodes/explorer/src/main.rs

@@ -11,7 +11,7 @@ use overwatch_rs::Services;
 use crate::api_backend::AxumBackend;
 use crate::config::{ApiArgs, Config};
 use nomos_log::Logger;
-use nomos_node::{DataAvailability, LogArgs, Tx, Wire};
+use nomos_node::{LogArgs, Tx, Wire};
 use nomos_storage::backends::sled::SledBackendSettings;
 use nomos_storage::{backends::sled::SledBackend, StorageService};
 
@@ -19,7 +19,6 @@ use nomos_storage::{backends::sled::SledBackend, StorageService};
 struct Explorer {
     log: ServiceHandle<Logger>,
     storage: ServiceHandle<StorageService<SledBackend<Wire>>>,
-    da: ServiceHandle<DataAvailability>,
     api: ServiceHandle<ApiService<AxumBackend<Tx, Wire>>>,
 }
 
@@ -55,7 +54,6 @@ fn main() -> Result<()> {
             storage: SledBackendSettings {
                 db_path: DEFAULT_DB_PATH.into(),
             },
-            da: config.da,
             api: config.api,
         },
         None,