cerc-io/lighthouse
16
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Fix ApiService woes (hopefully)

Browse Source
This commit is contained in:
Michael Sproul 2019-09-10 17:27:28 +10:00
parent 576712cefe
commit 4dcad27381
No known key found for this signature in database
GPG Key ID: 77B1309D2E54E914
1 changed files with 12 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
beacon_node/rest_api/src/lib.rs
View File

@ -14,13 +14,14 @@ mod spec;
mod url_query; mod url_query;
mod validator; mod validator;
use error::{ApiError, ApiResult};
use beacon_chain::{BeaconChain, BeaconChainTypes}; use beacon_chain::{BeaconChain, BeaconChainTypes};
use client_network::NetworkMessage; use client_network::NetworkMessage;
use client_network::Service as NetworkService; use client_network::Service as NetworkService;
use error::{ApiError, ApiResult};
use eth2_config::Eth2Config; use eth2_config::Eth2Config;
use hyper::rt::Future; use hyper::rt::Future;
use hyper::service::{Service, MakeService}; use hyper::server::conn::AddrStream;
use hyper::service::{MakeService, Service};
use hyper::{Body, Method, Request, Response, Server, StatusCode}; use hyper::{Body, Method, Request, Response, Server, StatusCode};
use parking_lot::RwLock; use parking_lot::RwLock;
use response_builder::ResponseBuilder; use response_builder::ResponseBuilder;
@ -31,7 +32,6 @@ use std::sync::Arc;
use tokio::runtime::TaskExecutor; use tokio::runtime::TaskExecutor;
use tokio::sync::mpsc; use tokio::sync::mpsc;
use url_query::UrlQuery; use url_query::UrlQuery;
use hyper::server::conn::AddrStream;
pub use beacon::{BlockResponse, HeadResponse, StateResponse}; pub use beacon::{BlockResponse, HeadResponse, StateResponse};
pub use config::Config as ApiConfig; pub use config::Config as ApiConfig;
@ -40,35 +40,6 @@ use serde::export::PhantomData;
type BoxFut = Box<dyn Future<Item = Response<Body>, Error = ApiError> + Send>; type BoxFut = Box<dyn Future<Item = Response<Body>, Error = ApiError> + Send>;
pub struct ApiMaker<T: BeaconChainTypes + 'static> {
log: slog::Logger,
beacon_chain: Arc<BeaconChain<T>>,
db_path: DBPath,
network_service: Arc<NetworkService<T>>,
network_channel: Arc<RwLock<mpsc::UnboundedSender<NetworkMessage>>>,
eth2_config: Arc<Eth2Config>,
}
impl<T: BeaconChainTypes> MakeService<AddrStream> for ApiMaker<T> {
type ReqBody = Body;
type ResBody = Body;
type Error = ApiError;
type Service = ApiService<T>;
type Future = futures::future::FutureResult<Self::Service, Self::MakeError>;
type MakeError = String;
fn make_service(&mut self, _ctx: AddrStream) -> Self::Future {
futures::future::ok(ApiService {
log: self.log.clone(),
beacon_chain: self.beacon_chain.clone(),
db_path: self.db_path.clone(),
network_service: self.network_service.clone(),
network_channel: self.network_channel.clone(),
eth2_config: self.eth2_config.clone(),
})
}
}
pub struct ApiService<T: BeaconChainTypes + 'static> { pub struct ApiService<T: BeaconChainTypes + 'static> {
log: slog::Logger, log: slog::Logger,
beacon_chain: Arc<BeaconChain<T>>, beacon_chain: Arc<BeaconChain<T>>,
@ -201,7 +172,6 @@ impl<T: BeaconChainTypes> Service for ApiService<T> {
metrics::stop_timer(timer); metrics::stop_timer(timer);
Box::new(futures::future::ok(response)) Box::new(futures::future::ok(response))
} }
} }
@ -236,16 +206,17 @@ pub fn start_server<T: BeaconChainTypes>(
let server_bc = beacon_chain.clone(); let server_bc = beacon_chain.clone();
let eth2_config = Arc::new(eth2_config); let eth2_config = Arc::new(eth2_config);
let service = move || ApiMaker { let service = move || -> futures::future::FutureResult<ApiService<T>, String> {
log: log.clone(), futures::future::ok(ApiService {
beacon_chain: beacon_chain.clone(), log: log.clone(),
db_path: db_path.clone(), beacon_chain: beacon_chain.clone(),
network_service: network_service.clone(), db_path: db_path.clone(),
network_channel: Arc::new(RwLock::new(network_chan.clone())), network_service: network_service.clone(),
eth2_config: eth2_config.clone(), network_channel: Arc::new(RwLock::new(network_chan.clone())),
eth2_config: eth2_config.clone(),
})
}; };
let log_clone = log.clone(); let log_clone = log.clone();
let server = Server::bind(&bind_addr) let server = Server::bind(&bind_addr)
.serve(service) .serve(service)