Nomos http API #476
Merged
Nomos http API #476
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…into metrics-api
danielSanchezQ
approved these changes
Oct 31, 2023
* add da_blob for new http api
* add storage api for new http backend
* Add mempool add apis
|
@al8n , usually you need to merge from the bottom up. Not the other way around. This PR was ready to be merged yesterday already. |
Comment on lines
80
to
91
| .route("/cl/metrics", routing::get(cl_metrics::<ClTransaction>)) | ||
| .route("/cl/status", routing::post(cl_status::<ClTransaction>)) | ||
| .route("/da/blobs", routing::post(da_blobs)) | ||
| .route("/cl/metrics", routing::get(cl_metrics::<T>)) | ||
| .route("/cl/status", routing::post(cl_status::<T>)) | ||
| .route("/carnot/info", routing::get(carnot_info::<T, S, SIZE>)) | ||
| .route("/network/info", routing::get(libp2p_info)) | ||
| .route("/storage/block", routing::post(block::<S, T>)) | ||
| .route("/mempool/add/tx", routing::post(add_tx::<T>)) | ||
| .route("/mempool/add/cert", routing::post(add_cert)) | ||
| .with_state(self.settings.handle); |
There was a problem hiding this comment.
Why do we have all this here now? this was merged right?
There was a problem hiding this comment.
I merged other approved PR to this PR, this PR has not been merged.
Comment on lines
1
to
18
| use std::{fmt::Debug, hash::Hash, net::SocketAddr, sync::Arc}; | ||
| use std::{fmt::Debug, hash::Hash, net::SocketAddr}; | ||
|
|
||
| use axum::{extract::State, response::IntoResponse, routing, Json, Router, Server}; | ||
| use full_replication::Blob; | ||
| use hyper::StatusCode; | ||
| use axum::{extract::State, response::Response, routing, Json, Router, Server}; | ||
| use consensus_engine::BlockId; | ||
| use full_replication::{Blob, Certificate}; | ||
| use nomos_core::{da::blob, tx::Transaction}; | ||
| use nomos_mempool::{openapi::Status, MempoolMetrics}; | ||
| use nomos_mempool::{network::adapters::libp2p::Libp2pAdapter, openapi::Status, MempoolMetrics}; | ||
| use nomos_network::backends::libp2p::Libp2p; | ||
| use nomos_storage::backends::StorageSerde; | ||
| use overwatch_rs::overwatch::handle::OverwatchHandle; | ||
| use serde::{Deserialize, Serialize}; | ||
| use serde::{de::DeserializeOwned, Deserialize, Serialize}; | ||
| use utoipa::OpenApi; | ||
| use utoipa_swagger_ui::SwaggerUi; | ||
|
|
||
| use crate::{ | ||
| http::{cl::*, da::*}, | ||
| http::{cl, consensus, da, libp2p, mempool, storage}, | ||
| Backend, | ||
| }; |
There was a problem hiding this comment.
Nitpick. All imports are mixed. We should try to separate in blocks:
// std
// crates
// internalThere was a problem hiding this comment.
Sorry, I am a little bit confused here, do you mean we should treat nomos* as internal crates? Otherwise, it seems imports are already in the std - crates - internal format.
use std::{fmt::Debug, hash::Hash, net::SocketAddr};
use axum::{extract::State, response::Response, routing, Json, Router, Server};
use consensus_engine::BlockId;
use full_replication::{Blob, Certificate};
use nomos_core::{da::blob, tx::Transaction};
use nomos_mempool::{network::adapters::libp2p::Libp2pAdapter, openapi::Status, MempoolMetrics};
use nomos_network::backends::libp2p::Libp2p;
use nomos_storage::backends::StorageSerde;
use overwatch_rs::overwatch::handle::OverwatchHandle;
use serde::{de::DeserializeOwned, Deserialize, Serialize};
use utoipa::OpenApi;
use utoipa_swagger_ui::SwaggerUi;
use crate::{
http::{cl, consensus, da, libp2p, mempool, storage},
Backend,
};There was a problem hiding this comment.
Yes, anything internally related to the project I think is better in internal:
- consensus_engine
- nomos_core
- nomos_mempool
etc
Overwatch can be kept in crates 👍
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Finish information related API