From 1733beabf73d48da71539b87fa234492b3a032bc Mon Sep 17 00:00:00 2001
From: Michael Vines <mvines@gmail.com>
Date: Thu, 25 Oct 2018 12:53:50 -0700
Subject: [PATCH] mv common/ sdk/

---
 Cargo.toml                                | 4 ++--
 ci/publish-crate.sh                       | 2 +-
 programs/bpf/noop_rust/Cargo.toml         | 2 +-
 programs/native/bpf_loader/Cargo.toml     | 2 +-
 programs/native/lua_loader/Cargo.toml     | 2 +-
 programs/native/noop/Cargo.toml           | 2 +-
 {common => sdk}/Cargo.toml                | 0
 {common => sdk}/src/account.rs            | 0
 {common => sdk}/src/lib.rs                | 0
 {common => sdk}/src/loader_instruction.rs | 0
 {common => sdk}/src/pubkey.rs             | 0
 11 files changed, 7 insertions(+), 7 deletions(-)
 rename {common => sdk}/Cargo.toml (100%)
 rename {common => sdk}/src/account.rs (100%)
 rename {common => sdk}/src/lib.rs (100%)
 rename {common => sdk}/src/loader_instruction.rs (100%)
 rename {common => sdk}/src/pubkey.rs (100%)

diff --git a/Cargo.toml b/Cargo.toml
index 421f4eae44..402a629843 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -104,7 +104,7 @@ serde_cbor = "0.9.0"
 serde_derive = "1.0.27"
 serde_json = "1.0.10"
 socket2 = "0.3.8"
-solana-sdk = { path = "common", version = "0.10.0" }
+solana-sdk = { path = "sdk", version = "0.10.0" }
 sys-info = "0.5.6"
 tokio = "0.1"
 tokio-codec = "0.1"
@@ -135,7 +135,7 @@ name = "chacha"
 [workspace]
 members = [
     ".",
-    "common",
+    "sdk",
     "programs/native/noop",
     "programs/native/bpf_loader",
     "programs/native/lua_loader",
diff --git a/ci/publish-crate.sh b/ci/publish-crate.sh
index 17fb3fd5ea..80b11d840b 100755
--- a/ci/publish-crate.sh
+++ b/ci/publish-crate.sh
@@ -18,7 +18,7 @@ if [[ -n $CI ]]; then
 fi
 
 # shellcheck disable=2044 # Disable 'For loops over find output are fragile...'
-for Cargo_toml in {common,programs/native/{bpf_loader,lua_loader,noop}}/Cargo.toml; do
+for Cargo_toml in {sdk,programs/native/{bpf_loader,lua_loader,noop}}/Cargo.toml; do
   # TODO: Ensure the published version matches the contents of BUILDKITE_TAG
   (
     set -x
diff --git a/programs/bpf/noop_rust/Cargo.toml b/programs/bpf/noop_rust/Cargo.toml
index 55928aa763..ea4897a8df 100644
--- a/programs/bpf/noop_rust/Cargo.toml
+++ b/programs/bpf/noop_rust/Cargo.toml
@@ -8,4 +8,4 @@ license = "Apache-2.0"
 
 [dependencies]
 rbpf = "0.1.0"
-solana-sdk = { path = "../../../common", version = "0.10.0" }
+solana-sdk = { path = "../../../sdk", version = "0.10.0" }
diff --git a/programs/native/bpf_loader/Cargo.toml b/programs/native/bpf_loader/Cargo.toml
index 8d853360fc..62bd49d364 100644
--- a/programs/native/bpf_loader/Cargo.toml
+++ b/programs/native/bpf_loader/Cargo.toml
@@ -16,7 +16,7 @@ log = "0.4.2"
 rbpf = "0.1.0"
 serde = "1.0.27"
 serde_derive = "1.0.27"
-solana-sdk = { path = "../../../common", version = "0.10.0" }
+solana-sdk = { path = "../../../sdk", version = "0.10.0" }
 
 [lib]
 name = "bpf_loader"
diff --git a/programs/native/lua_loader/Cargo.toml b/programs/native/lua_loader/Cargo.toml
index ce36cf455f..68b3db93da 100644
--- a/programs/native/lua_loader/Cargo.toml
+++ b/programs/native/lua_loader/Cargo.toml
@@ -13,7 +13,7 @@ log = "0.4.2"
 rlua = "0.15.2"
 serde = "1.0.27"
 serde_derive = "1.0.27"
-solana-sdk = { path = "../../../common", version = "0.10.0" }
+solana-sdk = { path = "../../../sdk", version = "0.10.0" }
 
 [dev-dependencies]
 bincode = "1.0.0"
diff --git a/programs/native/noop/Cargo.toml b/programs/native/noop/Cargo.toml
index e47c6fbc10..5cdc662ae9 100644
--- a/programs/native/noop/Cargo.toml
+++ b/programs/native/noop/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 
 [dependencies]
-solana-sdk = { path = "../../../common", version = "0.10.0" }
+solana-sdk = { path = "../../../sdk", version = "0.10.0" }
 
 [lib]
 name = "noop"
diff --git a/common/Cargo.toml b/sdk/Cargo.toml
similarity index 100%
rename from common/Cargo.toml
rename to sdk/Cargo.toml
diff --git a/common/src/account.rs b/sdk/src/account.rs
similarity index 100%
rename from common/src/account.rs
rename to sdk/src/account.rs
diff --git a/common/src/lib.rs b/sdk/src/lib.rs
similarity index 100%
rename from common/src/lib.rs
rename to sdk/src/lib.rs
diff --git a/common/src/loader_instruction.rs b/sdk/src/loader_instruction.rs
similarity index 100%
rename from common/src/loader_instruction.rs
rename to sdk/src/loader_instruction.rs
diff --git a/common/src/pubkey.rs b/sdk/src/pubkey.rs
similarity index 100%
rename from common/src/pubkey.rs
rename to sdk/src/pubkey.rs