post-rebase fixes

anza-xyz · Aug 9, 2024 · d35364e · d35364e
1 parent e4ca26e
commit d35364e
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 4 deletions.
diff --git a/programs/vote/src/vote_processor.rs b/programs/vote/src/vote_processor.rs
@@ -244,7 +244,6 @@ mod tests {
             },
         },
         bincode::serialize,
-        solana_feature_set::FeatureSet,
         solana_program_runtime::invoke_context::mock_process_instruction,
         solana_sdk::{
             account::{self, Account, AccountSharedData, ReadableAccount},

diff --git a/runtime/src/bank/fee_distribution.rs b/runtime/src/bank/fee_distribution.rs
@@ -330,7 +330,6 @@ pub mod tests {
             create_genesis_config, create_genesis_config_with_leader,
             create_genesis_config_with_vote_accounts, ValidatorVoteKeypairs,
         },
-        solana_feature_set as feature_set,
         solana_sdk::{
             account::AccountSharedData, native_token::sol_to_lamports, pubkey, rent::Rent,
             signature::Signer,

diff --git a/sdk/feature-set/src/lib.rs b/sdk/feature-set/src/lib.rs
@@ -843,7 +843,7 @@ pub mod vote_only_retransmitter_signed_fec_sets {
 }
 
 pub mod enable_turbine_extended_fanout_experiments {
-    solana_sdk::declare_id!("BZn14Liea52wtBwrXUxTv6vojuTTmfc7XGEDTXrvMD7b");
+    solana_program::declare_id!("BZn14Liea52wtBwrXUxTv6vojuTTmfc7XGEDTXrvMD7b");
 }
 
 lazy_static! {

diff --git a/test-validator/src/lib.rs b/test-validator/src/lib.rs
@@ -443,7 +443,7 @@ impl TestValidatorGenesis {
                 .for_each(|(maybe_account, feature_id)| {
                     if maybe_account
                         .as_ref()
-                        .and_then(solana_feature_set::from_account)
+                        .and_then(solana_sdk::feature::from_account)
                         .and_then(|feature| feature.activated_at)
                         .is_none()
                     {