Move accounts-db code to its own crate (solana-labs#32766)

pgarg66 · Aug 9, 2023 · f4287d7 · f4287d7
1 parent b97c451
commit f4287d7
Show file tree

Hide file tree

Showing 153 changed files with 1,380 additions and 1,003 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -3,6 +3,7 @@ members = [
     "account-decoder",
     "accounts-bench",
     "accounts-cluster-bench",
+    "accounts-db",
     "banking-bench",
     "banks-client",
     "banks-interface",
@@ -293,6 +294,7 @@ socket2 = "0.5.3"
 soketto = "0.7"
 solana_rbpf = "=0.6.0"
 solana-account-decoder = { path = "account-decoder", version = "=1.17.0" }
+solana-accounts-db = { path = "accounts-db", version = "=1.17.0" }
 solana-address-lookup-table-program = { path = "programs/address-lookup-table", version = "=1.17.0" }
 solana-banks-client = { path = "banks-client", version = "=1.17.0" }
 solana-banks-interface = { path = "banks-interface", version = "=1.17.0" }

diff --git a/accounts-bench/Cargo.toml b/accounts-bench/Cargo.toml
@@ -12,9 +12,9 @@ edition = { workspace = true }
 clap = { workspace = true }
 log = { workspace = true }
 rayon = { workspace = true }
+solana-accounts-db = { workspace = true }
 solana-logger = { workspace = true }
 solana-measure = { workspace = true }
-solana-runtime = { workspace = true }
 solana-sdk = { workspace = true }
 solana-version = { workspace = true }
 

diff --git a/accounts-bench/src/main.rs b/accounts-bench/src/main.rs
@@ -5,8 +5,7 @@ extern crate log;
 use {
     clap::{crate_description, crate_name, value_t, App, Arg},
     rayon::prelude::*,
-    solana_measure::measure::Measure,
-    solana_runtime::{
+    solana_accounts_db::{
         accounts::Accounts,
         accounts_db::{
             test_utils::{create_test_accounts, update_accounts_bench},
@@ -16,6 +15,7 @@ use {
         ancestors::Ancestors,
         rent_collector::RentCollector,
     },
+    solana_measure::measure::Measure,
     solana_sdk::{
         genesis_config::ClusterType, pubkey::Pubkey, sysvar::epoch_schedule::EpochSchedule,
     },

diff --git a/accounts-cluster-bench/Cargo.toml b/accounts-cluster-bench/Cargo.toml
@@ -14,6 +14,7 @@ log = { workspace = true }
 rand = { workspace = true }
 rayon = { workspace = true }
 solana-account-decoder = { workspace = true }
+solana-accounts-db = { workspace = true }
 solana-clap-utils = { workspace = true }
 solana-cli-config = { workspace = true }
 solana-client = { workspace = true }

diff --git a/accounts-cluster-bench/src/main.rs b/accounts-cluster-bench/src/main.rs
@@ -4,14 +4,14 @@ use {
     log::*,
     rand::{thread_rng, Rng},
     rayon::prelude::*,
+    solana_accounts_db::inline_spl_token,
     solana_clap_utils::{
         hidden_unless_forced, input_parsers::pubkey_of, input_validators::is_url_or_moniker,
     },
     solana_cli_config::{ConfigInput, CONFIG_FILE},
     solana_client::transaction_executor::TransactionExecutor,
     solana_gossip::gossip_service::discover,
     solana_rpc_client::rpc_client::RpcClient,
-    solana_runtime::inline_spl_token,
     solana_sdk::{
         commitment_config::CommitmentConfig,
         hash::Hash,
@@ -703,6 +703,7 @@ fn main() {
 pub mod test {
     use {
         super::*,
+        solana_accounts_db::inline_spl_token,
         solana_core::validator::ValidatorConfig,
         solana_faucet::faucet::run_local_faucet,
         solana_local_cluster::{