Skip to content

Commit b70cac3

Browse files
kevinheaveykevinheavey
authored
remove solana-sdk from compute-budget-instruction (solana-labs#4319)
1 parent cb9451c commit b70cac3

File tree

9 files changed

+141
-123
lines changed

9 files changed

+141
-123
lines changed

‎Cargo.lock

Lines changed: 13 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎compute-budget-instruction/Cargo.toml

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,17 @@ edition = { workspace = true }
1111

1212
[dependencies]
1313
log = { workspace = true }
14+
solana-borsh = { workspace = true }
1415
solana-builtins-default-costs = { workspace = true }
1516
solana-compute-budget = { workspace = true }
17+
solana-compute-budget-interface = { workspace = true }
18+
solana-feature-set = { workspace = true }
19+
solana-instruction = { workspace = true }
20+
solana-packet = { workspace = true }
1621
solana-pubkey = { workspace = true }
17-
solana-sdk = { workspace = true }
22+
solana-sdk-ids = { workspace = true }
1823
solana-svm-transaction = { workspace = true }
24+
solana-transaction-error = { workspace = true }
1925
thiserror = { workspace = true }
2026

2127
[lib]
@@ -26,8 +32,14 @@ name = "solana_compute_budget_instruction"
2632
bincode = { workspace = true }
2733
criterion = { workspace = true }
2834
rand = { workspace = true }
29-
solana-builtins-default-costs = { workspace = true, features = ["dev-context-only-utils"] }
35+
solana-builtins-default-costs = { workspace = true, features = ["dev-context-only-utils"] }
36+
solana-hash = { workspace = true }
37+
solana-keypair = { workspace = true }
38+
solana-message = { workspace = true }
3039
solana-program = { workspace = true }
40+
solana-signer = { workspace = true }
41+
solana-system-interface = { workspace = true }
42+
solana-transaction = { workspace = true }
3143

3244
[package.metadata.docs.rs]
3345
targets = ["x86_64-unknown-linux-gnu"]

‎compute-budget-instruction/benches/process_compute_budget_instructions.rs

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,16 @@
11
use {
22
criterion::{black_box, criterion_group, criterion_main, Criterion, Throughput},
33
solana_compute_budget_instruction::instructions_processor::process_compute_budget_instructions,
4-
solana_sdk::{
5-
compute_budget::ComputeBudgetInstruction,
6-
feature_set::FeatureSet,
7-
instruction::Instruction,
8-
message::Message,
9-
pubkey::Pubkey,
10-
signature::Keypair,
11-
signer::Signer,
12-
system_instruction::{self},
13-
transaction::{SanitizedTransaction, Transaction},
14-
},
4+
solana_compute_budget_interface::ComputeBudgetInstruction,
5+
solana_feature_set::FeatureSet,
6+
solana_instruction::Instruction,
7+
solana_keypair::Keypair,
8+
solana_message::Message,
9+
solana_pubkey::Pubkey,
10+
solana_signer::Signer,
1511
solana_svm_transaction::svm_message::SVMMessage,
12+
solana_system_interface::instruction::transfer,
13+
solana_transaction::{sanitized::SanitizedTransaction, Transaction},
1614
};
1715

1816
const NUM_TRANSACTIONS_PER_ITER: usize = 1024;
@@ -110,14 +108,18 @@ fn bench_process_compute_budget_instructions_builtins(c: &mut Criterion) {
110108
.throughput(Throughput::Elements(NUM_TRANSACTIONS_PER_ITER as u64))
111109
.bench_function("4 dummy builtins", |bencher| {
112110
let ixs = vec![
113-
Instruction::new_with_bincode(solana_sdk::bpf_loader::id(), &(), vec![]),
114-
Instruction::new_with_bincode(solana_sdk::secp256k1_program::id(), &(), vec![]),
111+
Instruction::new_with_bincode(solana_sdk_ids::bpf_loader::id(), &(), vec![]),
115112
Instruction::new_with_bincode(
116-
solana_sdk::address_lookup_table::program::id(),
113+
solana_sdk_ids::secp256k1_program::id(),
117114
&(),
118115
vec![],
119116
),
120-
Instruction::new_with_bincode(solana_sdk::loader_v4::id(), &(), vec![]),
117+
Instruction::new_with_bincode(
118+
solana_sdk_ids::address_lookup_table::id(),
119+
&(),
120+
vec![],
121+
),
122+
Instruction::new_with_bincode(solana_sdk_ids::loader_v4::id(), &(), vec![]),
121123
];
122124
let tx = build_sanitized_transaction(&Keypair::new(), &ixs);
123125
bencher.iter(|| {
@@ -156,11 +158,7 @@ fn bench_process_compute_budget_instructions_mixed(c: &mut Criterion) {
156158
ComputeBudgetInstruction::set_compute_unit_limit(u32::MAX),
157159
ComputeBudgetInstruction::set_compute_unit_price(u64::MAX),
158160
ComputeBudgetInstruction::set_loaded_accounts_data_size_limit(u32::MAX),
159-
system_instruction::transfer(
160-
&payer_keypair.pubkey(),
161-
&Pubkey::new_unique(),
162-
1,
163-
),
161+
transfer(&payer_keypair.pubkey(), &Pubkey::new_unique(), 1),
164162
]);
165163
let tx = build_sanitized_transaction(&payer_keypair, &ixs);
166164

‎compute-budget-instruction/src/builtin_programs_filter.rs

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ use {
22
solana_builtins_default_costs::{
33
get_builtin_migration_feature_index, BuiltinMigrationFeatureIndex, MAYBE_BUILTIN_KEY,
44
},
5-
solana_sdk::{packet::PACKET_DATA_SIZE, pubkey::Pubkey},
5+
solana_packet::PACKET_DATA_SIZE,
6+
solana_pubkey::Pubkey,
67
};
78

89
// The maximum number of pubkeys that a packet can contain.
@@ -64,7 +65,7 @@ impl BuiltinProgramsFilter {
6465
mod test {
6566
use {
6667
super::*, solana_builtins_default_costs::get_migration_feature_position,
67-
solana_sdk::feature_set,
68+
solana_feature_set as feature_set,
6869
};
6970

7071
const DUMMY_PROGRAM_ID: &str = "dummmy1111111111111111111111111111111111111";
@@ -90,36 +91,36 @@ mod test {
9091
// lookup same `index` will return cached data, will not lookup `program_id`
9192
// again
9293
assert_eq!(
93-
test_store.get_program_kind(index, &solana_sdk::loader_v4::id()),
94+
test_store.get_program_kind(index, &solana_sdk_ids::loader_v4::id()),
9495
ProgramKind::NotBuiltin
9596
);
9697

9798
// not-migrating builtin
9899
index += 1;
99100
assert_eq!(
100-
test_store.get_program_kind(index, &solana_sdk::loader_v4::id()),
101+
test_store.get_program_kind(index, &solana_sdk_ids::loader_v4::id()),
101102
ProgramKind::Builtin,
102103
);
103104

104105
// compute-budget
105106
index += 1;
106107
assert_eq!(
107-
test_store.get_program_kind(index, &solana_sdk::compute_budget::id()),
108+
test_store.get_program_kind(index, &solana_sdk_ids::compute_budget::id()),
108109
ProgramKind::Builtin,
109110
);
110111

111112
// migrating builtins
112113
for (migrating_builtin_pubkey, migration_feature_id) in [
113114
(
114-
solana_sdk::stake::program::id(),
115+
solana_sdk_ids::stake::id(),
115116
feature_set::migrate_stake_program_to_core_bpf::id(),
116117
),
117118
(
118-
solana_sdk::config::program::id(),
119+
solana_sdk_ids::config::id(),
119120
feature_set::migrate_config_program_to_core_bpf::id(),
120121
),
121122
(
122-
solana_sdk::address_lookup_table::program::id(),
123+
solana_sdk_ids::address_lookup_table::id(),
123124
feature_set::migrate_address_lookup_table_program_to_core_bpf::id(),
124125
),
125126
] {

0 commit comments

Comments
 (0)