Use solana-instruction-view

Author: febo

programs/associated-token-account/src/instructions/create.rs

@@ -1,9 +1,9 @@
-use pinocchio::{
-    account_view::AccountView,
-    instruction::{AccountMeta, Instruction, Signer},
-    program::invoke_signed,
-    ProgramResult,
+use solana_account_view::AccountView;
+use solana_instruction_view::{
+    cpi::{invoke_signed, Signer},
+    AccountMeta, InstructionView,
 };
+use solana_program_error::ProgramResult;
 
 /// Creates an associated token account for the given wallet address and token mint.
 /// Returns an error if the account exists.
@@ -53,7 +53,7 @@ impl Create<'_> {
 
         let instruction_data = [0u8];
 
-        let instruction = Instruction {
+        let instruction = InstructionView {
             program_id: &crate::ID,
             accounts: &account_metas,
             data: &instruction_data,

programs/associated-token-account/src/instructions/create_idempotent.rs

@@ -1,9 +1,9 @@
-use pinocchio::{
-    account_view::AccountView,
-    instruction::{AccountMeta, Instruction, Signer},
-    program::invoke_signed,
-    ProgramResult,
+use solana_account_view::AccountView;
+use solana_instruction_view::{
+    cpi::{invoke_signed, Signer},
+    AccountMeta, InstructionView,
 };
+use solana_program_error::ProgramResult;
 
 /// Creates an associated token account for the given wallet address and
 /// token mint, if it doesn't already exist.  Returns an error if the
@@ -54,7 +54,7 @@ impl CreateIdempotent<'_> {
 
         let instruction_data = [1u8];
 
-        let instruction = Instruction {
+        let instruction = InstructionView {
             program_id: &crate::ID,
             accounts: &account_metas,
             data: &instruction_data,

programs/associated-token-account/src/instructions/recover_nested.rs

@@ -1,9 +1,9 @@
-use pinocchio::{
-    account_view::AccountView,
-    instruction::{AccountMeta, Instruction, Signer},
-    program::invoke_signed,
-    ProgramResult,
+use solana_account_view::AccountView;
+use solana_instruction_view::{
+    cpi::{invoke_signed, Signer},
+    AccountMeta, InstructionView,
 };
+use solana_program_error::ProgramResult;
 
 /// Transfers from and closes a nested associated token account: an
 /// associated token account owned by an associated token account.
@@ -65,7 +65,7 @@ impl RecoverNested<'_> {
 
         let instruction_data = [2u8];
 
-        let instruction = Instruction {
+        let instruction = InstructionView {
             program_id: &crate::ID,
             accounts: &account_metas,
             data: &instruction_data,

programs/system/src/instructions/advance_nonce_account.rs

@@ -1,9 +1,9 @@
-use pinocchio::{
-    account_view::AccountView,
-    instruction::{AccountMeta, Instruction, Signer},
-    program::invoke_signed,
-    ProgramResult,
+use solana_account_view::AccountView;
+use solana_instruction_view::{
+    cpi::{invoke_signed, Signer},
+    AccountMeta, InstructionView,
 };
+use solana_program_error::ProgramResult;
 
 /// Consumes a stored nonce, replacing it with a successor.
 ///
@@ -38,7 +38,7 @@ impl AdvanceNonceAccount<'_> {
         ];
 
         // instruction
-        let instruction = Instruction {
+        let instruction = InstructionView {
             program_id: &crate::ID,
             accounts: &account_metas,
             data: &[4],

programs/system/src/instructions/allocate.rs

@@ -1,9 +1,9 @@
-use pinocchio::{
-    account_view::AccountView,
-    instruction::{AccountMeta, Instruction, Signer},
-    program::invoke_signed,
-    ProgramResult,
+use solana_account_view::AccountView;
+use solana_instruction_view::{
+    cpi::{invoke_signed, Signer},
+    AccountMeta, InstructionView,
 };
+use solana_program_error::ProgramResult;
 
 /// Allocate space in a (possibly new) account without funding.
 ///
@@ -35,7 +35,7 @@ impl Allocate<'_> {
         instruction_data[0] = 8;
         instruction_data[4..12].copy_from_slice(&self.space.to_le_bytes());
 
-        let instruction = Instruction {
+        let instruction = InstructionView {
             program_id: &crate::ID,
             accounts: &account_metas,
             data: &instruction_data,

programs/system/src/instructions/allocate_with_seed.rs

@@ -64,7 +64,7 @@ impl AllocateWithSeed<'_, '_, '_> {
         instruction_data[offset..offset + 8].copy_from_slice(&self.space.to_le_bytes());
         instruction_data[offset + 8..offset + 40].copy_from_slice(self.owner.as_ref());
 
-        let instruction = Instruction {
+        let instruction = InstructionView {
             program_id: &crate::ID,
             accounts: &account_metas,
             data: &instruction_data[..offset + 40],

programs/system/src/instructions/assign.rs

@@ -36,7 +36,7 @@ impl Assign<'_, '_> {
         instruction_data[0] = 1;
         instruction_data[4..36].copy_from_slice(self.owner.as_ref());
 
-        let instruction = Instruction {
+        let instruction = InstructionView {
             program_id: &crate::ID,
             accounts: &account_metas,
             data: &instruction_data,

programs/system/src/instructions/assign_with_seed.rs

@@ -58,7 +58,7 @@ impl AssignWithSeed<'_, '_, '_> {
         instruction_data[44..offset].copy_from_slice(self.seed.as_bytes());
         instruction_data[offset..offset + 32].copy_from_slice(self.owner.as_ref());
 
-        let instruction = Instruction {
+        let instruction = InstructionView {
             program_id: &crate::ID,
             accounts: &account_metas,
             data: &instruction_data[..offset + 32],

programs/system/src/instructions/authorize_nonce_account.rs

@@ -45,7 +45,7 @@ impl AuthorizeNonceAccount<'_, '_> {
         instruction_data[0] = 7;
         instruction_data[4..36].copy_from_slice(self.new_authority.as_array());
 
-        let instruction = Instruction {
+        let instruction = InstructionView {
             program_id: &crate::ID,
             accounts: &account_metas,
             data: &instruction_data,

programs/system/src/instructions/create_account.rs

@@ -75,7 +75,7 @@ impl<'a> CreateAccount<'a> {
         instruction_data[12..20].copy_from_slice(&self.space.to_le_bytes());
         instruction_data[20..52].copy_from_slice(self.owner.as_ref());
 
-        let instruction = Instruction {
+        let instruction = InstructionView {
             program_id: &crate::ID,
             accounts: &account_metas,
             data: &instruction_data,