Skip to content

Commit b650e17

Browse files
authored
Reduce public visibility of some SVM related structs and APIs (anza-xyz#4378)
* reduce public visibility of some SVM related structs * fix test compilation
1 parent be9655b commit b650e17

File tree

7 files changed

+14
-6
lines changed

7 files changed

+14
-6
lines changed

Cargo.lock

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

builtins-default-costs/src/lib.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,14 @@ pub enum BuiltinCost {
4141
}
4242

4343
impl BuiltinCost {
44-
pub fn native_cost(&self) -> u64 {
44+
fn native_cost(&self) -> u64 {
4545
match self {
4646
BuiltinCost::Migrating(MigratingBuiltinCost { native_cost, .. }) => *native_cost,
4747
BuiltinCost::NotMigrating(NotMigratingBuiltinCost { native_cost }) => *native_cost,
4848
}
4949
}
5050

51-
pub fn core_bpf_migration_feature(&self) -> Option<&Pubkey> {
51+
fn core_bpf_migration_feature(&self) -> Option<&Pubkey> {
5252
match self {
5353
BuiltinCost::Migrating(MigratingBuiltinCost {
5454
core_bpf_migration_feature,
@@ -58,7 +58,7 @@ impl BuiltinCost {
5858
}
5959
}
6060

61-
pub fn position(&self) -> Option<usize> {
61+
fn position(&self) -> Option<usize> {
6262
match self {
6363
BuiltinCost::Migrating(MigratingBuiltinCost { position, .. }) => Some(*position),
6464
BuiltinCost::NotMigrating(_) => None,
@@ -137,7 +137,7 @@ pub const MIGRATING_BUILTINS_COSTS: &[(Pubkey, BuiltinCost)] = &[
137137
),
138138
];
139139

140-
pub const NON_MIGRATING_BUILTINS_COSTS: &[(Pubkey, BuiltinCost)] = &[
140+
const NON_MIGRATING_BUILTINS_COSTS: &[(Pubkey, BuiltinCost)] = &[
141141
(
142142
vote::id(),
143143
BuiltinCost::NotMigrating(NotMigratingBuiltinCost {

compute-budget-instruction/src/builtin_programs_filter.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use {
77
};
88

99
// The maximum number of pubkeys that a packet can contain.
10-
pub const FILTER_SIZE: u8 = (PACKET_DATA_SIZE / core::mem::size_of::<Pubkey>()) as u8;
10+
pub(crate) const FILTER_SIZE: u8 = (PACKET_DATA_SIZE / core::mem::size_of::<Pubkey>()) as u8;
1111

1212
#[derive(Clone, Copy, Debug, PartialEq)]
1313
pub(crate) enum ProgramKind {

compute-budget/Cargo.toml

+2
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,15 @@ license = { workspace = true }
1010
edition = { workspace = true }
1111

1212
[dependencies]
13+
qualifier_attr = { workspace = true, optional = true }
1314
solana-fee-structure = { workspace = true }
1415
solana-frozen-abi = { workspace = true, optional = true, features = [
1516
"frozen-abi",
1617
] }
1718
solana-program-entrypoint = { workspace = true }
1819

1920
[features]
21+
dev-context-only-utils = ["dep:qualifier_attr"]
2022
frozen-abi = ["dep:solana-frozen-abi", "solana-fee-structure/frozen-abi"]
2123

2224
[lints]

compute-budget/src/compute_budget.rs

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
use crate::compute_budget_limits::{self, ComputeBudgetLimits, DEFAULT_HEAP_COST};
2+
#[cfg(feature = "dev-context-only-utils")]
3+
use qualifier_attr::qualifiers;
24

35
#[cfg(feature = "frozen-abi")]
46
impl ::solana_frozen_abi::abi_example::AbiExample for ComputeBudget {
@@ -146,7 +148,8 @@ impl From<ComputeBudgetLimits> for ComputeBudget {
146148
}
147149

148150
impl ComputeBudget {
149-
pub fn new(compute_unit_limit: u64) -> Self {
151+
#[cfg_attr(feature = "dev-context-only-utils", qualifiers(pub))]
152+
fn new(compute_unit_limit: u64) -> Self {
150153
ComputeBudget {
151154
compute_unit_limit,
152155
log_64_units: 100,

program-runtime/Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ thiserror = { workspace = true }
5454

5555
[dev-dependencies]
5656
assert_matches = { workspace = true }
57+
solana-compute-budget = { workspace = true, features = ["dev-context-only-utils"] }
5758
solana-instruction = { workspace = true, features = ["bincode"] }
5859
solana-pubkey = { workspace = true, features = ["rand"] }
5960
solana-transaction-context = { workspace = true, features = [

svm/Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ prost = { workspace = true }
7171
rand0-7 = { workspace = true }
7272
shuttle = { workspace = true }
7373
solana-clock = { workspace = true }
74+
solana-compute-budget = { workspace = true, features = ["dev-context-only-utils"] }
7475
solana-compute-budget-interface = { workspace = true }
7576
solana-compute-budget-program = { workspace = true }
7677
solana-ed25519-program = { workspace = true }

0 commit comments

Comments
 (0)