From bb628e8495a7086ff5f5025031ef8a6405c4e1e0 Mon Sep 17 00:00:00 2001
From: Jack May <jack@solana.com>
Date: Tue, 16 Oct 2018 13:45:01 -0700
Subject: [PATCH] Rename loaders

---
 Cargo.toml                                                | 8 ++++----
 programs/native/{sobpf => bpf_loader}/Cargo.toml          | 4 ++--
 programs/native/{sobpf => bpf_loader}/src/bpf_verifier.rs | 0
 programs/native/{sobpf => bpf_loader}/src/lib.rs          | 0
 programs/native/{solua => lua_loader}/Cargo.toml          | 4 ++--
 programs/native/{solua => lua_loader}/multisig.lua        | 0
 programs/native/{solua => lua_loader}/serialize.lua       | 0
 programs/native/{solua => lua_loader}/src/lib.rs          | 0
 tests/programs.rs                                         | 4 ++--
 9 files changed, 10 insertions(+), 10 deletions(-)
 rename programs/native/{sobpf => bpf_loader}/Cargo.toml (91%)
 rename programs/native/{sobpf => bpf_loader}/src/bpf_verifier.rs (100%)
 rename programs/native/{sobpf => bpf_loader}/src/lib.rs (100%)
 rename programs/native/{solua => lua_loader}/Cargo.toml (88%)
 rename programs/native/{solua => lua_loader}/multisig.lua (100%)
 rename programs/native/{solua => lua_loader}/serialize.lua (100%)
 rename programs/native/{solua => lua_loader}/src/lib.rs (100%)

diff --git a/Cargo.toml b/Cargo.toml
index 1a0ac07ebe..817982e460 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -110,8 +110,8 @@ tokio-codec = "0.1"
 untrusted = "0.6.2"
 move_funds = { path = "programs/native/move_funds" }
 noop = { path = "programs/native/noop" }
-sobpf = { path = "programs/native/sobpf" }
-solua = { path = "programs/native/solua" }
+bpf_loader = { path = "programs/native/bpf_loader" }
+lua_loader = { path = "programs/native/lua_loader" }
 
 [[bench]]
 name = "bank"
@@ -138,7 +138,7 @@ members = [
     "common",
     "programs/native/move_funds",
     "programs/native/noop",
-    "programs/native/sobpf",
-    "programs/native/solua",
+    "programs/native/bpf_loader",
+    "programs/native/lua_loader",
     "programs/bpf/noop_rust",
 ]
diff --git a/programs/native/sobpf/Cargo.toml b/programs/native/bpf_loader/Cargo.toml
similarity index 91%
rename from programs/native/sobpf/Cargo.toml
rename to programs/native/bpf_loader/Cargo.toml
index e9669565a5..a68f243e03 100644
--- a/programs/native/sobpf/Cargo.toml
+++ b/programs/native/bpf_loader/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "sobpf"
+name = "bpf_loader"
 version = "0.1.0"
 authors = ["Solana Maintainers <maintainers@solana.com>"]
 
@@ -15,6 +15,6 @@ serde_derive = "1.0.27"
 solana_program_interface = { path = "../../../common" }
 
 [lib]
-name = "sobpf"
+name = "bpf_loader"
 crate-type = ["cdylib"]
 
diff --git a/programs/native/sobpf/src/bpf_verifier.rs b/programs/native/bpf_loader/src/bpf_verifier.rs
similarity index 100%
rename from programs/native/sobpf/src/bpf_verifier.rs
rename to programs/native/bpf_loader/src/bpf_verifier.rs
diff --git a/programs/native/sobpf/src/lib.rs b/programs/native/bpf_loader/src/lib.rs
similarity index 100%
rename from programs/native/sobpf/src/lib.rs
rename to programs/native/bpf_loader/src/lib.rs
diff --git a/programs/native/solua/Cargo.toml b/programs/native/lua_loader/Cargo.toml
similarity index 88%
rename from programs/native/solua/Cargo.toml
rename to programs/native/lua_loader/Cargo.toml
index ddc88b035c..a4f00f2bd1 100644
--- a/programs/native/solua/Cargo.toml
+++ b/programs/native/lua_loader/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "solua"
+name = "lua_loader"
 version = "0.1.0"
 authors = ["Solana Maintainers <maintainers@solana.com>"]
 
@@ -15,6 +15,6 @@ solana_program_interface = { path = "../../../common" }
 bincode = "1.0.0"
 
 [lib]
-name = "solua"
+name = "lua_loader"
 crate-type = ["cdylib"]
 
diff --git a/programs/native/solua/multisig.lua b/programs/native/lua_loader/multisig.lua
similarity index 100%
rename from programs/native/solua/multisig.lua
rename to programs/native/lua_loader/multisig.lua
diff --git a/programs/native/solua/serialize.lua b/programs/native/lua_loader/serialize.lua
similarity index 100%
rename from programs/native/solua/serialize.lua
rename to programs/native/lua_loader/serialize.lua
diff --git a/programs/native/solua/src/lib.rs b/programs/native/lua_loader/src/lib.rs
similarity index 100%
rename from programs/native/solua/src/lib.rs
rename to programs/native/lua_loader/src/lib.rs
diff --git a/tests/programs.rs b/tests/programs.rs
index 276aa92257..f6cde253aa 100644
--- a/tests/programs.rs
+++ b/tests/programs.rs
@@ -100,7 +100,7 @@ fn test_transaction_load_lua() {
     );
     check_tx_results(&bank, &tx, bank.process_transactions(&vec![tx.clone()]));
 
-    let name = String::from("solua");
+    let name = String::from("lua_loader");
     let tx = Transaction::write(
         &loader,
         native_loader::id(),
@@ -197,7 +197,7 @@ fn test_transaction_load_bpf() {
     );
     check_tx_results(&bank, &tx, bank.process_transactions(&vec![tx.clone()]));
 
-    let name = String::from("sobpf");
+    let name = String::from("bpf_loader");
     let tx = Transaction::write(
         &loader,
         native_loader::id(),