Skip to content

Commit eeb3562

Browse files
authored
remove solana-sdk from solana-bucket-map (anza-xyz#3716)
1 parent 1ba36a2 commit eeb3562

File tree

11 files changed

+18
-12
lines changed

11 files changed

+18
-12
lines changed

Cargo.lock

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

bucket_map/Cargo.toml

+3-1
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,16 @@ memmap2 = { workspace = true }
1919
modular-bitfield = { workspace = true }
2020
num_enum = { workspace = true }
2121
rand = { workspace = true }
22+
solana-clock = { workspace = true }
2223
solana-measure = { workspace = true }
23-
solana-sdk = { workspace = true }
24+
solana-pubkey = { workspace = true }
2425
tempfile = { workspace = true }
2526

2627
[dev-dependencies]
2728
fs_extra = { workspace = true }
2829
rayon = { workspace = true }
2930
solana-logger = { workspace = true }
31+
solana-pubkey = { workspace = true, features = ["rand"] }
3032

3133
[lib]
3234
crate-type = ["lib"]

bucket_map/benches/bucket_map.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ extern crate test;
2222
use {
2323
rayon::prelude::*,
2424
solana_bucket_map::bucket_map::{BucketMap, BucketMapConfig},
25-
solana_sdk::pubkey::Pubkey,
25+
solana_pubkey::Pubkey,
2626
std::{collections::hash_map::HashMap, sync::RwLock},
2727
test::Bencher,
2828
};

bucket_map/src/bucket.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ use {
1616
},
1717
rand::{thread_rng, Rng},
1818
solana_measure::measure::Measure,
19-
solana_sdk::pubkey::Pubkey,
19+
solana_pubkey::Pubkey,
2020
std::{
2121
collections::hash_map::DefaultHasher,
2222
fs,

bucket_map/src/bucket_api.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use {
33
bucket::Bucket, bucket_item::BucketItem, bucket_map::BucketMapError,
44
bucket_stats::BucketMapStats, restart::RestartableBucket, MaxSearch, RefCount,
55
},
6-
solana_sdk::pubkey::Pubkey,
6+
solana_pubkey::Pubkey,
77
std::{
88
ops::RangeBounds,
99
path::PathBuf,

bucket_map/src/bucket_item.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use {crate::RefCount, solana_sdk::pubkey::Pubkey};
1+
use {crate::RefCount, solana_pubkey::Pubkey};
22

33
#[derive(Debug, Default, Clone)]
44
pub struct BucketItem<T> {

bucket_map/src/bucket_map.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use {
44
crate::{
55
bucket_api::BucketApi, bucket_stats::BucketMapStats, restart::Restart, MaxSearch, RefCount,
66
},
7-
solana_sdk::pubkey::Pubkey,
7+
solana_pubkey::Pubkey,
88
std::{
99
convert::TryInto,
1010
fmt::Debug,
@@ -491,7 +491,7 @@ mod tests {
491491

492492
let additions = (0..to_add)
493493
.map(|_| {
494-
let k = solana_sdk::pubkey::new_rand();
494+
let k = solana_pubkey::new_rand();
495495
let mut v = gen_rand_value();
496496
if use_batch_insert {
497497
// refcount has to be 1 to use batch insert

bucket_map/src/index_entry.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ use {
88
bv::BitVec,
99
modular_bitfield::prelude::*,
1010
num_enum::FromPrimitive,
11-
solana_sdk::{clock::Slot, pubkey::Pubkey},
11+
solana_clock::Slot,
12+
solana_pubkey::Pubkey,
1213
std::{fmt::Debug, marker::PhantomData},
1314
};
1415

bucket_map/tests/bucket_map.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use {
22
rayon::prelude::*,
33
solana_bucket_map::bucket_map::{BucketMap, BucketMapConfig},
44
solana_measure::measure::Measure,
5-
solana_sdk::pubkey::Pubkey,
5+
solana_pubkey::Pubkey,
66
std::path::PathBuf,
77
};
88
#[test]

programs/sbf/Cargo.lock

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

svm/examples/Cargo.lock

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

0 commit comments

Comments
 (0)