logos-co
/
nomos-node
mirror of
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix consensus merge (#42)

This commit is contained in:
Giacomo Pasini 2023-01-10 12:26:36 +01:00 committed by GitHub
parent 0229337414
commit 15f97dcace
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
nomos-services/consensus/src/lib.rs
View File

@ -19,7 +19,7 @@ use leadership::{Leadership, LeadershipResult};
use nomos_core::block::Block; use nomos_core::block::Block;
use nomos_core::crypto::PublicKey; use nomos_core::crypto::PublicKey;
use nomos_core::staking::Stake; use nomos_core::staking::Stake;
use nomos_mempool::{backend::Pool, Mempool}; use nomos_mempool::{backend::MemPool, network::NetworkAdapter as MempoolAdapter, MempoolService};
use nomos_network::NetworkService; use nomos_network::NetworkService;
use overlay::{Member, Overlay}; use overlay::{Member, Overlay};
use overwatch_rs::services::relay::{OutboundRelay, Relay}; use overwatch_rs::services::relay::{OutboundRelay, Relay};
@ -43,26 +43,30 @@ pub struct CarnotSettings {
private_key: [u8; 32], private_key: [u8; 32],
} }
pub struct CarnotConsensus<A, P> pub struct CarnotConsensus<A, P, M>
where where
A: NetworkAdapter + Send + Sync + 'static, A: NetworkAdapter + Send + Sync + 'static,
P: Pool + Send + Sync + 'static, P: MemPool + Send + Sync + 'static,
P::Settings: Clone + Send + Sync + 'static,
P::Tx: Debug + Send + Sync + 'static, P::Tx: Debug + Send + Sync + 'static,
P::Id: Debug + Send + Sync + 'static, P::Id: Debug + Send + Sync + 'static,
M: MempoolAdapter<Tx = P::Tx> + Send + Sync + 'static,
{ {
service_state: ServiceStateHandle<Self>, service_state: ServiceStateHandle<Self>,
// underlying networking backend. We need this so we can relay and check the types properly // underlying networking backend. We need this so we can relay and check the types properly
// when implementing ServiceCore for CarnotConsensus // when implementing ServiceCore for CarnotConsensus
network_relay: Relay<NetworkService<A::Backend>>, network_relay: Relay<NetworkService<A::Backend>>,
mempool_relay: Relay<Mempool<A::Backend, P>>, mempool_relay: Relay<MempoolService<M, P>>,
} }
impl<A, P> ServiceData for CarnotConsensus<A, P> impl<A, P, M> ServiceData for CarnotConsensus<A, P, M>
where where
A: NetworkAdapter + Send + Sync + 'static, A: NetworkAdapter + Send + Sync + 'static,
P: Pool + Send + Sync + 'static, P: MemPool + Send + Sync + 'static,
P::Settings: Clone + Send + Sync + 'static,
P::Tx: Debug + Send + Sync + 'static, P::Tx: Debug + Send + Sync + 'static,
P::Id: Debug + Send + Sync + 'static, P::Id: Debug + Send + Sync + 'static,
M: MempoolAdapter<Tx = P::Tx> + Send + Sync + 'static,
{ {
const SERVICE_ID: ServiceId = "Carnot"; const SERVICE_ID: ServiceId = "Carnot";
type Settings = CarnotSettings; type Settings = CarnotSettings;
@ -72,12 +76,14 @@ where
} }
#[async_trait::async_trait] #[async_trait::async_trait]
impl<A, P> ServiceCore for CarnotConsensus<A, P> impl<A, P, M> ServiceCore for CarnotConsensus<A, P, M>
where where
A: NetworkAdapter + Send + Sync + 'static, A: NetworkAdapter + Send + Sync + 'static,
P: Pool + Send + Sync + 'static, P: MemPool + Send + Sync + 'static,
P::Settings: Clone + Send + Sync + 'static,
P::Tx: Debug + Send + Sync + 'static, P::Tx: Debug + Send + Sync + 'static,
P::Id: Debug + Send + Sync + 'static, P::Id: Debug + Send + Sync + 'static,
M: MempoolAdapter<Tx = P::Tx> + Send + Sync + 'static,
{ {
fn init(service_state: ServiceStateHandle<Self>) -> Result<Self, overwatch_rs::DynError> { fn init(service_state: ServiceStateHandle<Self>) -> Result<Self, overwatch_rs::DynError> {
let network_relay = service_state.overwatch_handle.relay(); let network_relay = service_state.overwatch_handle.relay();
@ -102,7 +108,7 @@ where
.mempool_relay .mempool_relay
.connect() .connect()
.await .await
.expect("Relay connection with MempoolService should succeed"); .expect("Relay connection with MemPoolService should succeed");
let network_adapter = A::new(network_relay).await; let network_adapter = A::new(network_relay).await;
@ -133,12 +139,14 @@ where
} }
} }
impl<A, P> CarnotConsensus<A, P> impl<A, P, M> CarnotConsensus<A, P, M>
where where
A: NetworkAdapter + Send + Sync + 'static, A: NetworkAdapter + Send + Sync + 'static,
P: Pool + Send + Sync + 'static, P: MemPool + Send + Sync + 'static,
P::Settings: Clone + Send + Sync + 'static,
P::Tx: Debug + Send + Sync + 'static, P::Tx: Debug + Send + Sync + 'static,
P::Id: Debug + Send + Sync + 'static, P::Id: Debug + Send + Sync + 'static,
M: MempoolAdapter<Tx = P::Tx> + Send + Sync + 'static,
{ {
// Build a service that generates new views as they become available // Build a service that generates new views as they become available
async fn view_generator(&self) -> ViewGenerator { async fn view_generator(&self) -> ViewGenerator {