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

Remove unused SocketAddr

Browse Source
This commit is contained in:
Michael Vines
2019-02-08 10:12:43 -08:00
committed by Grimes
parent cf103add54
commit 0115a1f834
1 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/banking_stage.rs
View File

@ -19,7 +19,6 @@ use solana_sdk::hash::Hash;
use solana_sdk::pubkey::Pubkey; use solana_sdk::pubkey::Pubkey;
use solana_sdk::timing; use solana_sdk::timing;
use solana_sdk::transaction::Transaction; use solana_sdk::transaction::Transaction;
use std::net::SocketAddr;
use std::sync::atomic::{AtomicUsize, Ordering}; use std::sync::atomic::{AtomicUsize, Ordering};
use std::sync::mpsc::{channel, Receiver, RecvTimeoutError}; use std::sync::mpsc::{channel, Receiver, RecvTimeoutError};
use std::sync::{Arc, Mutex}; use std::sync::{Arc, Mutex};
@ -148,16 +147,11 @@ impl BankingStage {
sys_info::cpu_num().unwrap_or(NUM_THREADS) sys_info::cpu_num().unwrap_or(NUM_THREADS)
} }
/// Convert the transactions from a blob of binary data to a vector of transactions and /// Convert the transactions from a blob of binary data to a vector of transactions
/// an unused `SocketAddr` that could be used to send a response. fn deserialize_transactions(p: &Packets) -> Vec<Option<Transaction>> {
fn deserialize_transactions(p: &Packets) -> Vec<Option<(Transaction, SocketAddr)>> {
p.packets p.packets
.iter() .iter()
.map(|x| { .map(|x| deserialize(&x.data[0..x.meta.size]).ok())
deserialize(&x.data[0..x.meta.size])
.map(|req| (req, x.meta.addr()))
.ok()
})
.collect() .collect()
} }
@ -213,7 +207,7 @@ impl BankingStage {
.zip(vers) .zip(vers)
.filter_map(|(tx, ver)| match tx { .filter_map(|(tx, ver)| match tx {
None => None, None => None,
Some((tx, _addr)) => { Some(tx) => {
if tx.verify_refs() && ver != 0 { if tx.verify_refs() && ver != 0 {
Some(tx) Some(tx)
} else { } else {