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

This reverts commit 2e921437cd.

Cargo.lock

@@ -2772,43 +2772,6 @@ dependencies = [
  "untrusted 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "sealevel"
-version = "0.20.0"
-dependencies = [
- "bincode 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "bv 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "fs_extra 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
- "libloading 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "memmap 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "rayon 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)",
- "solana-bpf-loader-api 0.20.0",
- "solana-bpf-loader-program 0.20.0",
- "solana-logger 0.20.0",
- "solana-measure 0.20.0",
- "solana-metrics 0.20.0",
- "solana-noop-program 0.20.0",
- "solana-rayon-threadlimit 0.20.0",
- "solana-sdk 0.20.0",
- "solana-stake-api 0.20.0",
- "solana-stake-program 0.20.0",
- "solana-storage-api 0.20.0",
- "solana-vote-api 0.20.0",
- "solana-vote-program 0.20.0",
- "sys-info 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "semver"
 version = "0.9.0"
@@ -3753,7 +3716,37 @@ dependencies = [
 name = "solana-runtime"
 version = "0.20.0"
 dependencies = [
- "sealevel 0.20.0",
+ "bincode 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bv 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "fs_extra 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libloading 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "memmap 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rayon 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)",
+ "solana-bpf-loader-api 0.20.0",
+ "solana-bpf-loader-program 0.20.0",
+ "solana-logger 0.20.0",
+ "solana-measure 0.20.0",
+ "solana-metrics 0.20.0",
+ "solana-noop-program 0.20.0",
+ "solana-rayon-threadlimit 0.20.0",
+ "solana-sdk 0.20.0",
+ "solana-stake-api 0.20.0",
+ "solana-stake-program 0.20.0",
+ "solana-storage-api 0.20.0",
+ "solana-vote-api 0.20.0",
+ "solana-vote-program 0.20.0",
+ "sys-info 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]

Cargo.toml

@@ -45,7 +45,6 @@ members = [
     "programs/vest_api",
     "programs/vote_api",
     "programs/vote_program",
-    "sealevel",
     "replicator",
     "runtime",
     "sdk",

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" }

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;

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;

sealevel/Cargo.toml

@@ -1,48 +0,0 @@
-[package]
-name = "sealevel"
-version = "0.20.0"
-description = "Sealevel, a deterministic, parallel runtime"
-authors = ["Solana Maintainers <maintainers@solana.com>"]
-repository = "https://github.com/solana-labs/solana"
-license = "Apache-2.0"
-homepage = "https://solana.com/"
-edition = "2018"
-
-[dependencies]
-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 = "sealevel"
-
-[dev-dependencies]
-solana-noop-program = { path = "../programs/noop_program", version = "0.20.0" }

sealevel/src/lib.rs

@@ -1,39 +0,0 @@
-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;