gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Added check in broadcast stage to exit after transmitting last blob before leader rotation. Also added tests

Browse Source
This commit is contained in:
Carl
2018-09-12 13:59:19 -07:00
committed by Greg Fitzgerald
parent f28ba3937b
commit 98b47d2540
5 changed files with 50 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/fullnode.rs
View File

@@ -39,7 +39,7 @@ impl LeaderServices {
}
}
fn join(self) -> Result<()> {
pub fn join(self) -> Result<()> {
self.tpu.join()?;
self.broadcast_stage.join()
}
@@ -54,7 +54,7 @@ impl ValidatorServices {
ValidatorServices { tvu }
}
fn join(self) -> Result<()> {
pub fn join(self) -> Result<()> {
self.tvu.join()
}
}
@@ -68,7 +68,7 @@ pub struct Fullnode {
rpu: Rpu,
rpc_service: JsonRpcService,
ncp: Ncp,
pub node_role: NodeRole,
pub node_role: Option<NodeRole>,
}
#[derive(Serialize, Deserialize, Clone, Debug, PartialEq)]
@@ -140,9 +140,9 @@ impl Fullnode {
match leader_addr {
Some(leader_addr) => {
info!(
"validator ready... local request address: {} (advertising {}) connected to: {}",
local_requests_addr, requests_addr, leader_addr
);
"validator ready... local request address: {} (advertising {}) connected to: {}",
local_requests_addr, requests_addr, leader_addr
);
}
None => {
info!(
@@ -278,7 +278,7 @@ impl Fullnode {
exit.clone(),
);
let validator_state = ValidatorServices::new(tvu);
node_role = NodeRole::Validator(validator_state);
node_role = Some(NodeRole::Validator(validator_state));
}
None => {
// Start in leader mode.
@@ -309,7 +309,7 @@ impl Fullnode {
entry_receiver,
);
let leader_state = LeaderServices::new(tpu, broadcast_stage);
node_role = NodeRole::Leader(leader_state);
node_role = Some(NodeRole::Leader(leader_state));
}
}
@@ -340,13 +340,15 @@ impl Service for Fullnode {
self.rpu.join()?;
self.ncp.join()?;
self.rpc_service.join()?;
match self.node_role {
NodeRole::Validator(validator_service) => {
Some(NodeRole::Validator(validator_service)) => {
validator_service.join()?;
}
NodeRole::Leader(leader_service) => {
},
Some(NodeRole::Leader(leader_service)) => {
leader_service.join()?;
}
},
_ => (),
}
// TODO: Case on join values above to determine if