Skip to content
This repository was archived by the owner on Jan 22, 2025. It is now read-only.

Commit 080285c

Browse files
authored
Adjust solana-core for cleaner scheduler-pr diff (#33881)
1 parent 510b6b9 commit 080285c

File tree

2 files changed

+7
-8
lines changed

2 files changed

+7
-8
lines changed

core/src/replay_stage.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2786,7 +2786,6 @@ impl ReplayStage {
27862786
match replay_result {
27872787
Ok(replay_tx_count) => tx_count += replay_tx_count,
27882788
Err(err) => {
2789-
// Error means the slot needs to be marked as dead
27902789
Self::mark_dead_slot(
27912790
blockstore,
27922791
bank,
@@ -2802,8 +2801,7 @@ impl ReplayStage {
28022801
ancestor_hashes_replay_update_sender,
28032802
purge_repair_slot_counter,
28042803
);
2805-
// If the bank was corrupted, don't try to run the below logic to check if the
2806-
// bank is completed
2804+
// don't try to run the below logic to check if the bank is completed
28072805
continue;
28082806
}
28092807
}

core/src/validator.rs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -812,6 +812,12 @@ impl Validator {
812812
config.block_verification_method, config.block_production_method
813813
);
814814

815+
let (replay_vote_sender, replay_vote_receiver) = unbounded();
816+
817+
// block min prioritization fee cache should be readable by RPC, and writable by validator
818+
// (by both replay stage and banking stage)
819+
let prioritization_fee_cache = Arc::new(PrioritizationFeeCache::default());
820+
815821
let leader_schedule_cache = Arc::new(leader_schedule_cache);
816822
let entry_notification_sender = entry_notifier_service
817823
.as_ref()
@@ -939,10 +945,6 @@ impl Validator {
939945
)),
940946
};
941947

942-
// block min prioritization fee cache should be readable by RPC, and writable by validator
943-
// (by both replay stage and banking stage)
944-
let prioritization_fee_cache = Arc::new(PrioritizationFeeCache::default());
945-
946948
let rpc_override_health_check =
947949
Arc::new(AtomicBool::new(config.rpc_config.disable_health_check));
948950
let (
@@ -1229,7 +1231,6 @@ impl Validator {
12291231
};
12301232
let last_vote = tower.last_vote();
12311233

1232-
let (replay_vote_sender, replay_vote_receiver) = unbounded();
12331234
let tvu = Tvu::new(
12341235
vote_account,
12351236
authorized_voter_keypairs,

0 commit comments

Comments
 (0)