Relocate program2 into program

Author: mvines

Cargo.lock

@@ -5,7 +5,6 @@ members = [
   "token-swap/program",
   "token/cli",
   "token/program",
-  "token/program2",
 ]
 
 # Workflow for developing against local Solana crates

Cargo.toml

@@ -11,6 +11,5 @@ edition = "2018"
 solana-sdk = "1.3.4"
 spl-memo = { path = "../../memo/program" }
 spl-token = { path = "../../token/program" }
-spl-token2 = { path = "../../token/program2" }
 spl-token-swap = { path = "../../token-swap/program" }
 

ci/client/Cargo.toml

@@ -5,8 +5,6 @@ fn main() {
     println!("Yes have some memo_dep {:?}", memo_dep);
     let token_dep = spl_token::id();
     println!("Yes have some token_dep {:?}", token_dep);
-    let token2_dep = spl_token2::id();
-    println!("Yes have some token2_dep {:?}", token2_dep);
     let token_swap_dep = spl_token_swap::id();
     println!("Yes have some token_swap_dep {:?}", token_swap_dep);
 }

ci/client/src/main.rs

@@ -37,9 +37,6 @@ _ cargo run --manifest-path=ci/client/Cargo.toml
 _ git diff --exit-code token/program/inc/token.h
 _ cc token/program/inc/token.h -o target/token.gch
 
-_ git diff --exit-code token/program2/inc/token2.h
-_ cc token/program2/inc/token2.h -o target/token2.gch
-
 _ git diff --exit-code token-swap/program/inc/token-swap.h
 _ cc token-swap/program/inc/token-swap.h -o target/token-swap.gch
 

ci/script.sh

@@ -23,7 +23,6 @@ if [[ -z $1 ]]; then
   programs=(
     memo/program
     token/program
-    token/program2
     token-swap/program
   )
 else

coverage.sh

@@ -2,9 +2,9 @@
 # Note: This crate must be built using do.sh
 
 [package]
-name = "spl-token2"
-version = "1.0.0"
-description = "Solana Program Library Token 2"
+name = "spl-token"
+version = "1.1.0"
+description = "Solana Program Library Token"
 authors = ["Solana Maintainers <[email protected]>"]
 repository = "https://github.com/solana-labs/solana-program-library"
 license = "Apache-2.0"

token/program2/Cargo.toml renamed to token/program/Cargo.toml

@@ -4,12 +4,12 @@ use std::env;
 
 fn main() {
     println!("cargo:rerun-if-env-changed=SPL_CBINDGEN");
-    println!("cargo:rerun-if-changed=inc/token2.h");
-    if std::path::Path::new("inc/token2.h").exists() && env::var("SPL_CBINDGEN").is_err() {
+    println!("cargo:rerun-if-changed=inc/token.h");
+    if std::path::Path::new("inc/token.h").exists() && env::var("SPL_CBINDGEN").is_err() {
         return;
     }
 
-    println!("cargo:warning=Generating inc/token2.h");
+    println!("cargo:warning=Generating inc/token.h");
     let crate_dir = env::var("CARGO_MANIFEST_DIR").unwrap();
     let config = cbindgen::Config {
         header: Some("/* Autogenerated SPL Token program C Bindings */".to_string()),
@@ -61,5 +61,5 @@ fn main() {
         .with_config(config)
         .generate()
         .unwrap()
-        .write_to_file("inc/token2.h");
+        .write_to_file("inc/token.h");
 }