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

Vote should be valid (#945)

Browse Source 
* test that fails

* fix for test

* rename
This commit is contained in:
anatoly yakovenko
2018-08-12 18:19:54 -07:00
committed by GitHub
parent f07c038266
commit 288ed7a8ea
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/vote_stage.rs
View File

@ -33,12 +33,12 @@ enum VoteError {
NoValidLastIdsToVoteOn, NoValidLastIdsToVoteOn,
} }
pub fn create_vote_tx_and_blob( pub fn create_new_signed_vote_blob(
last_id: &Hash, last_id: &Hash,
keypair: &Keypair, keypair: &Keypair,
crdt: &Arc<RwLock<Crdt>>, crdt: &Arc<RwLock<Crdt>>,
blob_recycler: &BlobRecycler, blob_recycler: &BlobRecycler,
) -> Result<(Transaction, SharedBlob)> { ) -> Result<SharedBlob> {
let shared_blob = blob_recycler.allocate(); let shared_blob = blob_recycler.allocate();
let (vote, addr) = { let (vote, addr) = {
let mut wcrdt = crdt.write().unwrap(); let mut wcrdt = crdt.write().unwrap();
@ -55,7 +55,7 @@ pub fn create_vote_tx_and_blob(
blob.meta.set_addr(&addr); blob.meta.set_addr(&addr);
blob.meta.size = len; blob.meta.size = len;
} }
Ok((tx, shared_blob)) Ok(shared_blob)
} }
fn get_last_id_to_vote_on( fn get_last_id_to_vote_on(
@ -139,10 +139,9 @@ pub fn send_leader_vote(
last_vote, last_vote,
last_valid_validator_timestamp, last_valid_validator_timestamp,
) { ) {
if let Ok((tx, shared_blob)) = if let Ok(shared_blob) =
create_vote_tx_and_blob(&last_id, keypair, crdt, blob_recycler) create_new_signed_vote_blob(&last_id, keypair, crdt, blob_recycler)
{ {
bank.process_transaction(&tx)?;
vote_blob_sender.send(VecDeque::from(vec![shared_blob]))?; vote_blob_sender.send(VecDeque::from(vec![shared_blob]))?;
let finality_ms = now - super_majority_timestamp; let finality_ms = now - super_majority_timestamp;
@ -172,7 +171,7 @@ fn send_validator_vote(
vote_blob_sender: &BlobSender, vote_blob_sender: &BlobSender,
) -> Result<()> { ) -> Result<()> {
let last_id = bank.last_id(); let last_id = bank.last_id();
if let Ok((_, shared_blob)) = create_vote_tx_and_blob(&last_id, keypair, crdt, blob_recycler) { if let Ok(shared_blob) = create_new_signed_vote_blob(&last_id, keypair, crdt, blob_recycler) {
inc_new_counter_info!("replicate-vote_sent", 1); inc_new_counter_info!("replicate-vote_sent", 1);
vote_blob_sender.send(VecDeque::from(vec![shared_blob]))?; vote_blob_sender.send(VecDeque::from(vec![shared_blob]))?;
@ -236,6 +235,7 @@ impl Service for VoteStage {
pub mod tests { pub mod tests {
use super::*; use super::*;
use bank::Bank; use bank::Bank;
use bincode::deserialize;
use crdt::{Crdt, NodeInfo, TestNode}; use crdt::{Crdt, NodeInfo, TestNode};
use entry::next_entry; use entry::next_entry;
use hash::{hash, Hash}; use hash::{hash, Hash};
@ -390,6 +390,11 @@ pub mod tests {
// leader should vote now // leader should vote now
assert!(vote_blob.is_ok()); assert!(vote_blob.is_ok());
// vote should be valid
let blob = vote_blob.unwrap().pop_front().unwrap();
let tx = deserialize(&(blob.read().unwrap().data)).unwrap();
assert!(bank.process_transaction(&tx).is_ok());
} }
#[test] #[test]