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

code cleanup

Browse Source
This commit is contained in:
Pankaj Garg
2019-03-11 12:12:06 -07:00
parent e201136eee
commit 0b8c5d807d
1 changed files with 16 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
core/src/banking_stage.rs
View File

@ -17,7 +17,6 @@ use crate::sigverify_stage::VerifiedPackets;
use bincode::deserialize; use bincode::deserialize;
use solana_metrics::counter::Counter; use solana_metrics::counter::Counter;
use solana_runtime::bank::{self, Bank, BankError}; use solana_runtime::bank::{self, Bank, BankError};
use solana_sdk::pubkey::Pubkey;
use solana_sdk::timing::{self, duration_as_us, MAX_RECENT_BLOCKHASHES}; use solana_sdk::timing::{self, duration_as_us, MAX_RECENT_BLOCKHASHES};
use solana_sdk::transaction::Transaction; use solana_sdk::transaction::Transaction;
use std::net::UdpSocket; use std::net::UdpSocket;
@ -106,28 +105,25 @@ impl BankingStage {
) -> bool { ) -> bool {
let rcluster_info = cluster_info.read().unwrap(); let rcluster_info = cluster_info.read().unwrap();
// If there's a bank, and leader is available, forward the packets // If there's a bank, and leader is available, forward the buffered packets
// or, if the current node is not the leader, forward the buffered packets // or, if the current node is not the leader, forward the buffered packets
let leader_id = match poh_recorder.lock().unwrap().bank() { let forward = match poh_recorder.lock().unwrap().bank() {
None => rcluster_info.leader_data().map(|x| x.id), Some(_) => rcluster_info.leader_data().is_some(),
Some(_) => rcluster_info.leader_data().map(|_| Pubkey::default()), // returning default pubkey on purpose None => rcluster_info
.leader_data()
.map(|x| x.id != rcluster_info.id())
.unwrap_or(false),
}; };
match leader_id { if forward {
Some(leader) => { let _ = Self::forward_unprocessed_packets(
if leader != rcluster_info.id() { &socket,
let _ = Self::forward_unprocessed_packets( &rcluster_info.leader_data().unwrap().forwarder,
&socket, &buffered_packets,
&rcluster_info.leader_data().unwrap().forwarder, );
&buffered_packets,
);
true
} else {
false
}
}
None => false,
} }
forward
} }
fn should_buffer_packets( fn should_buffer_packets(
@ -139,11 +135,11 @@ impl BankingStage {
// Buffer the packets if I am the next leader // Buffer the packets if I am the next leader
// or, if it was getting sent to me // or, if it was getting sent to me
let leader_id = match poh_recorder.lock().unwrap().bank() { let leader_id = match poh_recorder.lock().unwrap().bank() {
Some(bank) => leader_schedule_utils::slot_leader_at(bank.slot() + 1, &bank).unwrap(),
None => rcluster_info None => rcluster_info
.leader_data() .leader_data()
.map(|x| x.id) .map(|x| x.id)
.unwrap_or_default(), .unwrap_or_default(),
Some(bank) => leader_schedule_utils::slot_leader_at(bank.slot() + 1, &bank).unwrap(),
}; };
leader_id == rcluster_info.id() leader_id == rcluster_info.id()