diff --git a/Cargo.lock b/Cargo.lock index 9093eab49bc7c9..bed776f419f07c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -7488,7 +7488,6 @@ dependencies = [ "prost", "prost-build", "prost-types", - "qualifier_attr", "rand 0.8.5", "rustc_version 0.4.0", "serde", diff --git a/programs/sbf/Cargo.lock b/programs/sbf/Cargo.lock index 22f82e39f3e1d0..3d9aa714444208 100644 --- a/programs/sbf/Cargo.lock +++ b/programs/sbf/Cargo.lock @@ -6285,7 +6285,6 @@ dependencies = [ "log", "percentage", "prost-build", - "qualifier_attr", "rustc_version", "serde", "serde_derive", diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml index da551f4ac4686d..184914f9c2b782 100644 --- a/runtime/Cargo.toml +++ b/runtime/Cargo.toml @@ -110,7 +110,7 @@ targets = ["x86_64-unknown-linux-gnu"] rustc_version = { workspace = true } [features] -dev-context-only-utils = [] +dev-context-only-utils = ["solana-svm/dev-context-only-utils"] frozen-abi = [ "dep:solana-frozen-abi", "dep:solana-frozen-abi-macro", diff --git a/svm/Cargo.toml b/svm/Cargo.toml index c53f13c91c2706..2c1d910ec0a783 100644 --- a/svm/Cargo.toml +++ b/svm/Cargo.toml @@ -13,7 +13,6 @@ edition = { workspace = true } itertools = { workspace = true } log = { workspace = true } percentage = { workspace = true } -qualifier_attr = { workspace = true } serde = { workspace = true, features = ["rc"] } serde_derive = { workspace = true } solana-bpf-loader-program = { workspace = true } diff --git a/svm/src/transaction_processor.rs b/svm/src/transaction_processor.rs index 2037489c0477f0..791d847e689f32 100644 --- a/svm/src/transaction_processor.rs +++ b/svm/src/transaction_processor.rs @@ -1,5 +1,3 @@ -#[cfg(feature = "dev-context-only-utils")] -use qualifier_attr::qualifiers; use { crate::{ account_loader::{ @@ -29,7 +27,7 @@ use { invoke_context::{EnvironmentConfig, InvokeContext}, loaded_programs::{ ForkGraph, ProgramCache, ProgramCacheEntry, ProgramCacheForTxBatch, - ProgramCacheMatchCriteria, ProgramRuntimeEnvironments, + ProgramCacheMatchCriteria, }, log_collector::LogCollector, sysvar_cache::SysvarCache, @@ -208,8 +206,11 @@ impl TransactionBatchProcessor { /// Returns the current environments depending on the given epoch /// Returns None if the call could result in a deadlock - #[cfg_attr(feature = "dev-context-only-utils", qualifiers(pub))] - pub fn get_environments_for_epoch(&self, epoch: Epoch) -> Option { + #[cfg(feature = "dev-context-only-utils")] + pub fn get_environments_for_epoch( + &self, + epoch: Epoch, + ) -> Option { self.program_cache .try_read() .ok()