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

Remove dead types

Browse Source
This commit is contained in:
Michael Vines
2019-02-20 18:16:37 -08:00
committed by Grimes
parent 7c26a4d0a0
commit 28a53959e0
3 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/fullnode.rs
View File

@ -11,8 +11,8 @@ use crate::rpc_service::JsonRpcService;
use crate::rpc_subscriptions::RpcSubscriptions; use crate::rpc_subscriptions::RpcSubscriptions;
use crate::service::Service; use crate::service::Service;
use crate::storage_stage::StorageState; use crate::storage_stage::StorageState;
use crate::tpu::{Tpu, TpuRotationReceiver}; use crate::tpu::Tpu;
use crate::tvu::{Sockets, Tvu}; use crate::tvu::{Sockets, Tvu, TvuRotationReceiver};
use crate::voting_keypair::VotingKeypair; use crate::voting_keypair::VotingKeypair;
use log::Level; use log::Level;
use solana_metrics::counter::Counter; use solana_metrics::counter::Counter;
@ -104,7 +104,7 @@ pub struct Fullnode {
tpu_sockets: Vec<UdpSocket>, tpu_sockets: Vec<UdpSocket>,
broadcast_socket: UdpSocket, broadcast_socket: UdpSocket,
node_services: NodeServices, node_services: NodeServices,
rotation_receiver: TpuRotationReceiver, rotation_receiver: TvuRotationReceiver,
blocktree: Arc<Blocktree>, blocktree: Arc<Blocktree>,
leader_scheduler: Arc<RwLock<LeaderScheduler>>, leader_scheduler: Arc<RwLock<LeaderScheduler>>,
} }

6
src/tpu.rs
View File

@ -17,14 +17,10 @@ use solana_sdk::hash::Hash;
use solana_sdk::pubkey::Pubkey; use solana_sdk::pubkey::Pubkey;
use std::net::UdpSocket; use std::net::UdpSocket;
use std::sync::atomic::{AtomicBool, Ordering}; use std::sync::atomic::{AtomicBool, Ordering};
use std::sync::mpsc::{channel, Receiver, Sender}; use std::sync::mpsc::channel;
use std::sync::{Arc, RwLock}; use std::sync::{Arc, RwLock};
use std::thread; use std::thread;
pub type TpuReturnType = u64; // tick_height to initiate a rotation
pub type TpuRotationSender = Sender<TpuReturnType>;
pub type TpuRotationReceiver = Receiver<TpuReturnType>;
pub enum TpuMode { pub enum TpuMode {
Leader(LeaderServices), Leader(LeaderServices),
Forwarder(ForwarderServices), Forwarder(ForwarderServices),

9
src/tvu.rs
View File

@ -22,20 +22,19 @@ use crate::retransmit_stage::RetransmitStage;
use crate::rpc_subscriptions::RpcSubscriptions; use crate::rpc_subscriptions::RpcSubscriptions;
use crate::service::Service; use crate::service::Service;
use crate::storage_stage::{StorageStage, StorageState}; use crate::storage_stage::{StorageStage, StorageState};
use crate::tpu::{TpuReturnType, TpuRotationReceiver, TpuRotationSender};
use crate::voting_keypair::VotingKeypair; use crate::voting_keypair::VotingKeypair;
use solana_runtime::bank::Bank; use solana_runtime::bank::Bank;
use solana_sdk::hash::Hash; use solana_sdk::hash::Hash;
use solana_sdk::signature::{Keypair, KeypairUtil}; use solana_sdk::signature::{Keypair, KeypairUtil};
use std::net::UdpSocket; use std::net::UdpSocket;
use std::sync::atomic::{AtomicBool, Ordering}; use std::sync::atomic::{AtomicBool, Ordering};
use std::sync::mpsc::{channel, Receiver}; use std::sync::mpsc::{channel, Receiver, Sender};
use std::sync::{Arc, RwLock}; use std::sync::{Arc, RwLock};
use std::thread; use std::thread;
pub type TvuReturnType = TpuReturnType; pub type TvuReturnType = u64; // tick_height to initiate a rotation
pub type TvuRotationSender = TpuRotationSender; pub type TvuRotationSender = Sender<TvuReturnType>;
pub type TvuRotationReceiver = TpuRotationReceiver; pub type TvuRotationReceiver = Receiver<TvuReturnType>;
pub struct Tvu { pub struct Tvu {
fetch_stage: BlobFetchStage, fetch_stage: BlobFetchStage,