fixes after rebase

anza-xyz · Aug 2, 2024 · 4ef520a · 4ef520a
1 parent 004df64
commit 4ef520a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/core/src/banking_stage/consumer.rs b/core/src/banking_stage/consumer.rs
@@ -24,6 +24,7 @@ use {
     solana_runtime_transaction::instructions_processor::process_compute_budget_instructions,
     solana_sdk::{
         clock::{Slot, FORWARD_TRANSACTIONS_TO_LEADER_AT_SLOT_OFFSET, MAX_PROCESSING_AGE},
+        fee::FeeBudgetLimits,
         message::SanitizedMessage,
         saturating_add_assign,
         timing::timestamp,

diff --git a/programs/sbf/tests/programs.rs b/programs/sbf/tests/programs.rs
@@ -47,6 +47,7 @@ use {
         clock::{UnixTimestamp, MAX_PROCESSING_AGE},
         compute_budget::ComputeBudgetInstruction,
         entrypoint::MAX_PERMITTED_DATA_INCREASE,
+        fee::{FeeBudgetLimits, FeeStructure},
         fee_calculator::FeeRateGovernor,
         genesis_config::ClusterType,
         hash::Hash,

diff --git a/runtime/src/bank.rs b/runtime/src/bank.rs
@@ -88,8 +88,8 @@ use {
     solana_compute_budget::compute_budget::ComputeBudget,
     solana_cost_model::cost_tracker::CostTracker,
     solana_feature_set::{
-        self as feature_set, include_loaded_accounts_data_size_in_fee_calculation,
-        remove_rounding_in_fee_calculation, reward_full_priority_fee, FeatureSet,
+        self as feature_set, remove_rounding_in_fee_calculation, reward_full_priority_fee,
+        FeatureSet,
     },
     solana_loader_v4_program::create_program_runtime_environment_v2,
     solana_measure::{measure::Measure, measure_time, measure_us},