Skip to content

Commit 1877601

Browse files
kevinheaveykevinheavey
authored
remove solana-sdk from unified-scheduler-pool (#4238)
* remove solana-sdk from unified-scheduler-pool * missing comma * fmt
1 parent ebaa970 commit 1877601

File tree

5 files changed

+43
-31
lines changed

5 files changed

+43
-31
lines changed

‎Cargo.lock

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

‎programs/sbf/Cargo.lock

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

‎svm/examples/Cargo.lock

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

‎unified-scheduler-pool/Cargo.toml

+6-1
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,24 @@ log = { workspace = true }
1818
qualifier_attr = { workspace = true }
1919
scopeguard = { workspace = true }
2020
solana-ledger = { workspace = true }
21+
solana-pubkey = { workspace = true }
2122
solana-runtime = { workspace = true }
2223
solana-runtime-transaction = { workspace = true }
23-
solana-sdk = { workspace = true }
2424
solana-timings = { workspace = true }
25+
solana-transaction = { workspace = true }
26+
solana-transaction-error = { workspace = true }
2527
solana-unified-scheduler-logic = { workspace = true }
2628
static_assertions = { workspace = true }
2729
vec_extract_if_polyfill = { workspace = true }
2830

2931
[dev-dependencies]
3032
assert_matches = { workspace = true }
3133
lazy_static = { workspace = true }
34+
solana-clock = { workspace = true }
35+
solana-keypair = { workspace = true }
3236
solana-logger = { workspace = true }
3337
solana-runtime = { workspace = true, features = ["dev-context-only-utils"] }
38+
solana-system-transaction = { workspace = true }
3439

3540
[features]
3641
dev-context-only-utils = []

‎unified-scheduler-pool/src/lib.rs

+25-27
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ use {
2020
solana_ledger::blockstore_processor::{
2121
execute_batch, TransactionBatchWithIndexes, TransactionStatusSender,
2222
},
23+
solana_pubkey::Pubkey,
2324
solana_runtime::{
2425
installed_scheduler_pool::{
2526
initialized_result_with_timings, InstalledScheduler, InstalledSchedulerBox,
@@ -31,11 +32,9 @@ use {
3132
vote_sender_types::ReplayVoteSender,
3233
},
3334
solana_runtime_transaction::runtime_transaction::RuntimeTransaction,
34-
solana_sdk::{
35-
pubkey::Pubkey,
36-
transaction::{Result, SanitizedTransaction, TransactionError},
37-
},
3835
solana_timings::ExecuteTimings,
36+
solana_transaction::sanitized::SanitizedTransaction,
37+
solana_transaction_error::{TransactionError, TransactionResult as Result},
3938
solana_unified_scheduler_logic::{SchedulingStateMachine, Task, UsageQueue},
4039
static_assertions::const_assert_eq,
4140
std::{
@@ -1473,21 +1472,20 @@ mod tests {
14731472
super::*,
14741473
crate::sleepless_testing,
14751474
assert_matches::assert_matches,
1475+
solana_clock::{Slot, MAX_PROCESSING_AGE},
1476+
solana_keypair::Keypair,
1477+
solana_pubkey::Pubkey,
14761478
solana_runtime::{
14771479
bank::Bank,
14781480
bank_forks::BankForks,
14791481
genesis_utils::{create_genesis_config, GenesisConfigInfo},
14801482
installed_scheduler_pool::{BankWithScheduler, SchedulingContext},
14811483
prioritization_fee_cache::PrioritizationFeeCache,
14821484
},
1483-
solana_sdk::{
1484-
clock::{Slot, MAX_PROCESSING_AGE},
1485-
pubkey::Pubkey,
1486-
signer::keypair::Keypair,
1487-
system_transaction,
1488-
transaction::{SanitizedTransaction, TransactionError},
1489-
},
1485+
solana_system_transaction as system_transaction,
14901486
solana_timings::ExecuteTimingType,
1487+
solana_transaction::sanitized::SanitizedTransaction,
1488+
solana_transaction_error::TransactionError,
14911489
std::{
14921490
sync::{Arc, RwLock},
14931491
thread::JoinHandle,
@@ -1787,7 +1785,7 @@ mod tests {
17871785
let tx_before_stale =
17881786
RuntimeTransaction::from_transaction_for_tests(system_transaction::transfer(
17891787
&mint_keypair,
1790-
&solana_sdk::pubkey::new_rand(),
1788+
&solana_pubkey::new_rand(),
17911789
2,
17921790
genesis_config.hash(),
17931791
));
@@ -1799,7 +1797,7 @@ mod tests {
17991797
let tx_after_stale =
18001798
RuntimeTransaction::from_transaction_for_tests(system_transaction::transfer(
18011799
&mint_keypair,
1802-
&solana_sdk::pubkey::new_rand(),
1800+
&solana_pubkey::new_rand(),
18031801
2,
18041802
genesis_config.hash(),
18051803
));
@@ -1907,7 +1905,7 @@ mod tests {
19071905
let tx_before_stale =
19081906
RuntimeTransaction::from_transaction_for_tests(system_transaction::transfer(
19091907
&mint_keypair,
1910-
&solana_sdk::pubkey::new_rand(),
1908+
&solana_pubkey::new_rand(),
19111909
2,
19121910
genesis_config.hash(),
19131911
));
@@ -1920,7 +1918,7 @@ mod tests {
19201918
let tx_after_stale =
19211919
RuntimeTransaction::from_transaction_for_tests(system_transaction::transfer(
19221920
&mint_keypair,
1923-
&solana_sdk::pubkey::new_rand(),
1921+
&solana_pubkey::new_rand(),
19241922
2,
19251923
genesis_config.hash(),
19261924
));
@@ -1970,7 +1968,7 @@ mod tests {
19701968

19711969
let tx = RuntimeTransaction::from_transaction_for_tests(system_transaction::transfer(
19721970
&mint_keypair,
1973-
&solana_sdk::pubkey::new_rand(),
1971+
&solana_pubkey::new_rand(),
19741972
2,
19751973
genesis_config.hash(),
19761974
));
@@ -2090,7 +2088,7 @@ mod tests {
20902088
for i in 0..MAX_TASK_COUNT {
20912089
let tx = RuntimeTransaction::from_transaction_for_tests(system_transaction::transfer(
20922090
&mint_keypair,
2093-
&solana_sdk::pubkey::new_rand(),
2091+
&solana_pubkey::new_rand(),
20942092
2,
20952093
genesis_config.hash(),
20962094
));
@@ -2241,7 +2239,7 @@ mod tests {
22412239
} = create_genesis_config(10_000);
22422240
let tx0 = RuntimeTransaction::from_transaction_for_tests(system_transaction::transfer(
22432241
&mint_keypair,
2244-
&solana_sdk::pubkey::new_rand(),
2242+
&solana_pubkey::new_rand(),
22452243
2,
22462244
genesis_config.hash(),
22472245
));
@@ -2301,7 +2299,7 @@ mod tests {
23012299
let unfunded_keypair = Keypair::new();
23022300
let bad_tx = RuntimeTransaction::from_transaction_for_tests(system_transaction::transfer(
23032301
&unfunded_keypair,
2304-
&solana_sdk::pubkey::new_rand(),
2302+
&solana_pubkey::new_rand(),
23052303
2,
23062304
genesis_config.hash(),
23072305
));
@@ -2313,7 +2311,7 @@ mod tests {
23132311
let good_tx_after_bad_tx =
23142312
RuntimeTransaction::from_transaction_for_tests(system_transaction::transfer(
23152313
&mint_keypair,
2316-
&solana_sdk::pubkey::new_rand(),
2314+
&solana_pubkey::new_rand(),
23172315
3,
23182316
genesis_config.hash(),
23192317
));
@@ -2431,7 +2429,7 @@ mod tests {
24312429
// Use 2 non-conflicting txes to exercise the channel disconnected case as well.
24322430
let tx = RuntimeTransaction::from_transaction_for_tests(system_transaction::transfer(
24332431
&Keypair::new(),
2434-
&solana_sdk::pubkey::new_rand(),
2432+
&solana_pubkey::new_rand(),
24352433
1,
24362434
genesis_config.hash(),
24372435
));
@@ -2504,7 +2502,7 @@ mod tests {
25042502
for i in 0..10 {
25052503
let tx = RuntimeTransaction::from_transaction_for_tests(system_transaction::transfer(
25062504
&mint_keypair,
2507-
&solana_sdk::pubkey::new_rand(),
2505+
&solana_pubkey::new_rand(),
25082506
2,
25092507
genesis_config.hash(),
25102508
));
@@ -2561,13 +2559,13 @@ mod tests {
25612559
// tx0 and tx1 is definitely conflicting to write-lock the mint address
25622560
let tx0 = RuntimeTransaction::from_transaction_for_tests(system_transaction::transfer(
25632561
&mint_keypair,
2564-
&solana_sdk::pubkey::new_rand(),
2562+
&solana_pubkey::new_rand(),
25652563
2,
25662564
genesis_config.hash(),
25672565
));
25682566
let tx1 = RuntimeTransaction::from_transaction_for_tests(system_transaction::transfer(
25692567
&mint_keypair,
2570-
&solana_sdk::pubkey::new_rand(),
2568+
&solana_pubkey::new_rand(),
25712569
2,
25722570
genesis_config.hash(),
25732571
));
@@ -2653,7 +2651,7 @@ mod tests {
26532651
let dummy_tx =
26542652
RuntimeTransaction::from_transaction_for_tests(system_transaction::transfer(
26552653
&mint_keypair,
2656-
&solana_sdk::pubkey::new_rand(),
2654+
&solana_pubkey::new_rand(),
26572655
2,
26582656
genesis_config.hash(),
26592657
));
@@ -2831,7 +2829,7 @@ mod tests {
28312829
let very_old_valid_tx =
28322830
RuntimeTransaction::from_transaction_for_tests(system_transaction::transfer(
28332831
&mint_keypair,
2834-
&solana_sdk::pubkey::new_rand(),
2832+
&solana_pubkey::new_rand(),
28352833
2,
28362834
genesis_config.hash(),
28372835
));
@@ -2921,7 +2919,7 @@ mod tests {
29212919

29222920
let mut tx = system_transaction::transfer(
29232921
mint_keypair,
2924-
&solana_sdk::pubkey::new_rand(),
2922+
&solana_pubkey::new_rand(),
29252923
2,
29262924
genesis_config.hash(),
29272925
);

0 commit comments

Comments
 (0)