Merge api/program into single units (solana-labs#7061)

yu3ver · Nov 21, 2019 · 3415db9 · 3415db9
1 parent 186bf7a
commit 3415db9
Show file tree

Hide file tree

Showing 105 changed files with 224 additions and 4,095 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -24,24 +24,20 @@ members = [
     "measure",
     "metrics",
     "net-shaper",
-    "programs/bpf_loader_api",
-    "programs/bpf_loader_program",
-    "programs/budget_api",
-    "programs/budget_program",
-    "programs/btc_spv_program",
-    "programs/btc_spv_api",
+    "programs/bpf_loader",
+    "programs/budget",
+    "programs/btc_spv",
     "programs/btc_spv_bin",
     "programs/config",
     "programs/config_tests",
-    "programs/exchange_api",
-    "programs/exchange_program",
-    "programs/failure_program",
-    "programs/noop_program",
+    "programs/exchange",
+    "programs/failure",
+    "programs/noop",
     "programs/ownable_api",
     "programs/stake",
     "programs/stake_tests",
-    "programs/storage_api",
-    "programs/storage_program",
+    "programs/storage",
+    "programs/storage_tests",
     "programs/vest",
     "programs/vote",
     "archiver",
@@ -58,7 +54,6 @@ members = [
 
 exclude = [
     "programs/bpf",
-    "programs/move_loader_api",
-    "programs/move_loader_program",
+    "programs/move_loader",
     "programs/librapay_api",
 ]
diff --git a/bench-exchange/Cargo.toml b/bench-exchange/Cargo.toml
@@ -23,14 +23,12 @@ serde = "1.0.102"
 serde_derive = "1.0.102"
 serde_json = "1.0.41"
 serde_yaml = "0.8.11"
-# solana-runtime = { path = "../solana/runtime"}
 solana-clap-utils = { path = "../clap-utils", version = "0.21.0" }
 solana-core = { path = "../core", version = "0.21.0" }
 solana-genesis = { path = "../genesis", version = "0.21.0" }
 solana-client = { path = "../client", version = "0.21.0" }
 solana-drone = { path = "../drone", version = "0.21.0" }
-solana-exchange-api = { path = "../programs/exchange_api", version = "0.21.0" }
-solana-exchange-program = { path = "../programs/exchange_program", version = "0.21.0" }
+solana-exchange-program = { path = "../programs/exchange", version = "0.21.0" }
 solana-logger = { path = "../logger", version = "0.21.0" }
 solana-metrics = { path = "../metrics", version = "0.21.0" }
 solana-net-utils = { path = "../net-utils", version = "0.21.0" }

diff --git a/bench-exchange/src/bench.rs b/bench-exchange/src/bench.rs
@@ -8,7 +8,7 @@ use rayon::prelude::*;
 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, exchange_state::*, id};
+use solana_exchange_program::{exchange_instruction, exchange_state::*, id};
 use solana_genesis::Base64Account;
 use solana_metrics::datapoint_info;
 use solana_sdk::{

diff --git a/bench-exchange/src/order_book.rs b/bench-exchange/src/order_book.rs
@@ -1,7 +1,7 @@
 use itertools::EitherOrBoth::{Both, Left, Right};
 use itertools::Itertools;
 use log::*;
-use solana_exchange_api::exchange_state::*;
+use solana_exchange_program::exchange_state::*;
 use solana_sdk::pubkey::Pubkey;
 use std::cmp::Ordering;
 use std::collections::BinaryHeap;

diff --git a/bench-exchange/tests/bench_exchange.rs b/bench-exchange/tests/bench_exchange.rs
@@ -3,8 +3,8 @@ use solana_bench_exchange::bench::{airdrop_lamports, do_bench_exchange, Config};
 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_exchange_api::id;
+use solana_exchange_program::exchange_processor::process_instruction;
+use solana_exchange_program::id;
 use solana_exchange_program::solana_exchange_program;
 use solana_local_cluster::local_cluster::{ClusterConfig, LocalCluster};
 use solana_runtime::bank::Bank;

diff --git a/bench-tps/Cargo.toml b/bench-tps/Cargo.toml
@@ -28,13 +28,12 @@ solana-measure = { path = "../measure", version = "0.21.0" }
 solana-net-utils = { path = "../net-utils", version = "0.21.0" }
 solana-runtime = { path = "../runtime", version = "0.21.0" }
 solana-sdk = { path = "../sdk", version = "0.21.0" }
-solana-move-loader-program = { path = "../programs/move_loader_program", version = "0.21.0", optional = true }
-solana-move-loader-api = { path = "../programs/move_loader_api", version = "0.21.0", optional = true }
+solana-move-loader-program = { path = "../programs/move_loader", version = "0.21.0", optional = true }
 
 [dev-dependencies]
 serial_test = "0.2.0"
 serial_test_derive = "0.2.0"
 solana-local-cluster = { path = "../local-cluster", version = "0.21.0" }
 
 [features]
-move = ["solana-librapay-api", "solana-move-loader-program", "solana-move-loader-api"]
+move = ["solana-librapay-api", "solana-move-loader-program"]