move BorrowedAccountMeta and BorrowedInstruction to instruction crate (…

…#3693) * move BorrowedAccountMeta and BorrowedInstruction to solana-instruction crate * update doc comments Co-authored-by: Jon C <[email protected]> --------- Co-authored-by: Jon C <[email protected]>
anza-xyz · Nov 18, 2024 · e3954be · e3954be
1 parent 73f54a0
commit e3954be
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 21 deletions.
diff --git a/sdk/instruction/src/lib.rs b/sdk/instruction/src/lib.rs
@@ -296,3 +296,23 @@ pub struct ProcessedSiblingInstruction {
     /// Number of AccountMeta structures
     pub accounts_len: u64,
 }
+
+/// Borrowed version of `AccountMeta`.
+///
+/// This struct is used by the runtime when constructing the instructions sysvar. It is not
+/// useful to Solana programs.
+pub struct BorrowedAccountMeta<'a> {
+    pub pubkey: &'a Pubkey,
+    pub is_signer: bool,
+    pub is_writable: bool,
+}
+
+/// Borrowed version of `Instruction`.
+///
+/// This struct is used by the runtime when constructing the instructions sysvar. It is not
+/// useful to Solana programs.
+pub struct BorrowedInstruction<'a> {
+    pub program_id: &'a Pubkey,
+    pub accounts: Vec<BorrowedAccountMeta<'a>>,
+    pub data: &'a [u8],
+}
diff --git a/sdk/program/src/sysvar/instructions.rs b/sdk/program/src/sysvar/instructions.rs
@@ -31,6 +31,8 @@
 
 #[cfg(feature = "dev-context-only-utils")]
 use qualifier_attr::qualifiers;
+#[deprecated(since = "2.2.0", note = "Use solana-instruction crate instead")]
+pub use solana_instruction::{BorrowedAccountMeta, BorrowedInstruction};
 pub use solana_sdk_ids::sysvar::instructions::{check_id, id, ID};
 #[cfg(not(target_os = "solana"))]
 use {
@@ -42,7 +44,6 @@ use {
         account_info::AccountInfo,
         instruction::{AccountMeta, Instruction},
         program_error::ProgramError,
-        pubkey::Pubkey,
         serialize_utils::{read_pubkey, read_slice, read_u16, read_u8},
     },
     solana_sanitize::SanitizeError,
@@ -74,26 +75,6 @@ pub fn construct_instructions_data(instructions: &[BorrowedInstruction]) -> Vec<
     data
 }
 
-/// Borrowed version of `AccountMeta`.
-///
-/// This struct is used by the runtime when constructing the sysvar. It is not
-/// useful to Solana programs.
-pub struct BorrowedAccountMeta<'a> {
-    pub pubkey: &'a Pubkey,
-    pub is_signer: bool,
-    pub is_writable: bool,
-}
-
-/// Borrowed version of `Instruction`.
-///
-/// This struct is used by the runtime when constructing the sysvar. It is not
-/// useful to Solana programs.
-pub struct BorrowedInstruction<'a> {
-    pub program_id: &'a Pubkey,
-    pub accounts: Vec<BorrowedAccountMeta<'a>>,
-    pub data: &'a [u8],
-}
-
 #[cfg(not(target_os = "solana"))]
 bitflags! {
     struct InstructionsSysvarAccountMeta: u8 {