From 3450b9a44d174e17fdf6cb4167102ae47d370b6c Mon Sep 17 00:00:00 2001 From: Michael Vines Date: Wed, 21 Aug 2019 10:23:33 -0700 Subject: [PATCH] Rename solana to solana-core (#5583) --- Cargo.lock | 158 +++++++++++++-------------- bench-exchange/Cargo.toml | 4 +- bench-exchange/src/bench.rs | 6 +- bench-exchange/src/cli.rs | 2 +- bench-exchange/src/main.rs | 2 +- bench-streamer/Cargo.toml | 4 +- bench-streamer/src/main.rs | 8 +- bench-tps/Cargo.toml | 4 +- bench-tps/src/bench.rs | 6 +- bench-tps/src/main.rs | 2 +- core/Cargo.toml | 2 +- core/benches/banking_stage.rs | 20 ++-- core/benches/blocktree.rs | 8 +- core/benches/chacha.rs | 4 +- core/benches/gen_keys.rs | 2 +- core/benches/ledger.rs | 2 +- core/benches/poh.rs | 6 +- core/benches/poh_verify.rs | 4 +- core/benches/sigverify.rs | 8 +- core/benches/sigverify_stage.rs | 10 +- core/tests/cluster_info.rs | 4 +- core/tests/crds_gossip.rs | 14 +-- core/tests/gossip.rs | 10 +- core/tests/rpc.rs | 2 +- core/tests/tvu.rs | 30 ++--- genesis/Cargo.toml | 4 +- genesis/src/main.rs | 2 +- gossip/Cargo.toml | 2 +- gossip/src/main.rs | 6 +- ledger-tool/Cargo.toml | 2 +- ledger-tool/src/main.rs | 4 +- ledger-tool/tests/basic.rs | 6 +- local_cluster/Cargo.toml | 4 +- local_cluster/src/cluster_tests.rs | 4 +- local_cluster/src/lib.rs | 2 +- local_cluster/src/local_cluster.rs | 6 +- local_cluster/tests/local_cluster.rs | 4 +- local_cluster/tests/replicator.rs | 16 +-- replicator/Cargo.toml | 4 +- replicator/src/main.rs | 6 +- validator/Cargo.toml | 4 +- validator/src/main.rs | 18 +-- wallet/Cargo.toml | 2 +- wallet/tests/deploy.rs | 2 +- wallet/tests/pay.rs | 2 +- wallet/tests/request_airdrop.rs | 2 +- 46 files changed, 212 insertions(+), 212 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 55095a02ad..9eb46675ba 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3031,75 +3031,6 @@ dependencies = [ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "solana" -version = "0.18.0-pre2" -dependencies = [ - "bincode 1.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "bs58 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "bzip2 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", - "chrono 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", - "core_affinity 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)", - "crc 1.8.1 (registry+https://github.com/rust-lang/crates.io-index)", - "crossbeam-channel 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", - "dir-diff 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "fs_extra 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "hex-literal 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "indexmap 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", - "jsonrpc-core 13.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "jsonrpc-derive 13.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "jsonrpc-http-server 13.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "jsonrpc-pubsub 13.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "jsonrpc-ws-server 13.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", - "memmap 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "nix 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", - "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", - "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", - "rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "rayon 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "reed-solomon-erasure 3.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "reqwest 0.9.19 (registry+https://github.com/rust-lang/crates.io-index)", - "rocksdb 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", - "serial_test 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serial_test_derive 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-budget-api 0.18.0-pre2", - "solana-budget-program 0.18.0-pre2", - "solana-chacha-sys 0.18.0-pre2", - "solana-client 0.18.0-pre2", - "solana-drone 0.18.0-pre2", - "solana-ed25519-dalek 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-kvstore 0.18.0-pre2", - "solana-logger 0.18.0-pre2", - "solana-measure 0.18.0-pre2", - "solana-merkle-tree 0.18.0-pre2", - "solana-metrics 0.18.0-pre2", - "solana-netutil 0.18.0-pre2", - "solana-runtime 0.18.0-pre2", - "solana-sdk 0.18.0-pre2", - "solana-stake-api 0.18.0-pre2", - "solana-storage-api 0.18.0-pre2", - "solana-storage-program 0.18.0-pre2", - "solana-vote-api 0.18.0-pre2", - "solana-vote-signer 0.18.0-pre2", - "symlink 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sys-info 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)", - "tar 0.4.26 (registry+https://github.com/rust-lang/crates.io-index)", - "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio 0.1.22 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-codec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-fs 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", - "untrusted 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "solana-bench-exchange" version = "0.18.0-pre2" @@ -3118,8 +3049,8 @@ dependencies = [ "serde_derive 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", "serde_yaml 0.8.9 (registry+https://github.com/rust-lang/crates.io-index)", - "solana 0.18.0-pre2", "solana-client 0.18.0-pre2", + "solana-core 0.18.0-pre2", "solana-drone 0.18.0-pre2", "solana-exchange-api 0.18.0-pre2", "solana-exchange-program 0.18.0-pre2", @@ -3138,7 +3069,7 @@ name = "solana-bench-streamer" version = "0.18.0-pre2" dependencies = [ "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", - "solana 0.18.0-pre2", + "solana-core 0.18.0-pre2", "solana-logger 0.18.0-pre2", "solana-netutil 0.18.0-pre2", ] @@ -3155,8 +3086,8 @@ dependencies = [ "serde_derive 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", "serde_yaml 0.8.9 (registry+https://github.com/rust-lang/crates.io-index)", - "solana 0.18.0-pre2", "solana-client 0.18.0-pre2", + "solana-core 0.18.0-pre2", "solana-drone 0.18.0-pre2", "solana-librapay-api 0.18.0-pre2", "solana-local-cluster 0.18.0-pre2", @@ -3298,6 +3229,75 @@ dependencies = [ "solana-sdk 0.18.0-pre2", ] +[[package]] +name = "solana-core" +version = "0.18.0-pre2" +dependencies = [ + "bincode 1.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "bs58 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "bzip2 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "chrono 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", + "core_affinity 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)", + "crc 1.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "crossbeam-channel 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", + "dir-diff 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "fs_extra 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "hex-literal 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "indexmap 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", + "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "jsonrpc-core 13.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "jsonrpc-derive 13.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "jsonrpc-http-server 13.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "jsonrpc-pubsub 13.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "jsonrpc-ws-server 13.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", + "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", + "memmap 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "nix 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", + "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "rayon 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "reed-solomon-erasure 3.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "reqwest 0.9.19 (registry+https://github.com/rust-lang/crates.io-index)", + "rocksdb 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", + "serial_test 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "serial_test_derive 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-budget-api 0.18.0-pre2", + "solana-budget-program 0.18.0-pre2", + "solana-chacha-sys 0.18.0-pre2", + "solana-client 0.18.0-pre2", + "solana-drone 0.18.0-pre2", + "solana-ed25519-dalek 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-kvstore 0.18.0-pre2", + "solana-logger 0.18.0-pre2", + "solana-measure 0.18.0-pre2", + "solana-merkle-tree 0.18.0-pre2", + "solana-metrics 0.18.0-pre2", + "solana-netutil 0.18.0-pre2", + "solana-runtime 0.18.0-pre2", + "solana-sdk 0.18.0-pre2", + "solana-stake-api 0.18.0-pre2", + "solana-storage-api 0.18.0-pre2", + "solana-storage-program 0.18.0-pre2", + "solana-vote-api 0.18.0-pre2", + "solana-vote-signer 0.18.0-pre2", + "symlink 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sys-info 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)", + "tar 0.4.26 (registry+https://github.com/rust-lang/crates.io-index)", + "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio 0.1.22 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-codec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-fs 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", + "untrusted 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "solana-drone" version = "0.18.0-pre2" @@ -3380,7 +3380,7 @@ dependencies = [ "serde_derive 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", "serde_yaml 0.8.9 (registry+https://github.com/rust-lang/crates.io-index)", - "solana 0.18.0-pre2", + "solana-core 0.18.0-pre2", "solana-genesis-programs 0.18.0-pre2", "solana-sdk 0.18.0-pre2", "solana-stake-api 0.18.0-pre2", @@ -3418,8 +3418,8 @@ name = "solana-gossip" version = "0.18.0-pre2" dependencies = [ "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", - "solana 0.18.0-pre2", "solana-client 0.18.0-pre2", + "solana-core 0.18.0-pre2", "solana-logger 0.18.0-pre2", "solana-netutil 0.18.0-pre2", "solana-sdk 0.18.0-pre2", @@ -3494,7 +3494,7 @@ dependencies = [ "serde_derive 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", "serde_yaml 0.8.9 (registry+https://github.com/rust-lang/crates.io-index)", - "solana 0.18.0-pre2", + "solana-core 0.18.0-pre2", "solana-logger 0.18.0-pre2", "solana-runtime 0.18.0-pre2", "solana-sdk 0.18.0-pre2", @@ -3521,8 +3521,8 @@ dependencies = [ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "serial_test 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "serial_test_derive 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "solana 0.18.0-pre2", "solana-client 0.18.0-pre2", + "solana-core 0.18.0-pre2", "solana-logger 0.18.0-pre2", "solana-runtime 0.18.0-pre2", "solana-sdk 0.18.0-pre2", @@ -3638,7 +3638,7 @@ name = "solana-replicator" version = "0.18.0-pre2" dependencies = [ "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", - "solana 0.18.0-pre2", + "solana-core 0.18.0-pre2", "solana-logger 0.18.0-pre2", "solana-netutil 0.18.0-pre2", "solana-sdk 0.18.0-pre2", @@ -3830,7 +3830,7 @@ dependencies = [ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "reqwest 0.9.19 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", - "solana 0.18.0-pre2", + "solana-core 0.18.0-pre2", "solana-drone 0.18.0-pre2", "solana-logger 0.18.0-pre2", "solana-metrics 0.18.0-pre2", @@ -3919,10 +3919,10 @@ dependencies = [ "serde_derive 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", "serde_yaml 0.8.9 (registry+https://github.com/rust-lang/crates.io-index)", - "solana 0.18.0-pre2", "solana-budget-api 0.18.0-pre2", "solana-budget-program 0.18.0-pre2", "solana-client 0.18.0-pre2", + "solana-core 0.18.0-pre2", "solana-drone 0.18.0-pre2", "solana-logger 0.18.0-pre2", "solana-netutil 0.18.0-pre2", diff --git a/bench-exchange/Cargo.toml b/bench-exchange/Cargo.toml index 10ff3fed64..f9c4a58511 100644 --- a/bench-exchange/Cargo.toml +++ b/bench-exchange/Cargo.toml @@ -24,7 +24,7 @@ serde_derive = "1.0.98" serde_json = "1.0.40" serde_yaml = "0.8.9" # solana-runtime = { path = "../solana/runtime"} -solana = { path = "../core", version = "0.18.0-pre2" } +solana-core = { path = "../core", version = "0.18.0-pre2" } solana-local-cluster = { path = "../local_cluster", version = "0.18.0-pre2" } solana-client = { path = "../client", version = "0.18.0-pre2" } solana-drone = { path = "../drone", version = "0.18.0-pre2" } @@ -39,5 +39,5 @@ untrusted = "0.7.0" ws = "0.9.0" [features] -cuda = ["solana/cuda"] +cuda = ["solana-core/cuda"] diff --git a/bench-exchange/src/bench.rs b/bench-exchange/src/bench.rs index dbde10deff..a2bcb00c86 100644 --- a/bench-exchange/src/bench.rs +++ b/bench-exchange/src/bench.rs @@ -5,8 +5,8 @@ use itertools::izip; use log::*; use rand::{thread_rng, Rng}; use rayon::prelude::*; -use solana::gen_keys::GenKeys; use solana_client::perf_utils::{sample_txs, SampleStats}; +use solana_core::gen_keys::GenKeys; use solana_drone::drone::request_airdrop_transaction; use solana_exchange_api::exchange_instruction; use solana_exchange_api::exchange_state::*; @@ -963,8 +963,8 @@ pub fn airdrop_lamports(client: &dyn Client, drone_addr: &SocketAddr, id: &Keypa #[cfg(test)] mod tests { use super::*; - use solana::gossip_service::{discover_cluster, get_multi_client}; - use solana::validator::ValidatorConfig; + use solana_core::gossip_service::{discover_cluster, get_multi_client}; + use solana_core::validator::ValidatorConfig; use solana_drone::drone::run_local_drone; use solana_exchange_api::exchange_processor::process_instruction; use solana_local_cluster::local_cluster::{ClusterConfig, LocalCluster}; diff --git a/bench-exchange/src/cli.rs b/bench-exchange/src/cli.rs index 959dfd2de2..8291b88abe 100644 --- a/bench-exchange/src/cli.rs +++ b/bench-exchange/src/cli.rs @@ -1,5 +1,5 @@ use clap::{crate_description, crate_name, crate_version, value_t, App, Arg, ArgMatches}; -use solana::gen_keys::GenKeys; +use solana_core::gen_keys::GenKeys; use solana_drone::drone::DRONE_PORT; use solana_sdk::signature::{read_keypair, Keypair, KeypairUtil}; use std::net::SocketAddr; diff --git a/bench-exchange/src/main.rs b/bench-exchange/src/main.rs index ab48e7c463..531d03c606 100644 --- a/bench-exchange/src/main.rs +++ b/bench-exchange/src/main.rs @@ -8,7 +8,7 @@ extern crate solana_exchange_program; use crate::bench::{airdrop_lamports, create_client_accounts_file, do_bench_exchange, Config}; use log::*; -use solana::gossip_service::{discover_cluster, get_multi_client}; +use solana_core::gossip_service::{discover_cluster, get_multi_client}; use solana_sdk::signature::KeypairUtil; fn main() { diff --git a/bench-streamer/Cargo.toml b/bench-streamer/Cargo.toml index e6b08c8e21..76e50e5260 100644 --- a/bench-streamer/Cargo.toml +++ b/bench-streamer/Cargo.toml @@ -9,10 +9,10 @@ homepage = "https://solana.com/" [dependencies] clap = "2.33.0" -solana = { path = "../core", version = "0.18.0-pre2" } +solana-core = { path = "../core", version = "0.18.0-pre2" } solana-logger = { path = "../logger", version = "0.18.0-pre2" } solana-netutil = { path = "../utils/netutil", version = "0.18.0-pre2" } [features] -cuda = ["solana/cuda"] +cuda = ["solana-core/cuda"] diff --git a/bench-streamer/src/main.rs b/bench-streamer/src/main.rs index 343ea5a43f..7103a5fc83 100644 --- a/bench-streamer/src/main.rs +++ b/bench-streamer/src/main.rs @@ -1,8 +1,8 @@ use clap::{crate_description, crate_name, crate_version, App, Arg}; -use solana::packet::PacketsRecycler; -use solana::packet::{Packet, Packets, BLOB_SIZE, PACKET_DATA_SIZE}; -use solana::result::Result; -use solana::streamer::{receiver, PacketReceiver}; +use solana_core::packet::PacketsRecycler; +use solana_core::packet::{Packet, Packets, BLOB_SIZE, PACKET_DATA_SIZE}; +use solana_core::result::Result; +use solana_core::streamer::{receiver, PacketReceiver}; use std::cmp::max; use std::net::{IpAddr, Ipv4Addr, SocketAddr, UdpSocket}; use std::sync::atomic::{AtomicBool, AtomicUsize, Ordering}; diff --git a/bench-tps/Cargo.toml b/bench-tps/Cargo.toml index be3bbe631a..e57f1b53c1 100644 --- a/bench-tps/Cargo.toml +++ b/bench-tps/Cargo.toml @@ -16,7 +16,7 @@ serde = "1.0.99" serde_derive = "1.0.98" serde_json = "1.0.40" serde_yaml = "0.8.9" -solana = { path = "../core", version = "0.18.0-pre2" } +solana-core = { path = "../core", version = "0.18.0-pre2" } solana-local-cluster = { path = "../local_cluster", version = "0.18.0-pre2" } solana-client = { path = "../client", version = "0.18.0-pre2" } solana-drone = { path = "../drone", version = "0.18.0-pre2" } @@ -31,5 +31,5 @@ solana-move-loader-program = { path = "../programs/move_loader_program", version solana-move-loader-api = { path = "../programs/move_loader_api", version = "0.18.0-pre2" } [features] -cuda = ["solana/cuda"] +cuda = ["solana-core/cuda"] diff --git a/bench-tps/src/bench.rs b/bench-tps/src/bench.rs index 80bb91be80..b3ebe6ba97 100644 --- a/bench-tps/src/bench.rs +++ b/bench-tps/src/bench.rs @@ -3,8 +3,8 @@ use solana_metrics; use bincode; use log::*; use rayon::prelude::*; -use solana::gen_keys::GenKeys; use solana_client::perf_utils::{sample_txs, SampleStats}; +use solana_core::gen_keys::GenKeys; use solana_drone::drone::request_airdrop_transaction; use solana_librapay_api::{create_genesis, upload_mint_program, upload_payment_program}; use solana_measure::measure::Measure; @@ -934,9 +934,9 @@ pub fn generate_and_fund_keypairs( mod tests { use super::*; - use solana::cluster_info::FULLNODE_PORT_RANGE; - use solana::validator::ValidatorConfig; use solana_client::thin_client::create_client; + use solana_core::cluster_info::FULLNODE_PORT_RANGE; + use solana_core::validator::ValidatorConfig; use solana_drone::drone::run_local_drone; use solana_local_cluster::local_cluster::{ClusterConfig, LocalCluster}; use solana_runtime::bank::Bank; diff --git a/bench-tps/src/main.rs b/bench-tps/src/main.rs index d5613e007b..b0aa9847f0 100644 --- a/bench-tps/src/main.rs +++ b/bench-tps/src/main.rs @@ -8,7 +8,7 @@ mod cli; use crate::bench::{ do_bench_tps, generate_and_fund_keypairs, generate_keypairs, Config, NUM_LAMPORTS_PER_ACCOUNT, }; -use solana::gossip_service::{discover_cluster, get_multi_client}; +use solana_core::gossip_service::{discover_cluster, get_multi_client}; use solana_sdk::fee_calculator::FeeCalculator; use solana_sdk::signature::{Keypair, KeypairUtil}; use std::collections::HashMap; diff --git a/core/Cargo.toml b/core/Cargo.toml index b8378b4ab8..74dd6d62ab 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "solana" +name = "solana-core" description = "Blockchain, Rebuilt for Scale" version = "0.18.0-pre2" documentation = "https://docs.rs/solana" diff --git a/core/benches/banking_stage.rs b/core/benches/banking_stage.rs index ed28d54801..54e4d1696e 100644 --- a/core/benches/banking_stage.rs +++ b/core/benches/banking_stage.rs @@ -2,21 +2,21 @@ extern crate test; #[macro_use] -extern crate solana; +extern crate solana_core; use crossbeam_channel::unbounded; use log::*; use rand::{thread_rng, Rng}; use rayon::prelude::*; -use solana::banking_stage::{create_test_recorder, BankingStage}; -use solana::blocktree::{get_tmp_ledger_path, Blocktree}; -use solana::cluster_info::ClusterInfo; -use solana::cluster_info::Node; -use solana::genesis_utils::{create_genesis_block, GenesisBlockInfo}; -use solana::packet::to_packets_chunked; -use solana::poh_recorder::WorkingBankEntries; -use solana::service::Service; -use solana::test_tx::test_tx; +use solana_core::banking_stage::{create_test_recorder, BankingStage}; +use solana_core::blocktree::{get_tmp_ledger_path, Blocktree}; +use solana_core::cluster_info::ClusterInfo; +use solana_core::cluster_info::Node; +use solana_core::genesis_utils::{create_genesis_block, GenesisBlockInfo}; +use solana_core::packet::to_packets_chunked; +use solana_core::poh_recorder::WorkingBankEntries; +use solana_core::service::Service; +use solana_core::test_tx::test_tx; use solana_runtime::bank::Bank; use solana_sdk::hash::Hash; use solana_sdk::pubkey::Pubkey; diff --git a/core/benches/blocktree.rs b/core/benches/blocktree.rs index 2315ce95a8..c6b1cdee0f 100644 --- a/core/benches/blocktree.rs +++ b/core/benches/blocktree.rs @@ -4,13 +4,13 @@ use rand; extern crate test; #[macro_use] -extern crate solana; +extern crate solana_core; use rand::seq::SliceRandom; use rand::{thread_rng, Rng}; -use solana::blocktree::{get_tmp_ledger_path, Blocktree}; -use solana::entry::{make_large_test_entries, make_tiny_test_entries, EntrySlice}; -use solana::packet::{Blob, BLOB_HEADER_SIZE}; +use solana_core::blocktree::{get_tmp_ledger_path, Blocktree}; +use solana_core::entry::{make_large_test_entries, make_tiny_test_entries, EntrySlice}; +use solana_core::packet::{Blob, BLOB_HEADER_SIZE}; use std::path::Path; use test::Bencher; diff --git a/core/benches/chacha.rs b/core/benches/chacha.rs index 8573922924..df7da1184a 100644 --- a/core/benches/chacha.rs +++ b/core/benches/chacha.rs @@ -1,9 +1,9 @@ //#![feature(test)] // -//extern crate solana; +//extern crate solana_core; //extern crate test; // -//use solana::chacha::chacha_cbc_encrypt_files; +//use solana_core::chacha::chacha_cbc_encrypt_files; //use std::fs::remove_file; //use std::fs::File; //use std::io::Write; diff --git a/core/benches/gen_keys.rs b/core/benches/gen_keys.rs index 39ba917efa..c584e83ed2 100644 --- a/core/benches/gen_keys.rs +++ b/core/benches/gen_keys.rs @@ -2,7 +2,7 @@ extern crate test; -use solana::gen_keys::GenKeys; +use solana_core::gen_keys::GenKeys; use test::Bencher; #[bench] diff --git a/core/benches/ledger.rs b/core/benches/ledger.rs index 94bcd3b6a3..264c2b8cdc 100644 --- a/core/benches/ledger.rs +++ b/core/benches/ledger.rs @@ -2,7 +2,7 @@ extern crate test; -use solana::entry::{next_entries, reconstruct_entries_from_blobs, EntrySlice}; +use solana_core::entry::{next_entries, reconstruct_entries_from_blobs, EntrySlice}; use solana_sdk::hash::{hash, Hash}; use solana_sdk::signature::{Keypair, KeypairUtil}; use solana_sdk::system_transaction; diff --git a/core/benches/poh.rs b/core/benches/poh.rs index 2a1bacd537..ff2ff4dffd 100644 --- a/core/benches/poh.rs +++ b/core/benches/poh.rs @@ -1,10 +1,10 @@ -// This bench attempts to justify the value of `solana::poh_service::NUM_HASHES_PER_BATCH` +// This bench attempts to justify the value of `solana_core::poh_service::NUM_HASHES_PER_BATCH` #![feature(test)] extern crate test; -use solana::poh::Poh; -use solana::poh_service::NUM_HASHES_PER_BATCH; +use solana_core::poh::Poh; +use solana_core::poh_service::NUM_HASHES_PER_BATCH; use solana_sdk::hash::Hash; use std::sync::atomic::{AtomicBool, Ordering}; use std::sync::{Arc, Mutex}; diff --git a/core/benches/poh_verify.rs b/core/benches/poh_verify.rs index 22db1d352d..b13c503fb6 100644 --- a/core/benches/poh_verify.rs +++ b/core/benches/poh_verify.rs @@ -1,8 +1,8 @@ #![feature(test)] extern crate test; -use solana::entry::EntrySlice; -use solana::entry::{next_entry_mut, Entry}; +use solana_core::entry::EntrySlice; +use solana_core::entry::{next_entry_mut, Entry}; use solana_sdk::hash::{hash, Hash}; use solana_sdk::signature::{Keypair, KeypairUtil}; use solana_sdk::system_transaction; diff --git a/core/benches/sigverify.rs b/core/benches/sigverify.rs index ccf8b5bf3f..e6c1ced32b 100644 --- a/core/benches/sigverify.rs +++ b/core/benches/sigverify.rs @@ -2,10 +2,10 @@ extern crate test; -use solana::packet::to_packets; -use solana::recycler::Recycler; -use solana::sigverify; -use solana::test_tx::test_tx; +use solana_core::packet::to_packets; +use solana_core::recycler::Recycler; +use solana_core::sigverify; +use solana_core::test_tx::test_tx; use test::Bencher; #[bench] diff --git a/core/benches/sigverify_stage.rs b/core/benches/sigverify_stage.rs index 9fa8e7e79f..e20c220e0d 100644 --- a/core/benches/sigverify_stage.rs +++ b/core/benches/sigverify_stage.rs @@ -1,15 +1,15 @@ #![feature(test)] -extern crate solana; +extern crate solana_core; extern crate test; use crossbeam_channel::unbounded; use log::*; use rand::{thread_rng, Rng}; -use solana::packet::to_packets_chunked; -use solana::service::Service; -use solana::sigverify_stage::SigVerifyStage; -use solana::test_tx::test_tx; +use solana_core::packet::to_packets_chunked; +use solana_core::service::Service; +use solana_core::sigverify_stage::SigVerifyStage; +use solana_core::test_tx::test_tx; use solana_sdk::hash::Hash; use solana_sdk::signature::{Keypair, KeypairUtil}; use solana_sdk::system_transaction; diff --git a/core/tests/cluster_info.rs b/core/tests/cluster_info.rs index 30bb0149f0..1cd9407bb2 100644 --- a/core/tests/cluster_info.rs +++ b/core/tests/cluster_info.rs @@ -3,8 +3,8 @@ use rand_chacha::ChaChaRng; use rayon::iter::ParallelIterator; use rayon::prelude::*; use serial_test_derive::serial; -use solana::cluster_info::{compute_retransmit_peers, ClusterInfo}; -use solana::contact_info::ContactInfo; +use solana_core::cluster_info::{compute_retransmit_peers, ClusterInfo}; +use solana_core::contact_info::ContactInfo; use solana_sdk::pubkey::Pubkey; use std::collections::{HashMap, HashSet}; use std::sync::mpsc::channel; diff --git a/core/tests/crds_gossip.rs b/core/tests/crds_gossip.rs index bb1a158c9c..af557d5d98 100644 --- a/core/tests/crds_gossip.rs +++ b/core/tests/crds_gossip.rs @@ -1,13 +1,13 @@ use bincode::serialized_size; use log::*; use rayon::prelude::*; -use solana::cluster_info::ClusterInfo; -use solana::contact_info::ContactInfo; -use solana::crds_gossip::*; -use solana::crds_gossip_error::CrdsGossipError; -use solana::crds_gossip_push::CRDS_GOSSIP_PUSH_MSG_TIMEOUT_MS; -use solana::crds_value::CrdsValue; -use solana::crds_value::CrdsValueLabel; +use solana_core::cluster_info::ClusterInfo; +use solana_core::contact_info::ContactInfo; +use solana_core::crds_gossip::*; +use solana_core::crds_gossip_error::CrdsGossipError; +use solana_core::crds_gossip_push::CRDS_GOSSIP_PUSH_MSG_TIMEOUT_MS; +use solana_core::crds_value::CrdsValue; +use solana_core::crds_value::CrdsValueLabel; use solana_sdk::hash::hash; use solana_sdk::pubkey::Pubkey; use solana_sdk::timing::timestamp; diff --git a/core/tests/gossip.rs b/core/tests/gossip.rs index 89b412e63c..1fbf7b1cde 100644 --- a/core/tests/gossip.rs +++ b/core/tests/gossip.rs @@ -2,12 +2,12 @@ extern crate log; use rayon::iter::*; -use solana::cluster_info::{ClusterInfo, Node}; -use solana::gossip_service::GossipService; +use solana_core::cluster_info::{ClusterInfo, Node}; +use solana_core::gossip_service::GossipService; -use solana::packet::Packet; -use solana::result; -use solana::service::Service; +use solana_core::packet::Packet; +use solana_core::result; +use solana_core::service::Service; use solana_sdk::signature::{Keypair, KeypairUtil}; use solana_sdk::timing::timestamp; use std::net::UdpSocket; diff --git a/core/tests/rpc.rs b/core/tests/rpc.rs index 83d94c7e5e..bb3baee064 100644 --- a/core/tests/rpc.rs +++ b/core/tests/rpc.rs @@ -3,8 +3,8 @@ use log::*; use reqwest; use reqwest::header::CONTENT_TYPE; use serde_json::{json, Value}; -use solana::validator::new_validator_for_tests; use solana_client::rpc_client::get_rpc_request_str; +use solana_core::validator::new_validator_for_tests; use solana_sdk::hash::Hash; use solana_sdk::pubkey::Pubkey; use solana_sdk::system_transaction; diff --git a/core/tests/tvu.rs b/core/tests/tvu.rs index b5837177f5..af13a05e1b 100644 --- a/core/tests/tvu.rs +++ b/core/tests/tvu.rs @@ -1,21 +1,21 @@ #[macro_use] -extern crate solana; +extern crate solana_core; use log::*; -use solana::banking_stage::create_test_recorder; -use solana::blocktree::{create_new_tmp_ledger, Blocktree}; -use solana::cluster_info::{ClusterInfo, Node}; -use solana::entry::next_entry_mut; -use solana::entry::EntrySlice; -use solana::genesis_utils::{create_genesis_block_with_leader, GenesisBlockInfo}; -use solana::gossip_service::GossipService; -use solana::packet::index_blobs; -use solana::rpc_subscriptions::RpcSubscriptions; -use solana::service::Service; -use solana::storage_stage::StorageState; -use solana::streamer; -use solana::tvu::{Sockets, Tvu}; -use solana::validator; +use solana_core::banking_stage::create_test_recorder; +use solana_core::blocktree::{create_new_tmp_ledger, Blocktree}; +use solana_core::cluster_info::{ClusterInfo, Node}; +use solana_core::entry::next_entry_mut; +use solana_core::entry::EntrySlice; +use solana_core::genesis_utils::{create_genesis_block_with_leader, GenesisBlockInfo}; +use solana_core::gossip_service::GossipService; +use solana_core::packet::index_blobs; +use solana_core::rpc_subscriptions::RpcSubscriptions; +use solana_core::service::Service; +use solana_core::storage_stage::StorageState; +use solana_core::streamer; +use solana_core::tvu::{Sockets, Tvu}; +use solana_core::validator; use solana_runtime::epoch_schedule::MINIMUM_SLOTS_PER_EPOCH; use solana_sdk::signature::Signable; use solana_sdk::signature::{Keypair, KeypairUtil}; diff --git a/genesis/Cargo.toml b/genesis/Cargo.toml index 92bf2759b7..4c23eaaab9 100644 --- a/genesis/Cargo.toml +++ b/genesis/Cargo.toml @@ -15,7 +15,7 @@ serde = "1.0.99" serde_derive = "1.0.98" serde_json = "1.0.40" serde_yaml = "0.8.9" -solana = { path = "../core", version = "0.18.0-pre2" } +solana-core = { path = "../core", version = "0.18.0-pre2" } solana-genesis-programs = { path = "../genesis_programs", version = "0.18.0-pre2" } solana-sdk = { path = "../sdk", version = "0.18.0-pre2" } solana-stake-api = { path = "../programs/stake_api", version = "0.18.0-pre2" } @@ -23,5 +23,5 @@ solana-storage-api = { path = "../programs/storage_api", version = "0.18.0-pre2" solana-vote-api = { path = "../programs/vote_api", version = "0.18.0-pre2" } [features] -cuda = ["solana/cuda"] +cuda = ["solana-core/cuda"] diff --git a/genesis/src/main.rs b/genesis/src/main.rs index 12ffed3362..8de7e4efda 100644 --- a/genesis/src/main.rs +++ b/genesis/src/main.rs @@ -1,7 +1,7 @@ //! A command-line executable for generating the chain's genesis block. use clap::{crate_description, crate_name, crate_version, value_t_or_exit, App, Arg}; -use solana::blocktree::create_new_ledger; +use solana_core::blocktree::create_new_ledger; use solana_sdk::account::Account; use solana_sdk::fee_calculator::FeeCalculator; use solana_sdk::genesis_block::Builder; diff --git a/gossip/Cargo.toml b/gossip/Cargo.toml index f7ba3116a8..a11d845ecb 100644 --- a/gossip/Cargo.toml +++ b/gossip/Cargo.toml @@ -10,7 +10,7 @@ homepage = "https://solana.com/" [dependencies] clap = "2.33.0" -solana = { path = "../core", version = "0.18.0-pre2" } +solana-core = { path = "../core", version = "0.18.0-pre2" } solana-client = { path = "../client", version = "0.18.0-pre2" } solana-logger = { path = "../logger", version = "0.18.0-pre2" } solana-netutil = { path = "../utils/netutil", version = "0.18.0-pre2" } diff --git a/gossip/src/main.rs b/gossip/src/main.rs index e982418cdc..eac4aab703 100644 --- a/gossip/src/main.rs +++ b/gossip/src/main.rs @@ -1,15 +1,15 @@ //! A command-line executable for monitoring a cluster's gossip plane. #[macro_use] -extern crate solana; +extern crate solana_core; use clap::{ crate_description, crate_name, crate_version, value_t_or_exit, App, AppSettings, Arg, SubCommand, }; -use solana::contact_info::ContactInfo; -use solana::gossip_service::discover; use solana_client::rpc_client::RpcClient; +use solana_core::contact_info::ContactInfo; +use solana_core::gossip_service::discover; use solana_sdk::pubkey::Pubkey; use std::error; use std::net::SocketAddr; diff --git a/ledger-tool/Cargo.toml b/ledger-tool/Cargo.toml index a84f59f246..65efafa062 100644 --- a/ledger-tool/Cargo.toml +++ b/ledger-tool/Cargo.toml @@ -15,7 +15,7 @@ serde = "1.0.99" serde_derive = "1.0.98" serde_json = "1.0.40" serde_yaml = "0.8.9" -solana = { path = "../core", version = "0.18.0-pre2" } +solana-core = { path = "../core", version = "0.18.0-pre2" } solana-logger = { path = "../logger", version = "0.18.0-pre2" } solana-runtime = { path = "../runtime", version = "0.18.0-pre2" } solana-sdk = { path = "../sdk", version = "0.18.0-pre2" } diff --git a/ledger-tool/src/main.rs b/ledger-tool/src/main.rs index 4e90fe4c01..a858d6add8 100644 --- a/ledger-tool/src/main.rs +++ b/ledger-tool/src/main.rs @@ -1,6 +1,6 @@ use clap::{crate_description, crate_name, crate_version, value_t_or_exit, App, Arg, SubCommand}; -use solana::blocktree::Blocktree; -use solana::blocktree_processor::process_blocktree; +use solana_core::blocktree::Blocktree; +use solana_core::blocktree_processor::process_blocktree; use solana_sdk::genesis_block::GenesisBlock; use solana_sdk::timing::Slot; use std::collections::BTreeMap; diff --git a/ledger-tool/tests/basic.rs b/ledger-tool/tests/basic.rs index 2b01ff14eb..162c6137f4 100644 --- a/ledger-tool/tests/basic.rs +++ b/ledger-tool/tests/basic.rs @@ -1,9 +1,9 @@ #[macro_use] -extern crate solana; +extern crate solana_core; use assert_cmd::prelude::*; -use solana::blocktree::create_new_tmp_ledger; -use solana::genesis_utils::create_genesis_block; +use solana_core::blocktree::create_new_tmp_ledger; +use solana_core::genesis_utils::create_genesis_block; use std::process::Command; use std::process::Output; diff --git a/local_cluster/Cargo.toml b/local_cluster/Cargo.toml index eef981408f..59eceef6fb 100644 --- a/local_cluster/Cargo.toml +++ b/local_cluster/Cargo.toml @@ -10,7 +10,7 @@ homepage = "https://solana.com/" [dependencies] log = "0.4.8" -solana = { path = "../core", version = "0.18.0-pre2" } +solana-core = { path = "../core", version = "0.18.0-pre2" } solana-client = { path = "../client", version = "0.18.0-pre2" } solana-logger = { path = "../logger", version = "0.18.0-pre2" } solana-runtime = { path = "../runtime", version = "0.18.0-pre2" } @@ -26,5 +26,5 @@ serial_test = "0.2.0" serial_test_derive = "0.2.0" [features] -cuda = ["solana/cuda"] +cuda = ["solana-core/cuda"] diff --git a/local_cluster/src/cluster_tests.rs b/local_cluster/src/cluster_tests.rs index 24271be49f..e10a5ee851 100644 --- a/local_cluster/src/cluster_tests.rs +++ b/local_cluster/src/cluster_tests.rs @@ -1,8 +1,9 @@ +use solana_client::thin_client::create_client; /// Cluster independant integration tests /// /// All tests must start from an entry point and a funding keypair and /// discover the rest of the network. -use solana::{ +use solana_core::{ blocktree::Blocktree, cluster_info::FULLNODE_PORT_RANGE, consensus::VOTE_THRESHOLD_DEPTH, @@ -10,7 +11,6 @@ use solana::{ entry::{Entry, EntrySlice}, gossip_service::discover_cluster, }; -use solana_client::thin_client::create_client; use solana_runtime::epoch_schedule::MINIMUM_SLOTS_PER_EPOCH; use solana_sdk::{ client::SyncClient, diff --git a/local_cluster/src/lib.rs b/local_cluster/src/lib.rs index ea1e8595f7..79a94a6950 100644 --- a/local_cluster/src/lib.rs +++ b/local_cluster/src/lib.rs @@ -5,7 +5,7 @@ pub mod local_cluster; extern crate log; #[macro_use] -extern crate solana; +extern crate solana_core; #[macro_use] extern crate solana_storage_program; diff --git a/local_cluster/src/local_cluster.rs b/local_cluster/src/local_cluster.rs index dd864e05ae..70a0adedbc 100644 --- a/local_cluster/src/local_cluster.rs +++ b/local_cluster/src/local_cluster.rs @@ -1,4 +1,5 @@ -use solana::{ +use solana_client::thin_client::{create_client, ThinClient}; +use solana_core::{ blocktree::create_new_tmp_ledger, cluster::Cluster, cluster_info::{Node, FULLNODE_PORT_RANGE}, @@ -9,7 +10,6 @@ use solana::{ service::Service, validator::{Validator, ValidatorConfig}, }; -use solana_client::thin_client::{create_client, ThinClient}; use solana_sdk::{ client::SyncClient, genesis_block::GenesisBlock, @@ -623,7 +623,7 @@ impl Drop for LocalCluster { #[cfg(test)] mod test { use super::*; - use solana::storage_stage::SLOTS_PER_TURN_TEST; + use solana_core::storage_stage::SLOTS_PER_TURN_TEST; use solana_runtime::epoch_schedule::MINIMUM_SLOTS_PER_EPOCH; #[test] diff --git a/local_cluster/tests/local_cluster.rs b/local_cluster/tests/local_cluster.rs index 3c9a137407..068bb7fbf6 100644 --- a/local_cluster/tests/local_cluster.rs +++ b/local_cluster/tests/local_cluster.rs @@ -1,8 +1,8 @@ -extern crate solana; +extern crate solana_core; use log::*; use serial_test_derive::serial; -use solana::{ +use solana_core::{ blocktree::Blocktree, broadcast_stage::BroadcastStageType, cluster::Cluster, gossip_service::discover_cluster, validator::ValidatorConfig, }; diff --git a/local_cluster/tests/replicator.rs b/local_cluster/tests/replicator.rs index 9c92f31670..16189b0f27 100644 --- a/local_cluster/tests/replicator.rs +++ b/local_cluster/tests/replicator.rs @@ -2,17 +2,17 @@ extern crate log; #[macro_use] -extern crate solana; +extern crate solana_core; use serial_test_derive::serial; -use solana::blocktree::{create_new_tmp_ledger, get_tmp_ledger_path, Blocktree}; -use solana::cluster_info::{ClusterInfo, Node, FULLNODE_PORT_RANGE}; -use solana::contact_info::ContactInfo; -use solana::gossip_service::discover_cluster; -use solana::replicator::Replicator; -use solana::storage_stage::SLOTS_PER_TURN_TEST; -use solana::validator::ValidatorConfig; use solana_client::thin_client::create_client; +use solana_core::blocktree::{create_new_tmp_ledger, get_tmp_ledger_path, Blocktree}; +use solana_core::cluster_info::{ClusterInfo, Node, FULLNODE_PORT_RANGE}; +use solana_core::contact_info::ContactInfo; +use solana_core::gossip_service::discover_cluster; +use solana_core::replicator::Replicator; +use solana_core::storage_stage::SLOTS_PER_TURN_TEST; +use solana_core::validator::ValidatorConfig; use solana_local_cluster::local_cluster::{ClusterConfig, LocalCluster}; use solana_sdk::genesis_block::create_genesis_block; use solana_sdk::signature::{Keypair, KeypairUtil}; diff --git a/replicator/Cargo.toml b/replicator/Cargo.toml index d51f093390..3a72cee548 100644 --- a/replicator/Cargo.toml +++ b/replicator/Cargo.toml @@ -9,10 +9,10 @@ homepage = "https://solana.com/" [dependencies] clap = "2.33.0" -solana = { path = "../core", version = "0.18.0-pre2" } +solana-core = { path = "../core", version = "0.18.0-pre2" } solana-logger = { path = "../logger", version = "0.18.0-pre2" } solana-netutil = { path = "../utils/netutil", version = "0.18.0-pre2" } solana-sdk = { path = "../sdk", version = "0.18.0-pre2" } [features] -cuda = ["solana/cuda"] +cuda = ["solana-core/cuda"] diff --git a/replicator/src/main.rs b/replicator/src/main.rs index 383b251daa..33eff5a0e3 100644 --- a/replicator/src/main.rs +++ b/replicator/src/main.rs @@ -1,7 +1,7 @@ use clap::{crate_description, crate_name, crate_version, App, Arg}; -use solana::cluster_info::{Node, FULLNODE_PORT_RANGE}; -use solana::contact_info::ContactInfo; -use solana::replicator::Replicator; +use solana_core::cluster_info::{Node, FULLNODE_PORT_RANGE}; +use solana_core::contact_info::ContactInfo; +use solana_core::replicator::Replicator; use solana_sdk::signature::{read_keypair, Keypair, KeypairUtil}; use std::net::SocketAddr; use std::path::PathBuf; diff --git a/validator/Cargo.toml b/validator/Cargo.toml index 3aada8ac21..635b3ebbf9 100644 --- a/validator/Cargo.toml +++ b/validator/Cargo.toml @@ -14,7 +14,7 @@ clap = "2.33.0" log = "0.4.8" reqwest = "0.9.19" serde_json = "1.0.40" -solana = { path = "../core", version = "0.18.0-pre2" } +solana-core = { path = "../core", version = "0.18.0-pre2" } solana-drone = { path = "../drone", version = "0.18.0-pre2" } solana-logger = { path = "../logger", version = "0.18.0-pre2" } solana-metrics = { path = "../metrics", version = "0.18.0-pre2" } @@ -27,4 +27,4 @@ tempfile = "3.1.0" tar = "0.4.26" [features] -cuda = ["solana/cuda"] +cuda = ["solana-core/cuda"] diff --git a/validator/src/main.rs b/validator/src/main.rs index 75b4eae1f6..8530077615 100644 --- a/validator/src/main.rs +++ b/validator/src/main.rs @@ -1,15 +1,15 @@ use bzip2::bufread::BzDecoder; use clap::{crate_description, crate_name, crate_version, value_t, App, Arg}; use log::*; -use solana::bank_forks::SnapshotConfig; -use solana::cluster_info::{Node, FULLNODE_PORT_RANGE}; -use solana::contact_info::ContactInfo; -use solana::gossip_service::discover; -use solana::ledger_cleanup_service::DEFAULT_MAX_LEDGER_SLOTS; -use solana::local_vote_signer_service::LocalVoteSignerService; -use solana::service::Service; -use solana::socketaddr; -use solana::validator::{Validator, ValidatorConfig}; +use solana_core::bank_forks::SnapshotConfig; +use solana_core::cluster_info::{Node, FULLNODE_PORT_RANGE}; +use solana_core::contact_info::ContactInfo; +use solana_core::gossip_service::discover; +use solana_core::ledger_cleanup_service::DEFAULT_MAX_LEDGER_SLOTS; +use solana_core::local_vote_signer_service::LocalVoteSignerService; +use solana_core::service::Service; +use solana_core::socketaddr; +use solana_core::validator::{Validator, ValidatorConfig}; use solana_netutil::parse_port_range; use solana_sdk::signature::{read_keypair, Keypair, KeypairUtil}; use solana_sdk::timing::Slot; diff --git a/wallet/Cargo.toml b/wallet/Cargo.toml index 151c25ed99..ebdda3762e 100644 --- a/wallet/Cargo.toml +++ b/wallet/Cargo.toml @@ -39,7 +39,7 @@ solana-vote-signer = { path = "../vote-signer", version = "0.18.0-pre2" } url = "2.1.0" [dev-dependencies] -solana = { path = "../core", version = "0.18.0-pre2" } +solana-core = { path = "../core", version = "0.18.0-pre2" } solana-budget-program = { path = "../programs/budget_program", version = "0.18.0-pre2" } [features] diff --git a/wallet/tests/deploy.rs b/wallet/tests/deploy.rs index ef5169e02d..9e39c3f581 100644 --- a/wallet/tests/deploy.rs +++ b/wallet/tests/deploy.rs @@ -1,7 +1,7 @@ use serde_json::{json, Value}; -use solana::validator::new_validator_for_tests; use solana_client::rpc_client::RpcClient; use solana_client::rpc_request::RpcRequest; +use solana_core::validator::new_validator_for_tests; use solana_drone::drone::run_local_drone; use solana_sdk::bpf_loader; use solana_wallet::wallet::{process_command, WalletCommand, WalletConfig}; diff --git a/wallet/tests/pay.rs b/wallet/tests/pay.rs index 33bdd1268e..7ce9619198 100644 --- a/wallet/tests/pay.rs +++ b/wallet/tests/pay.rs @@ -11,7 +11,7 @@ use std::fs::remove_dir_all; use std::sync::mpsc::channel; #[cfg(test)] -use solana::validator::new_validator_for_tests; +use solana_core::validator::new_validator_for_tests; use std::thread::sleep; use std::time::Duration; diff --git a/wallet/tests/request_airdrop.rs b/wallet/tests/request_airdrop.rs index a6b11e7dc9..5d7d85f317 100644 --- a/wallet/tests/request_airdrop.rs +++ b/wallet/tests/request_airdrop.rs @@ -1,5 +1,5 @@ -use solana::validator::new_validator_for_tests; use solana_client::rpc_client::RpcClient; +use solana_core::validator::new_validator_for_tests; use solana_drone::drone::run_local_drone; use solana_sdk::signature::KeypairUtil; use solana_wallet::wallet::{process_command, WalletCommand, WalletConfig};