From 037fcf6b3d13e4da7d18562fec1bf420dcaaa62e Mon Sep 17 00:00:00 2001 From: Greg Fitzgerald Date: Sat, 2 Mar 2019 20:31:57 -0700 Subject: [PATCH] Bump all native programs up a level Don't categorize programs by a single backend. --- Cargo.toml | 26 +++++++++---------- ci/publish-crate.sh | 2 +- core/Cargo.toml | 8 +++--- fullnode/Cargo.toml | 2 +- programs/Cargo.toml | 8 +++--- programs/{native => }/bpf_loader/Cargo.toml | 4 +-- .../bpf_loader/benches/bpf_loader.rs | 0 programs/{native => }/bpf_loader/build.rs | 0 .../bpf_loader/src/bpf_verifier.rs | 0 programs/{native => }/bpf_loader/src/lib.rs | 0 programs/{native => }/budget/Cargo.toml | 4 +-- .../{native => }/budget/src/budget_program.rs | 0 programs/{native => }/budget/src/lib.rs | 0 programs/{native => }/budget_api/Cargo.toml | 2 +- .../budget_api/src/budget_expr.rs | 0 .../budget_api/src/budget_instruction.rs | 0 .../budget_api/src/budget_transaction.rs | 0 programs/{native => }/budget_api/src/lib.rs | 0 .../budget_api/src/payment_plan.rs | 0 programs/{native => }/failure/Cargo.toml | 2 +- programs/{native => }/failure/src/lib.rs | 0 .../{native => }/native_loader/Cargo.toml | 2 +- .../{native => }/native_loader/src/lib.rs | 0 programs/{native => }/noop/Cargo.toml | 4 +-- programs/{native => }/noop/src/lib.rs | 0 programs/{native => }/rewards/Cargo.toml | 6 ++--- programs/{native => }/rewards/src/lib.rs | 0 .../{native => }/rewards/tests/rewards.rs | 0 programs/{native => }/rewards_api/Cargo.toml | 2 +- programs/{native => }/rewards_api/src/lib.rs | 0 .../rewards_api/src/rewards_instruction.rs | 0 .../rewards_api/src/rewards_state.rs | 0 .../rewards_api/src/rewards_transaction.rs | 0 programs/{native => }/storage/Cargo.toml | 6 ++--- programs/{native => }/storage/src/lib.rs | 0 .../{native => }/storage/tests/storage.rs | 0 programs/{native => }/system/Cargo.toml | 2 +- programs/{native => }/system/src/lib.rs | 0 programs/{native => }/token/Cargo.toml | 4 +-- programs/{native => }/token/src/lib.rs | 0 .../{native => }/token/src/token_program.rs | 0 programs/{native => }/vote/Cargo.toml | 8 +++--- programs/{native => }/vote/src/lib.rs | 0 programs/{native => }/vote/tests/vote.rs | 0 programs/{native => }/vote_api/Cargo.toml | 2 +- programs/{native => }/vote_api/src/lib.rs | 0 .../vote_api/src/vote_instruction.rs | 0 .../{native => }/vote_api/src/vote_state.rs | 0 .../vote_api/src/vote_transaction.rs | 0 runtime/Cargo.toml | 8 +++--- wallet/Cargo.toml | 2 +- 51 files changed, 52 insertions(+), 52 deletions(-) rename programs/{native => }/bpf_loader/Cargo.toml (82%) rename programs/{native => }/bpf_loader/benches/bpf_loader.rs (100%) rename programs/{native => }/bpf_loader/build.rs (100%) rename programs/{native => }/bpf_loader/src/bpf_verifier.rs (100%) rename programs/{native => }/bpf_loader/src/lib.rs (100%) rename programs/{native => }/budget/Cargo.toml (81%) rename programs/{native => }/budget/src/budget_program.rs (100%) rename programs/{native => }/budget/src/lib.rs (100%) rename programs/{native => }/budget_api/Cargo.toml (88%) rename programs/{native => }/budget_api/src/budget_expr.rs (100%) rename programs/{native => }/budget_api/src/budget_instruction.rs (100%) rename programs/{native => }/budget_api/src/budget_transaction.rs (100%) rename programs/{native => }/budget_api/src/lib.rs (100%) rename programs/{native => }/budget_api/src/payment_plan.rs (100%) rename programs/{native => }/failure/Cargo.toml (85%) rename programs/{native => }/failure/src/lib.rs (100%) rename programs/{native => }/native_loader/Cargo.toml (87%) rename programs/{native => }/native_loader/src/lib.rs (100%) rename programs/{native => }/noop/Cargo.toml (73%) rename programs/{native => }/noop/src/lib.rs (100%) rename programs/{native => }/rewards/Cargo.toml (74%) rename programs/{native => }/rewards/src/lib.rs (100%) rename programs/{native => }/rewards/tests/rewards.rs (100%) rename programs/{native => }/rewards_api/Cargo.toml (88%) rename programs/{native => }/rewards_api/src/lib.rs (100%) rename programs/{native => }/rewards_api/src/rewards_instruction.rs (100%) rename programs/{native => }/rewards_api/src/rewards_state.rs (100%) rename programs/{native => }/rewards_api/src/rewards_transaction.rs (100%) rename programs/{native => }/storage/Cargo.toml (70%) rename programs/{native => }/storage/src/lib.rs (100%) rename programs/{native => }/storage/tests/storage.rs (100%) rename programs/{native => }/system/Cargo.toml (90%) rename programs/{native => }/system/src/lib.rs (100%) rename programs/{native => }/token/Cargo.toml (78%) rename programs/{native => }/token/src/lib.rs (100%) rename programs/{native => }/token/src/token_program.rs (100%) rename programs/{native => }/vote/Cargo.toml (64%) rename programs/{native => }/vote/src/lib.rs (100%) rename programs/{native => }/vote/tests/vote.rs (100%) rename programs/{native => }/vote_api/Cargo.toml (87%) rename programs/{native => }/vote_api/src/lib.rs (100%) rename programs/{native => }/vote_api/src/vote_instruction.rs (100%) rename programs/{native => }/vote_api/src/vote_state.rs (100%) rename programs/{native => }/vote_api/src/vote_transaction.rs (100%) diff --git a/Cargo.toml b/Cargo.toml index 90a54b8107..458424d062 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -71,19 +71,19 @@ members = [ "logger", "metrics", "programs", - "programs/native/bpf_loader", - "programs/native/budget", - "programs/native/budget_api", - "programs/native/token", - "programs/native/failure", - "programs/native/native_loader", - "programs/native/noop", - "programs/native/rewards", - "programs/native/rewards_api", - "programs/native/storage", - "programs/native/system", - "programs/native/vote", - "programs/native/vote_api", + "programs/bpf_loader", + "programs/budget", + "programs/budget_api", + "programs/token", + "programs/failure", + "programs/native_loader", + "programs/noop", + "programs/rewards", + "programs/rewards_api", + "programs/storage", + "programs/system", + "programs/vote", + "programs/vote_api", "replicator", "sdk", "upload-perf", diff --git a/ci/publish-crate.sh b/ci/publish-crate.sh index 024587e70f..c9c045c9ab 100755 --- a/ci/publish-crate.sh +++ b/ci/publish-crate.sh @@ -17,7 +17,7 @@ CRATES=( keygen metrics drone - programs/native/{budget,bpf_loader,native_loader,noop,system,vote} + programs/{budget,bpf_loader,native_loader,noop,system,vote} core fullnode-config fullnode diff --git a/core/Cargo.toml b/core/Cargo.toml index add0024653..f12672c0d6 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -46,14 +46,14 @@ rocksdb = "0.11.0" serde = "1.0.89" serde_derive = "1.0.88" serde_json = "1.0.39" -solana-budget-api = { path = "../programs/native/budget_api", version = "0.12.0" } +solana-budget-api = { path = "../programs/budget_api", version = "0.12.0" } solana-drone = { path = "../drone", version = "0.12.0" } solana-logger = { path = "../logger", version = "0.12.0" } solana-metrics = { path = "../metrics", version = "0.12.0" } solana-netutil = { path = "../netutil", version = "0.12.0" } solana-runtime = { path = "../runtime", version = "0.12.0" } solana-sdk = { path = "../sdk", version = "0.12.0" } -solana-vote-api = { path = "../programs/native/vote_api", version = "0.12.0" } +solana-vote-api = { path = "../programs/vote_api", version = "0.12.0" } solana-vote-signer = { path = "../vote-signer", version = "0.12.0" } sys-info = "0.5.6" tokio = "0.1" @@ -63,6 +63,6 @@ untrusted = "0.6.2" [dev-dependencies] hex-literal = "0.1.3" matches = "0.1.6" -solana-vote-program = { path = "../programs/native/vote", version = "0.12.0" } -solana-budget-program = { path = "../programs/native/budget", version = "0.12.0" } +solana-vote-program = { path = "../programs/vote", version = "0.12.0" } +solana-budget-program = { path = "../programs/budget", version = "0.12.0" } diff --git a/fullnode/Cargo.toml b/fullnode/Cargo.toml index 93aca84fbd..a0c6ad3392 100644 --- a/fullnode/Cargo.toml +++ b/fullnode/Cargo.toml @@ -20,7 +20,7 @@ solana-netutil = { path = "../netutil", version = "0.12.0" } solana-metrics = { path = "../metrics", version = "0.12.0" } solana-runtime = { path = "../runtime", version = "0.12.0" } solana-sdk = { path = "../sdk", version = "0.12.0" } -solana-vote-api = { path = "../programs/native/vote_api", version = "0.12.0" } +solana-vote-api = { path = "../programs/vote_api", version = "0.12.0" } solana-vote-signer = { path = "../vote-signer", version = "0.12.0" } [features] diff --git a/programs/Cargo.toml b/programs/Cargo.toml index ea999d3923..d6ebd156c0 100644 --- a/programs/Cargo.toml +++ b/programs/Cargo.toml @@ -19,12 +19,12 @@ erasure = ["solana/erasure"] [dependencies] solana = { path = "../core", version = "0.12.0" } -solana-bpfloader = { path = "native/bpf_loader", version = "0.12.0" } +solana-bpfloader = { path = "bpf_loader", version = "0.12.0" } solana-logger = { path = "../logger", version = "0.12.0" } -solana-native-loader = { path = "native/native_loader", version = "0.12.0" } +solana-native-loader = { path = "native_loader", version = "0.12.0" } solana-runtime = { path = "../runtime", version = "0.12.0" } solana-sdk = { path = "../sdk", version = "0.12.0" } [dev-dependencies] -solana-noop = { path = "native/noop", version = "0.12.0" } -solana-failure = { path = "native/failure", version = "0.12.0" } +solana-noop = { path = "noop", version = "0.12.0" } +solana-failure = { path = "failure", version = "0.12.0" } diff --git a/programs/native/bpf_loader/Cargo.toml b/programs/bpf_loader/Cargo.toml similarity index 82% rename from programs/native/bpf_loader/Cargo.toml rename to programs/bpf_loader/Cargo.toml index d134c96bf1..65fca46b04 100644 --- a/programs/native/bpf_loader/Cargo.toml +++ b/programs/bpf_loader/Cargo.toml @@ -20,8 +20,8 @@ libc = "0.2.49" log = "0.4.2" solana_rbpf = "=0.1.10" serde = "1.0.89" -solana-logger = { path = "../../../logger", version = "0.12.0" } -solana-sdk = { path = "../../../sdk", version = "0.12.0" } +solana-logger = { path = "../../logger", version = "0.12.0" } +solana-sdk = { path = "../../sdk", version = "0.12.0" } [build-dependencies] walkdir = "2" diff --git a/programs/native/bpf_loader/benches/bpf_loader.rs b/programs/bpf_loader/benches/bpf_loader.rs similarity index 100% rename from programs/native/bpf_loader/benches/bpf_loader.rs rename to programs/bpf_loader/benches/bpf_loader.rs diff --git a/programs/native/bpf_loader/build.rs b/programs/bpf_loader/build.rs similarity index 100% rename from programs/native/bpf_loader/build.rs rename to programs/bpf_loader/build.rs diff --git a/programs/native/bpf_loader/src/bpf_verifier.rs b/programs/bpf_loader/src/bpf_verifier.rs similarity index 100% rename from programs/native/bpf_loader/src/bpf_verifier.rs rename to programs/bpf_loader/src/bpf_verifier.rs diff --git a/programs/native/bpf_loader/src/lib.rs b/programs/bpf_loader/src/lib.rs similarity index 100% rename from programs/native/bpf_loader/src/lib.rs rename to programs/bpf_loader/src/lib.rs diff --git a/programs/native/budget/Cargo.toml b/programs/budget/Cargo.toml similarity index 81% rename from programs/native/budget/Cargo.toml rename to programs/budget/Cargo.toml index 78d03589db..0949e32e7f 100644 --- a/programs/native/budget/Cargo.toml +++ b/programs/budget/Cargo.toml @@ -15,8 +15,8 @@ log = "0.4.2" serde = "1.0.89" serde_derive = "1.0.89" solana-budget-api = { path = "../budget_api", version = "0.12.0" } -solana-logger = { path = "../../../logger", version = "0.12.0" } -solana-sdk = { path = "../../../sdk", version = "0.12.0" } +solana-logger = { path = "../../logger", version = "0.12.0" } +solana-sdk = { path = "../../sdk", version = "0.12.0" } [lib] name = "solana_budget_program" diff --git a/programs/native/budget/src/budget_program.rs b/programs/budget/src/budget_program.rs similarity index 100% rename from programs/native/budget/src/budget_program.rs rename to programs/budget/src/budget_program.rs diff --git a/programs/native/budget/src/lib.rs b/programs/budget/src/lib.rs similarity index 100% rename from programs/native/budget/src/lib.rs rename to programs/budget/src/lib.rs diff --git a/programs/native/budget_api/Cargo.toml b/programs/budget_api/Cargo.toml similarity index 88% rename from programs/native/budget_api/Cargo.toml rename to programs/budget_api/Cargo.toml index 7eced57b1f..8560bb23a1 100644 --- a/programs/native/budget_api/Cargo.toml +++ b/programs/budget_api/Cargo.toml @@ -13,7 +13,7 @@ bincode = "1.1.2" chrono = { version = "0.4.0", features = ["serde"] } serde = "1.0.89" serde_derive = "1.0.89" -solana-sdk = { path = "../../../sdk", version = "0.12.0" } +solana-sdk = { path = "../../sdk", version = "0.12.0" } [lib] name = "solana_budget_api" diff --git a/programs/native/budget_api/src/budget_expr.rs b/programs/budget_api/src/budget_expr.rs similarity index 100% rename from programs/native/budget_api/src/budget_expr.rs rename to programs/budget_api/src/budget_expr.rs diff --git a/programs/native/budget_api/src/budget_instruction.rs b/programs/budget_api/src/budget_instruction.rs similarity index 100% rename from programs/native/budget_api/src/budget_instruction.rs rename to programs/budget_api/src/budget_instruction.rs diff --git a/programs/native/budget_api/src/budget_transaction.rs b/programs/budget_api/src/budget_transaction.rs similarity index 100% rename from programs/native/budget_api/src/budget_transaction.rs rename to programs/budget_api/src/budget_transaction.rs diff --git a/programs/native/budget_api/src/lib.rs b/programs/budget_api/src/lib.rs similarity index 100% rename from programs/native/budget_api/src/lib.rs rename to programs/budget_api/src/lib.rs diff --git a/programs/native/budget_api/src/payment_plan.rs b/programs/budget_api/src/payment_plan.rs similarity index 100% rename from programs/native/budget_api/src/payment_plan.rs rename to programs/budget_api/src/payment_plan.rs diff --git a/programs/native/failure/Cargo.toml b/programs/failure/Cargo.toml similarity index 85% rename from programs/native/failure/Cargo.toml rename to programs/failure/Cargo.toml index ef0896e5b3..8433f310d1 100644 --- a/programs/native/failure/Cargo.toml +++ b/programs/failure/Cargo.toml @@ -9,7 +9,7 @@ homepage = "https://solana.com/" edition = "2018" [dependencies] -solana-sdk = { path = "../../../sdk", version = "0.12.0" } +solana-sdk = { path = "../../sdk", version = "0.12.0" } log = "0.4.2" [lib] diff --git a/programs/native/failure/src/lib.rs b/programs/failure/src/lib.rs similarity index 100% rename from programs/native/failure/src/lib.rs rename to programs/failure/src/lib.rs diff --git a/programs/native/native_loader/Cargo.toml b/programs/native_loader/Cargo.toml similarity index 87% rename from programs/native/native_loader/Cargo.toml rename to programs/native_loader/Cargo.toml index e82013b021..50590b4850 100644 --- a/programs/native/native_loader/Cargo.toml +++ b/programs/native_loader/Cargo.toml @@ -13,7 +13,7 @@ bincode = "1.1.2" libc = "0.2.49" libloading = "0.5.0" log = "0.4.2" -solana-sdk = { path = "../../../sdk", version = "0.12.0" } +solana-sdk = { path = "../../sdk", version = "0.12.0" } [lib] name = "solana_native_loader" diff --git a/programs/native/native_loader/src/lib.rs b/programs/native_loader/src/lib.rs similarity index 100% rename from programs/native/native_loader/src/lib.rs rename to programs/native_loader/src/lib.rs diff --git a/programs/native/noop/Cargo.toml b/programs/noop/Cargo.toml similarity index 73% rename from programs/native/noop/Cargo.toml rename to programs/noop/Cargo.toml index 82f6ae3945..5720256572 100644 --- a/programs/native/noop/Cargo.toml +++ b/programs/noop/Cargo.toml @@ -9,8 +9,8 @@ homepage = "https://solana.com/" edition = "2018" [dependencies] -solana-sdk = { path = "../../../sdk", version = "0.12.0" } -solana-logger = { path = "../../../logger", version = "0.12.0" } +solana-sdk = { path = "../../sdk", version = "0.12.0" } +solana-logger = { path = "../../logger", version = "0.12.0" } log = "0.4.2" [lib] diff --git a/programs/native/noop/src/lib.rs b/programs/noop/src/lib.rs similarity index 100% rename from programs/native/noop/src/lib.rs rename to programs/noop/src/lib.rs diff --git a/programs/native/rewards/Cargo.toml b/programs/rewards/Cargo.toml similarity index 74% rename from programs/native/rewards/Cargo.toml rename to programs/rewards/Cargo.toml index 7126d05e4b..313a95bfc9 100644 --- a/programs/native/rewards/Cargo.toml +++ b/programs/rewards/Cargo.toml @@ -11,13 +11,13 @@ edition = "2018" [dependencies] bincode = "1.1.2" log = "0.4.2" -solana-logger = { path = "../../../logger", version = "0.12.0" } -solana-sdk = { path = "../../../sdk", version = "0.12.0" } +solana-logger = { path = "../../logger", version = "0.12.0" } +solana-sdk = { path = "../../sdk", version = "0.12.0" } solana-rewards-api = { path = "../rewards_api", version = "0.12.0" } solana-vote-api = { path = "../vote_api", version = "0.12.0" } [dev-dependencies] -solana-runtime = { path = "../../../runtime", version = "0.12.0" } +solana-runtime = { path = "../../runtime", version = "0.12.0" } [lib] name = "solana_rewards_program" diff --git a/programs/native/rewards/src/lib.rs b/programs/rewards/src/lib.rs similarity index 100% rename from programs/native/rewards/src/lib.rs rename to programs/rewards/src/lib.rs diff --git a/programs/native/rewards/tests/rewards.rs b/programs/rewards/tests/rewards.rs similarity index 100% rename from programs/native/rewards/tests/rewards.rs rename to programs/rewards/tests/rewards.rs diff --git a/programs/native/rewards_api/Cargo.toml b/programs/rewards_api/Cargo.toml similarity index 88% rename from programs/native/rewards_api/Cargo.toml rename to programs/rewards_api/Cargo.toml index 4af32f037e..37a307662b 100644 --- a/programs/native/rewards_api/Cargo.toml +++ b/programs/rewards_api/Cargo.toml @@ -12,7 +12,7 @@ edition = "2018" bincode = "1.1.2" serde = "1.0.89" serde_derive = "1.0.89" -solana-sdk = { path = "../../../sdk", version = "0.12.0" } +solana-sdk = { path = "../../sdk", version = "0.12.0" } solana-vote-api = { path = "../vote_api", version = "0.12.0" } [lib] diff --git a/programs/native/rewards_api/src/lib.rs b/programs/rewards_api/src/lib.rs similarity index 100% rename from programs/native/rewards_api/src/lib.rs rename to programs/rewards_api/src/lib.rs diff --git a/programs/native/rewards_api/src/rewards_instruction.rs b/programs/rewards_api/src/rewards_instruction.rs similarity index 100% rename from programs/native/rewards_api/src/rewards_instruction.rs rename to programs/rewards_api/src/rewards_instruction.rs diff --git a/programs/native/rewards_api/src/rewards_state.rs b/programs/rewards_api/src/rewards_state.rs similarity index 100% rename from programs/native/rewards_api/src/rewards_state.rs rename to programs/rewards_api/src/rewards_state.rs diff --git a/programs/native/rewards_api/src/rewards_transaction.rs b/programs/rewards_api/src/rewards_transaction.rs similarity index 100% rename from programs/native/rewards_api/src/rewards_transaction.rs rename to programs/rewards_api/src/rewards_transaction.rs diff --git a/programs/native/storage/Cargo.toml b/programs/storage/Cargo.toml similarity index 70% rename from programs/native/storage/Cargo.toml rename to programs/storage/Cargo.toml index 06706de0ad..b51a71fa2e 100644 --- a/programs/native/storage/Cargo.toml +++ b/programs/storage/Cargo.toml @@ -13,11 +13,11 @@ bincode = "1.1.2" log = "0.4.2" serde = "1.0.89" serde_derive = "1.0.89" -solana-logger = { path = "../../../logger", version = "0.12.0" } -solana-sdk = { path = "../../../sdk", version = "0.12.0" } +solana-logger = { path = "../../logger", version = "0.12.0" } +solana-sdk = { path = "../../sdk", version = "0.12.0" } [dev-dependencies] -solana-runtime = { path = "../../../runtime", version = "0.12.0" } +solana-runtime = { path = "../../runtime", version = "0.12.0" } [lib] name = "solana_storage_program" diff --git a/programs/native/storage/src/lib.rs b/programs/storage/src/lib.rs similarity index 100% rename from programs/native/storage/src/lib.rs rename to programs/storage/src/lib.rs diff --git a/programs/native/storage/tests/storage.rs b/programs/storage/tests/storage.rs similarity index 100% rename from programs/native/storage/tests/storage.rs rename to programs/storage/tests/storage.rs diff --git a/programs/native/system/Cargo.toml b/programs/system/Cargo.toml similarity index 90% rename from programs/native/system/Cargo.toml rename to programs/system/Cargo.toml index 9498c5cde8..4546089e24 100644 --- a/programs/native/system/Cargo.toml +++ b/programs/system/Cargo.toml @@ -12,7 +12,7 @@ edition = "2018" bincode = "1.1.2" log = "0.4.2" serde = "1.0.89" -solana-sdk = { path = "../../../sdk", version = "0.12.0" } +solana-sdk = { path = "../../sdk", version = "0.12.0" } [lib] name = "solana_system_program" diff --git a/programs/native/system/src/lib.rs b/programs/system/src/lib.rs similarity index 100% rename from programs/native/system/src/lib.rs rename to programs/system/src/lib.rs diff --git a/programs/native/token/Cargo.toml b/programs/token/Cargo.toml similarity index 78% rename from programs/native/token/Cargo.toml rename to programs/token/Cargo.toml index d93935c426..f175aaf523 100644 --- a/programs/native/token/Cargo.toml +++ b/programs/token/Cargo.toml @@ -13,8 +13,8 @@ bincode = "1.1.2" log = "0.4.2" serde = "1.0.89" serde_derive = "1.0.89" -solana-logger = { path = "../../../logger", version = "0.12.0" } -solana-sdk = { path = "../../../sdk", version = "0.12.0" } +solana-logger = { path = "../../logger", version = "0.12.0" } +solana-sdk = { path = "../../sdk", version = "0.12.0" } [lib] name = "solana_token_program" diff --git a/programs/native/token/src/lib.rs b/programs/token/src/lib.rs similarity index 100% rename from programs/native/token/src/lib.rs rename to programs/token/src/lib.rs diff --git a/programs/native/token/src/token_program.rs b/programs/token/src/token_program.rs similarity index 100% rename from programs/native/token/src/token_program.rs rename to programs/token/src/token_program.rs diff --git a/programs/native/vote/Cargo.toml b/programs/vote/Cargo.toml similarity index 64% rename from programs/native/vote/Cargo.toml rename to programs/vote/Cargo.toml index 0d332ab3c3..e2241c2fae 100644 --- a/programs/native/vote/Cargo.toml +++ b/programs/vote/Cargo.toml @@ -11,13 +11,13 @@ edition = "2018" [dependencies] bincode = "1.1.2" log = "0.4.2" -solana-logger = { path = "../../../logger", version = "0.12.0" } -solana-metrics = { path = "../../../metrics", version = "0.12.0" } -solana-sdk = { path = "../../../sdk", version = "0.12.0" } +solana-logger = { path = "../../logger", version = "0.12.0" } +solana-metrics = { path = "../../metrics", version = "0.12.0" } +solana-sdk = { path = "../../sdk", version = "0.12.0" } solana-vote-api = { path = "../vote_api", version = "0.12.0" } [dev-dependencies] -solana-runtime = { path = "../../../runtime", version = "0.12.0" } +solana-runtime = { path = "../../runtime", version = "0.12.0" } [lib] name = "solana_vote_program" diff --git a/programs/native/vote/src/lib.rs b/programs/vote/src/lib.rs similarity index 100% rename from programs/native/vote/src/lib.rs rename to programs/vote/src/lib.rs diff --git a/programs/native/vote/tests/vote.rs b/programs/vote/tests/vote.rs similarity index 100% rename from programs/native/vote/tests/vote.rs rename to programs/vote/tests/vote.rs diff --git a/programs/native/vote_api/Cargo.toml b/programs/vote_api/Cargo.toml similarity index 87% rename from programs/native/vote_api/Cargo.toml rename to programs/vote_api/Cargo.toml index 3379797f70..4fffc9ea3e 100644 --- a/programs/native/vote_api/Cargo.toml +++ b/programs/vote_api/Cargo.toml @@ -13,7 +13,7 @@ bincode = "1.1.2" log = "0.4.2" serde = "1.0.89" serde_derive = "1.0.89" -solana-sdk = { path = "../../../sdk", version = "0.12.0" } +solana-sdk = { path = "../../sdk", version = "0.12.0" } [lib] name = "solana_vote_api" diff --git a/programs/native/vote_api/src/lib.rs b/programs/vote_api/src/lib.rs similarity index 100% rename from programs/native/vote_api/src/lib.rs rename to programs/vote_api/src/lib.rs diff --git a/programs/native/vote_api/src/vote_instruction.rs b/programs/vote_api/src/vote_instruction.rs similarity index 100% rename from programs/native/vote_api/src/vote_instruction.rs rename to programs/vote_api/src/vote_instruction.rs diff --git a/programs/native/vote_api/src/vote_state.rs b/programs/vote_api/src/vote_state.rs similarity index 100% rename from programs/native/vote_api/src/vote_state.rs rename to programs/vote_api/src/vote_state.rs diff --git a/programs/native/vote_api/src/vote_transaction.rs b/programs/vote_api/src/vote_transaction.rs similarity index 100% rename from programs/native/vote_api/src/vote_transaction.rs rename to programs/vote_api/src/vote_transaction.rs diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml index 54072ee3f1..549d3aa3ba 100644 --- a/runtime/Cargo.toml +++ b/runtime/Cargo.toml @@ -19,13 +19,13 @@ rand = "0.6.5" serde = "1.0.88" serde_derive = "1.0.88" serde_json = "1.0.38" -solana-budget-api = { path = "../programs/native/budget_api", version = "0.12.0" } +solana-budget-api = { path = "../programs/budget_api", version = "0.12.0" } solana-logger = { path = "../logger", version = "0.12.0" } solana-metrics = { path = "../metrics", version = "0.12.0" } solana-sdk = { path = "../sdk", version = "0.12.0" } -solana-native-loader = { path = "../programs/native/native_loader", version = "0.12.0" } -solana-system-program = { path = "../programs/native/system", version = "0.12.0" } -solana-vote-api = { path = "../programs/native/vote_api", version = "0.12.0" } +solana-native-loader = { path = "../programs/native_loader", version = "0.12.0" } +solana-system-program = { path = "../programs/system", version = "0.12.0" } +solana-vote-api = { path = "../programs/vote_api", version = "0.12.0" } [lib] name = "solana_runtime" diff --git a/wallet/Cargo.toml b/wallet/Cargo.toml index f5869f89cc..3f17de7f87 100644 --- a/wallet/Cargo.toml +++ b/wallet/Cargo.toml @@ -17,7 +17,7 @@ dirs = "1.0.5" log = "0.4.2" serde_json = "1.0.39" solana = { path = "../core", version = "0.12.0" } -solana-budget-api = { path = "../programs/native/budget_api", version = "0.12.0" } +solana-budget-api = { path = "../programs/budget_api", version = "0.12.0" } solana-drone = { path = "../drone", version = "0.12.0" } solana-logger = { path = "../logger", version = "0.12.0" } solana-sdk = { path = "../sdk", version = "0.12.0" }