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

Remove activated feature for filtering invalid stakes from rewards #21641

Merged
jstarry merged 1 commit into from
Dec 6, 2021
Merged

Remove activated feature for filtering invalid stakes from rewards #21641

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 3 additions & 8 deletions runtime/src/bank.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2167,10 +2167,6 @@ impl Bank {
thread_pool: &ThreadPool,
reward_calc_tracer: Option<impl Fn(&RewardCalculationEvent) + Send + Sync>,
) -> DashMap<Pubkey, VoteWithStakeDelegations> {
let filter_stake_delegation_accounts = self
.feature_set
.is_active(&feature_set::filter_stake_delegation_accounts::id());

let stakes = self.stakes.read().unwrap();
let accounts = DashMap::with_capacity(stakes.vote_accounts().as_ref().len());

Expand Down Expand Up @@ -2226,10 +2222,9 @@ impl Bank {
}

// filter invalid delegation accounts
if filter_stake_delegation_accounts
&& (stake_account.owner() != &solana_stake_program::id()
|| (fetched_vote_account_owner.is_some()
&& fetched_vote_account_owner != Some(&solana_vote_program::id())))
if stake_account.owner() != &solana_stake_program::id()
|| (fetched_vote_account_owner.is_some()
&& fetched_vote_account_owner != Some(&solana_vote_program::id()))
{
datapoint_warn!(
"bank-stake_delegation_accounts-invalid-account",
Expand Down