project-serum
/
solana
mirror of https://github.com/project-serum/solana.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove unnecessary erasure config references (#5809)

This commit is contained in:
Pankaj Garg 2019-09-05 14:46:41 -07:00 committed by GitHub
parent 0cbc0dc79c
commit 05d2eec45c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/src/broadcast_stage.rs
View File

@ -4,7 +4,6 @@ use self::fail_entry_verification_broadcast_run::FailEntryVerificationBroadcastR
use self::standard_broadcast_run::StandardBroadcastRun; use self::standard_broadcast_run::StandardBroadcastRun;
use crate::blocktree::Blocktree; use crate::blocktree::Blocktree;
use crate::cluster_info::{ClusterInfo, ClusterInfoError}; use crate::cluster_info::{ClusterInfo, ClusterInfoError};
use crate::erasure::ErasureConfig;
use crate::poh_recorder::WorkingBankEntries; use crate::poh_recorder::WorkingBankEntries;
use crate::result::{Error, Result}; use crate::result::{Error, Result};
use crate::service::Service; use crate::service::Service;
@ -44,7 +43,6 @@ impl BroadcastStageType {
receiver: Receiver<WorkingBankEntries>, receiver: Receiver<WorkingBankEntries>,
exit_sender: &Arc<AtomicBool>, exit_sender: &Arc<AtomicBool>,
blocktree: &Arc<Blocktree>, blocktree: &Arc<Blocktree>,
erasure_config: &ErasureConfig,
) -> BroadcastStage { ) -> BroadcastStage {
match self { match self {
BroadcastStageType::Standard => BroadcastStage::new( BroadcastStageType::Standard => BroadcastStage::new(
@ -54,7 +52,6 @@ impl BroadcastStageType {
exit_sender, exit_sender,
blocktree, blocktree,
StandardBroadcastRun::new(), StandardBroadcastRun::new(),
erasure_config,
), ),
BroadcastStageType::FailEntryVerification => BroadcastStage::new( BroadcastStageType::FailEntryVerification => BroadcastStage::new(
@ -64,7 +61,6 @@ impl BroadcastStageType {
exit_sender, exit_sender,
blocktree, blocktree,
FailEntryVerificationBroadcastRun::new(), FailEntryVerificationBroadcastRun::new(),
erasure_config,
), ),
BroadcastStageType::BroadcastFakeBlobs => BroadcastStage::new( BroadcastStageType::BroadcastFakeBlobs => BroadcastStage::new(
@ -74,7 +70,6 @@ impl BroadcastStageType {
exit_sender, exit_sender,
blocktree, blocktree,
BroadcastFakeBlobsRun::new(0), BroadcastFakeBlobsRun::new(0),
erasure_config,
), ),
} }
} }
@ -161,7 +156,6 @@ impl BroadcastStage {
exit_sender: &Arc<AtomicBool>, exit_sender: &Arc<AtomicBool>,
blocktree: &Arc<Blocktree>, blocktree: &Arc<Blocktree>,
broadcast_stage_run: impl BroadcastRun + Send + 'static, broadcast_stage_run: impl BroadcastRun + Send + 'static,
_erasure_config: &ErasureConfig,
) -> Self { ) -> Self {
let blocktree = blocktree.clone(); let blocktree = blocktree.clone();
let exit_sender = exit_sender.clone(); let exit_sender = exit_sender.clone();
@ -249,7 +243,6 @@ mod test {
&exit_sender, &exit_sender,
&blocktree, &blocktree,
StandardBroadcastRun::new(), StandardBroadcastRun::new(),
&ErasureConfig::default(),
); );
MockBroadcastStage { MockBroadcastStage {

3
core/src/tpu.rs
View File

@ -6,7 +6,6 @@ use crate::blocktree::Blocktree;
use crate::broadcast_stage::{BroadcastStage, BroadcastStageType}; use crate::broadcast_stage::{BroadcastStage, BroadcastStageType};
use crate::cluster_info::ClusterInfo; use crate::cluster_info::ClusterInfo;
use crate::cluster_info_vote_listener::ClusterInfoVoteListener; use crate::cluster_info_vote_listener::ClusterInfoVoteListener;
use crate::erasure::ErasureConfig;
use crate::fetch_stage::FetchStage; use crate::fetch_stage::FetchStage;
use crate::poh_recorder::{PohRecorder, WorkingBankEntries}; use crate::poh_recorder::{PohRecorder, WorkingBankEntries};
use crate::service::Service; use crate::service::Service;
@ -38,7 +37,6 @@ impl Tpu {
sigverify_disabled: bool, sigverify_disabled: bool,
blocktree: &Arc<Blocktree>, blocktree: &Arc<Blocktree>,
broadcast_type: &BroadcastStageType, broadcast_type: &BroadcastStageType,
erasure_config: &ErasureConfig,
exit: &Arc<AtomicBool>, exit: &Arc<AtomicBool>,
) -> Self { ) -> Self {
let (packet_sender, packet_receiver) = channel(); let (packet_sender, packet_receiver) = channel();
@ -76,7 +74,6 @@ impl Tpu {
entry_receiver, entry_receiver,
&exit, &exit,
blocktree, blocktree,
erasure_config,
); );
Self { Self {

4
core/src/validator.rs
View File

@ -7,7 +7,6 @@ use crate::broadcast_stage::BroadcastStageType;
use crate::cluster_info::{ClusterInfo, Node}; use crate::cluster_info::{ClusterInfo, Node};
use crate::confidence::ForkConfidenceCache; use crate::confidence::ForkConfidenceCache;
use crate::contact_info::ContactInfo; use crate::contact_info::ContactInfo;
use crate::erasure::ErasureConfig;
use crate::gossip_service::{discover_cluster, GossipService}; use crate::gossip_service::{discover_cluster, GossipService};
use crate::leader_schedule_cache::LeaderScheduleCache; use crate::leader_schedule_cache::LeaderScheduleCache;
use crate::poh_recorder::PohRecorder; use crate::poh_recorder::PohRecorder;
@ -49,7 +48,6 @@ pub struct ValidatorConfig {
pub snapshot_config: Option<SnapshotConfig>, pub snapshot_config: Option<SnapshotConfig>,
pub max_ledger_slots: Option<u64>, pub max_ledger_slots: Option<u64>,
pub broadcast_stage_type: BroadcastStageType, pub broadcast_stage_type: BroadcastStageType,
pub erasure_config: ErasureConfig,
} }
impl Default for ValidatorConfig { impl Default for ValidatorConfig {
@ -66,7 +64,6 @@ impl Default for ValidatorConfig {
rpc_config: JsonRpcConfig::default(), rpc_config: JsonRpcConfig::default(),
snapshot_config: None, snapshot_config: None,
broadcast_stage_type: BroadcastStageType::Standard, broadcast_stage_type: BroadcastStageType::Standard,
erasure_config: ErasureConfig::default(),
} }
} }
} }
@ -337,7 +334,6 @@ impl Validator {
config.dev_sigverify_disabled, config.dev_sigverify_disabled,
&blocktree, &blocktree,
&config.broadcast_stage_type, &config.broadcast_stage_type,
&config.erasure_config,
&exit, &exit,
); );