Rename solana-program-sdk to solana-program

sdk/Cargo.toml

@@ -11,7 +11,7 @@ edition = "2018"
 [features]
 # "program" feature is a legacy feature retained to support v1.3 and older
 # programs.  New development should not use this feature.  Instead use the
-# solana-program-sdk crate
+# solana-program crate
 program = []
 
 # "everything" includes functionality that is not compatible or needed for on-chain programs
@@ -65,7 +65,7 @@ solana-crate-features = { path = "../crate-features", version = "1.5.0", optiona
 solana-logger = { path = "../logger", version = "1.5.0", optional = true }
 solana-frozen-abi = { path = "../frozen-abi", version = "1.5.0" }
 solana-frozen-abi-macro = { path = "../frozen-abi/macro", version = "1.5.0" }
-solana-program-sdk = { path = "program", version = "1.5.0" }
+solana-program = { path = "program", version = "1.5.0" }
 solana-sdk-macro = { path = "macro", version = "1.5.0" }
 rustversion = "1.0.3"
 libsecp256k1 = { version = "0.3.5", optional = true }

sdk/macro/src/lib.rs

@@ -81,17 +81,13 @@ struct ProgramSdkId(proc_macro2::TokenStream);
 
 impl Parse for ProgramSdkId {
     fn parse(input: ParseStream) -> Result<Self> {
-        parse_id(input, quote! { ::solana_program_sdk::pubkey::Pubkey }).map(Self)
+        parse_id(input, quote! { ::solana_program::pubkey::Pubkey }).map(Self)
     }
 }
 
 impl ToTokens for ProgramSdkId {
     fn to_tokens(&self, tokens: &mut proc_macro2::TokenStream) {
-        id_to_tokens(
-            &self.0,
-            quote! { ::solana_program_sdk::pubkey::Pubkey },
-            tokens,
-        )
+        id_to_tokens(&self.0, quote! { ::solana_program::pubkey::Pubkey }, tokens)
     }
 }
 
@@ -168,7 +164,7 @@ pub fn declare_id(input: TokenStream) -> TokenStream {
 }
 
 #[proc_macro]
-pub fn program_sdk_declare_id(input: TokenStream) -> TokenStream {
+pub fn program_declare_id(input: TokenStream) -> TokenStream {
     let id = parse_macro_input!(input as ProgramSdkId);
     TokenStream::from(quote! {#id})
 }

sdk/program/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
-name = "solana-program-sdk"
+name = "solana-program"
 version = "1.5.0"
-description = "Solana Program SDK"
+description = "Solana Program"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
 homepage = "https://solana.com/"

sdk/program/src/lib.rs

@@ -1,8 +1,8 @@
 #![cfg_attr(RUSTC_WITH_SPECIALIZATION, feature(specialization))]
 #![cfg_attr(RUSTC_NEEDS_PROC_MACRO_HYGIENE, feature(proc_macro_hygiene))]
 
-// Allows macro expansion of `use ::solana_program_sdk::*` to work within this crate
-extern crate self as solana_program_sdk;
+// Allows macro expansion of `use ::solana_program::*` to work within this crate
+extern crate self as solana_program;
 
 pub mod account;
 pub mod account_info;
@@ -51,10 +51,10 @@ pub mod sysvar;
 /// # // wrapper is used so that the macro invocation occurs in the item position
 /// # // rather than in the statement position which isn't allowed.
 /// use std::str::FromStr;
-/// use solana_program_sdk::{declare_id, pubkey::Pubkey};
+/// use solana_program::{declare_id, pubkey::Pubkey};
 ///
 /// # mod item_wrapper {
-/// #   use solana_program_sdk::declare_id;
+/// #   use solana_program::declare_id;
 /// declare_id!("My11111111111111111111111111111111111111111");
 /// # }
 /// # use item_wrapper::id;
@@ -62,7 +62,7 @@ pub mod sysvar;
 /// let my_id = Pubkey::from_str("My11111111111111111111111111111111111111111").unwrap();
 /// assert_eq!(id(), my_id);
 /// ```
-pub use solana_sdk_macro::program_sdk_declare_id as declare_id;
+pub use solana_sdk_macro::program_declare_id as declare_id;
 
 #[macro_use]
 extern crate serde_derive;

sdk/src/entrypoint.rs

@@ -1,9 +1,9 @@
-pub use solana_program_sdk::entrypoint::*;
+pub use solana_program::entrypoint::*;
 
 #[macro_export]
 #[deprecated(
     since = "1.4.3",
-    note = "use solana_program_sdk::entrypoint::entrypoint instead"
+    note = "use solana_program::entrypoint::entrypoint instead"
 )]
 macro_rules! entrypoint {
     ($process_instruction:ident) => {

sdk/src/entrypoint_deprecated.rs

@@ -1,9 +1,9 @@
-pub use solana_program_sdk::entrypoint_deprecated::*;
+pub use solana_program::entrypoint_deprecated::*;
 
 #[macro_export]
 #[deprecated(
     since = "1.4.3",
-    note = "use solana_program_sdk::entrypoint::entrypoint instead"
+    note = "use solana_program::entrypoint::entrypoint instead"
 )]
 macro_rules! entrypoint_deprecated {
     ($process_instruction:ident) => {

sdk/src/hash.rs

@@ -1,4 +1,4 @@
-pub use solana_program_sdk::hash::*;
+pub use solana_program::hash::*;
 
 /// random hash value for tests and benchmarks.
 #[cfg(feature = "everything")]

sdk/src/lib.rs

@@ -4,7 +4,7 @@
 // Allows macro expansion of `use ::solana_sdk::*` to work within this crate
 extern crate self as solana_sdk;
 
-pub use solana_program_sdk::*;
+pub use solana_program::*;
 
 pub mod builtins;
 pub mod client;

sdk/src/log.rs

@@ -1,9 +1,9 @@
 #![cfg(feature = "program")]
 
-pub use solana_program_sdk::log::*;
+pub use solana_program::log::*;
 
 #[macro_export]
-#[deprecated(since = "1.4.3", note = "solana_program_sdk::log::info instead")]
+#[deprecated(since = "1.4.3", note = "solana_program::log::info instead")]
 macro_rules! info {
     ($msg:expr) => {
         $crate::log::sol_log($msg)

sdk/src/pubkey.rs

@@ -1,4 +1,4 @@
-pub use solana_program_sdk::pubkey::*;
+pub use solana_program::pubkey::*;
 
 /// New random Pubkey for tests and benchmarks.
 #[cfg(feature = "everything")]