Revert "Rename solana-runtime to sealevel (solana-labs#6239)" (solana…

…-labs#6247) This reverts commit 2e92143.
nasjuice · Oct 5, 2019 · fb39bd4 · fb39bd4
1 parent 5ef012b
commit fb39bd4
Show file tree

Hide file tree

Showing 38 changed files with 106 additions and 135 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -45,7 +45,6 @@ members = [
     "programs/vest_api",
     "programs/vote_api",
     "programs/vote_program",
-    "sealevel",
     "replicator",
     "runtime",
     "sdk",

diff --git a/sealevel/.gitignore → runtime/.gitignore b/sealevel/.gitignore → runtime/.gitignore
diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml
@@ -9,8 +9,40 @@ homepage = "https://solana.com/"
 edition = "2018"
 
 [dependencies]
-sealevel = { path = "../sealevel", version = "0.20.0" }
+bincode = "1.2.0"
+bv = { version = "0.11.0", features = ["serde"] }
+byteorder = "1.3.2"
+fnv = "1.0.6"
+fs_extra = "1.1.0"
+lazy_static = "1.4.0"
+libc = "0.2.62"
+libloading = "0.5.2"
+log = "0.4.8"
+memmap = "0.6.2"
+rand = "0.6.5"
+rayon = "1.2.0"
+serde = { version = "1.0.101", features = ["rc"] }
+serde_derive = "1.0.101"
+serde_json = "1.0.41"
+solana-logger = { path = "../logger", version = "0.20.0" }
+solana-measure = { path = "../measure", version = "0.20.0" }
+solana-metrics = { path = "../metrics", version = "0.20.0" }
+solana-bpf-loader-api = { path = "../programs/bpf_loader_api", version = "0.20.0" }
+solana-bpf-loader-program = { path = "../programs/bpf_loader_program", version = "0.20.0" }
+solana-sdk = { path = "../sdk", version = "0.20.0" }
+solana-stake-api = { path = "../programs/stake_api", version = "0.20.0" }
+solana-stake-program = { path = "../programs/stake_program", version = "0.20.0" }
+solana-storage-api = { path = "../programs/storage_api", version = "0.20.0" }
+solana-vote-api = { path = "../programs/vote_api", version = "0.20.0" }
+solana-vote-program = { path = "../programs/vote_program", version = "0.20.0" }
+sys-info = "0.5.8"
+tempfile = "3.1.0"
+solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "0.20.0" }
+itertools = "0.8.0"
 
 [lib]
 crate-type = ["lib"]
 name = "solana_runtime"
+
+[dev-dependencies]
+solana-noop-program = { path = "../programs/noop_program", version = "0.20.0" }
diff --git a/sealevel/benches/accounts.rs → runtime/benches/accounts.rs b/sealevel/benches/accounts.rs → runtime/benches/accounts.rs
diff --git a/sealevel/benches/accounts_index.rs → runtime/benches/accounts_index.rs b/sealevel/benches/accounts_index.rs → runtime/benches/accounts_index.rs
diff --git a/sealevel/benches/append_vec.rs → runtime/benches/append_vec.rs b/sealevel/benches/append_vec.rs → runtime/benches/append_vec.rs
diff --git a/sealevel/benches/bank.rs → runtime/benches/bank.rs b/sealevel/benches/bank.rs → runtime/benches/bank.rs
diff --git a/sealevel/benches/bloom.rs → runtime/benches/bloom.rs b/sealevel/benches/bloom.rs → runtime/benches/bloom.rs
diff --git a/sealevel/benches/message_processor.rs → runtime/benches/message_processor.rs b/sealevel/benches/message_processor.rs → runtime/benches/message_processor.rs
diff --git a/sealevel/benches/status_cache.rs → runtime/benches/status_cache.rs b/sealevel/benches/status_cache.rs → runtime/benches/status_cache.rs
diff --git a/sealevel/benches/transaction_utils.rs → runtime/benches/transaction_utils.rs b/sealevel/benches/transaction_utils.rs → runtime/benches/transaction_utils.rs
diff --git a/runtime/lib.rs b/runtime/lib.rs
diff --git a/sealevel/src/accounts.rs → runtime/src/accounts.rs b/sealevel/src/accounts.rs → runtime/src/accounts.rs
diff --git a/sealevel/src/accounts_db.rs → runtime/src/accounts_db.rs b/sealevel/src/accounts_db.rs → runtime/src/accounts_db.rs
diff --git a/sealevel/src/accounts_index.rs → runtime/src/accounts_index.rs b/sealevel/src/accounts_index.rs → runtime/src/accounts_index.rs
diff --git a/sealevel/src/append_vec.rs → runtime/src/append_vec.rs b/sealevel/src/append_vec.rs → runtime/src/append_vec.rs
diff --git a/sealevel/src/bank.rs → runtime/src/bank.rs b/sealevel/src/bank.rs → runtime/src/bank.rs
diff --git a/sealevel/src/bank_client.rs → runtime/src/bank_client.rs b/sealevel/src/bank_client.rs → runtime/src/bank_client.rs
diff --git a/sealevel/src/blockhash_queue.rs → runtime/src/blockhash_queue.rs b/sealevel/src/blockhash_queue.rs → runtime/src/blockhash_queue.rs
diff --git a/sealevel/src/bloom.rs → runtime/src/bloom.rs b/sealevel/src/bloom.rs → runtime/src/bloom.rs
diff --git a/sealevel/src/epoch_schedule.rs → runtime/src/epoch_schedule.rs b/sealevel/src/epoch_schedule.rs → runtime/src/epoch_schedule.rs
diff --git a/sealevel/src/genesis_utils.rs → runtime/src/genesis_utils.rs b/sealevel/src/genesis_utils.rs → runtime/src/genesis_utils.rs
diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs
@@ -1,5 +1,39 @@
-pub use sealevel::{
-    accounts, accounts_db, accounts_index, append_vec, bank, bank_client, bloom, epoch_schedule,
-    genesis_utils, loader_utils, message_processor, rent_collector, stakes, status_cache,
-    storage_utils, transaction_batch, transaction_utils,
-};
+pub mod accounts;
+pub mod accounts_db;
+pub mod accounts_index;
+pub mod append_vec;
+pub mod bank;
+pub mod bank_client;
+mod blockhash_queue;
+pub mod bloom;
+pub mod epoch_schedule;
+pub mod genesis_utils;
+pub mod loader_utils;
+pub mod message_processor;
+mod native_loader;
+pub mod rent_collector;
+mod serde_utils;
+pub mod stakes;
+pub mod status_cache;
+pub mod storage_utils;
+mod system_instruction_processor;
+pub mod transaction_batch;
+pub mod transaction_utils;
+
+#[macro_use]
+extern crate solana_metrics;
+
+#[macro_use]
+extern crate solana_vote_program;
+
+#[macro_use]
+extern crate solana_stake_program;
+
+#[macro_use]
+extern crate solana_bpf_loader_program;
+
+#[macro_use]
+extern crate serde_derive;
+
+extern crate fs_extra;
+extern crate tempfile;
diff --git a/sealevel/src/loader_utils.rs → runtime/src/loader_utils.rs b/sealevel/src/loader_utils.rs → runtime/src/loader_utils.rs
diff --git a/sealevel/src/message_processor.rs → runtime/src/message_processor.rs b/sealevel/src/message_processor.rs → runtime/src/message_processor.rs
diff --git a/sealevel/src/native_loader.rs → runtime/src/native_loader.rs b/sealevel/src/native_loader.rs → runtime/src/native_loader.rs
diff --git a/sealevel/src/rent_collector.rs → runtime/src/rent_collector.rs b/sealevel/src/rent_collector.rs → runtime/src/rent_collector.rs
diff --git a/sealevel/src/serde_utils.rs → runtime/src/serde_utils.rs b/sealevel/src/serde_utils.rs → runtime/src/serde_utils.rs
diff --git a/sealevel/src/stakes.rs → runtime/src/stakes.rs b/sealevel/src/stakes.rs → runtime/src/stakes.rs
diff --git a/sealevel/src/status_cache.rs → runtime/src/status_cache.rs b/sealevel/src/status_cache.rs → runtime/src/status_cache.rs
diff --git a/sealevel/src/storage_utils.rs → runtime/src/storage_utils.rs b/sealevel/src/storage_utils.rs → runtime/src/storage_utils.rs
diff --git a/sealevel/src/system_instruction_processor.rs → runtime/src/system_instruction_processor.rs b/sealevel/src/system_instruction_processor.rs → runtime/src/system_instruction_processor.rs
diff --git a/sealevel/src/transaction_batch.rs → runtime/src/transaction_batch.rs b/sealevel/src/transaction_batch.rs → runtime/src/transaction_batch.rs
diff --git a/sealevel/src/transaction_utils.rs → runtime/src/transaction_utils.rs b/sealevel/src/transaction_utils.rs → runtime/src/transaction_utils.rs
diff --git a/sealevel/tests/noop.rs → runtime/tests/noop.rs b/sealevel/tests/noop.rs → runtime/tests/noop.rs
@@ -1,6 +1,6 @@
-use sealevel::bank::Bank;
-use sealevel::bank_client::BankClient;
-use sealevel::loader_utils::create_invoke_instruction;
+use solana_runtime::bank::Bank;
+use solana_runtime::bank_client::BankClient;
+use solana_runtime::loader_utils::create_invoke_instruction;
 use solana_sdk::client::SyncClient;
 use solana_sdk::genesis_block::create_genesis_block;
 use solana_sdk::pubkey::Pubkey;

diff --git a/sealevel/Cargo.toml b/sealevel/Cargo.toml
diff --git a/sealevel/src/lib.rs b/sealevel/src/lib.rs