From c53c35175968f5341a3c8c464d9aa43c627e4afa Mon Sep 17 00:00:00 2001 From: Greg Fitzgerald Date: Fri, 1 Mar 2019 09:06:21 -0700 Subject: [PATCH] Rename erc20 to token-program Everything it uses already had that name, just the crate was never renamed. --- Cargo.lock | 24 +++++++++---------- Cargo.toml | 2 +- programs/native/{erc20 => token}/Cargo.toml | 6 ++--- programs/native/{erc20 => token}/src/lib.rs | 0 .../{erc20 => token}/src/token_program.rs | 0 runtime/src/bank.rs | 2 +- 6 files changed, 17 insertions(+), 17 deletions(-) rename programs/native/{erc20 => token}/Cargo.toml (77%) rename programs/native/{erc20 => token}/src/lib.rs (100%) rename programs/native/{erc20 => token}/src/token_program.rs (100%) diff --git a/Cargo.lock b/Cargo.lock index cf8c7bbbe..4f47163bd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2072,18 +2072,6 @@ dependencies = [ "tokio-codec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "solana-erc20" -version = "0.12.0" -dependencies = [ - "bincode 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.88 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.88 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-logger 0.12.0", - "solana-sdk 0.12.0", -] - [[package]] name = "solana-failure" version = "0.12.0" @@ -2323,6 +2311,18 @@ dependencies = [ "solana-sdk 0.12.0", ] +[[package]] +name = "solana-token-program" +version = "0.12.0" +dependencies = [ + "bincode 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.88 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 1.0.88 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-logger 0.12.0", + "solana-sdk 0.12.0", +] + [[package]] name = "solana-upload-perf" version = "0.12.0" diff --git a/Cargo.toml b/Cargo.toml index 3deebee40..ce0ee5851 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -99,7 +99,7 @@ members = [ "programs", "programs/native/bpf_loader", "programs/native/budget", - "programs/native/erc20", + "programs/native/token", "programs/native/failure", "programs/native/native_loader", "programs/native/noop", diff --git a/programs/native/erc20/Cargo.toml b/programs/native/token/Cargo.toml similarity index 77% rename from programs/native/erc20/Cargo.toml rename to programs/native/token/Cargo.toml index e2b45556f..5ac49e2fa 100644 --- a/programs/native/erc20/Cargo.toml +++ b/programs/native/token/Cargo.toml @@ -1,7 +1,7 @@ [package] -name = "solana-erc20" +name = "solana-token-program" version = "0.12.0" -description = "Solana reference erc20 program" +description = "Solana token program implementing the ERC20 interface" authors = ["Solana Maintainers "] repository = "https://github.com/solana-labs/solana" license = "Apache-2.0" @@ -17,6 +17,6 @@ solana-logger = { path = "../../../logger", version = "0.12.0" } solana-sdk = { path = "../../../sdk", version = "0.12.0" } [lib] -name = "solana_erc20" +name = "solana_token_program" crate-type = ["cdylib"] diff --git a/programs/native/erc20/src/lib.rs b/programs/native/token/src/lib.rs similarity index 100% rename from programs/native/erc20/src/lib.rs rename to programs/native/token/src/lib.rs diff --git a/programs/native/erc20/src/token_program.rs b/programs/native/token/src/token_program.rs similarity index 100% rename from programs/native/erc20/src/token_program.rs rename to programs/native/token/src/token_program.rs diff --git a/runtime/src/bank.rs b/runtime/src/bank.rs index 880a54a71..20f5af38d 100644 --- a/runtime/src/bank.rs +++ b/runtime/src/bank.rs @@ -261,7 +261,7 @@ impl Bank { self.add_native_program("solana_storage_program", &storage_program::id()); self.add_native_program("solana_bpf_loader", &bpf_loader::id()); self.add_native_program("solana_budget_program", &budget_program::id()); - self.add_native_program("solana_erc20", &token_program::id()); + self.add_native_program("solana_token_program", &token_program::id()); } /// Return the last entry ID registered.