remove solana-program from spl-memo (#7429)

* remove solana-program from spl-memo

* fix imports in tests

* fix more test imports

* fmt

Author: kevinheavey

Cargo.lock

@@ -12,7 +12,12 @@ no-entrypoint = []
 test-sbf = []
 
 [dependencies]
-solana-program = "2.1.0"
+solana-account-info = "2.1.0"
+solana-instruction = "2.1.0"
+solana-msg = "2.1.0"
+solana-program-entrypoint = "2.1.0"
+solana-program-error = "2.1.0"
+solana-pubkey = "2.1.0"
 
 [dev-dependencies]
 solana-program-test = "2.1.0"

memo/program/Cargo.toml

@@ -2,9 +2,12 @@
 
 #![cfg(not(feature = "no-entrypoint"))]
 
-use solana_program::{account_info::AccountInfo, entrypoint::ProgramResult, pubkey::Pubkey};
+use {
+    solana_account_info::AccountInfo, solana_program_entrypoint::ProgramResult,
+    solana_pubkey::Pubkey,
+};
 
-solana_program::entrypoint!(process_instruction);
+solana_program_entrypoint::entrypoint!(process_instruction);
 fn process_instruction(
     program_id: &Pubkey,
     accounts: &[AccountInfo],

memo/program/src/entrypoint.rs

@@ -9,18 +9,21 @@ pub mod processor;
 
 // Export current sdk types for downstream users building with a different sdk
 // version
-pub use solana_program;
-use solana_program::{
-    instruction::{AccountMeta, Instruction},
-    pubkey::Pubkey,
+pub use {
+    solana_account_info, solana_instruction, solana_msg, solana_program_entrypoint,
+    solana_program_error, solana_pubkey,
+};
+use {
+    solana_instruction::{AccountMeta, Instruction},
+    solana_pubkey::Pubkey,
 };
 
 /// Legacy symbols from Memo v1
 pub mod v1 {
-    solana_program::declare_id!("Memo1UhkJRfHyvLMcVucJwxXeuD728EqVDDwQDxFMNo");
+    solana_pubkey::declare_id!("Memo1UhkJRfHyvLMcVucJwxXeuD728EqVDDwQDxFMNo");
 }
 
-solana_program::declare_id!("MemoSq4gqABAXKb96qnH8TysNcWxMyWCqXgDLGmfcHr");
+solana_pubkey::declare_id!("MemoSq4gqABAXKb96qnH8TysNcWxMyWCqXgDLGmfcHr");
 
 /// Build a memo instruction, possibly signed
 ///

memo/program/src/lib.rs

@@ -1,11 +1,8 @@
 //! Program state processor
 
 use {
-    solana_program::{
-        account_info::AccountInfo, entrypoint::ProgramResult, msg, program_error::ProgramError,
-        pubkey::Pubkey,
-    },
-    std::str::from_utf8,
+    solana_account_info::AccountInfo, solana_msg::msg, solana_program_entrypoint::ProgramResult,
+    solana_program_error::ProgramError, solana_pubkey::Pubkey, std::str::from_utf8,
 };
 
 /// Instruction processor
@@ -39,11 +36,8 @@ pub fn process_instruction(
 #[cfg(test)]
 mod tests {
     use {
-        super::*,
-        solana_program::{
-            account_info::IntoAccountInfo, program_error::ProgramError, pubkey::Pubkey,
-        },
-        solana_sdk::account::Account,
+        super::*, solana_account_info::IntoAccountInfo, solana_program_error::ProgramError,
+        solana_pubkey::Pubkey, solana_sdk::account::Account,
     };
 
     #[test]

memo/program/src/processor.rs

@@ -1,11 +1,9 @@
 #![cfg(feature = "test-sbf")]
 
 use {
-    solana_program::{
-        instruction::{AccountMeta, Instruction, InstructionError},
-        pubkey::Pubkey,
-    },
+    solana_instruction::{error::InstructionError, AccountMeta, Instruction},
     solana_program_test::*,
+    solana_pubkey::Pubkey,
     solana_sdk::{
         signature::{Keypair, Signer},
         transaction::{Transaction, TransactionError},