Simplify re-export

febo · febo · commit 2c6403b98000 · 2025-10-04T01:55:02.000+01:00
diff --git a/programs/memo/src/instructions/mod.rs b/programs/memo/src/instructions/mod.rs
@@ -4,7 +4,7 @@ use pinocchio::{
     account_info::AccountInfo,
     cpi::{slice_invoke_signed, MAX_CPI_ACCOUNTS},
     instruction::{AccountMeta, Instruction, Signer},
-    program_error::ProgramError,
+    error::ProgramError,
     ProgramResult,
 };
 
diff --git a/programs/system/src/instructions/create_account.rs b/programs/system/src/instructions/create_account.rs
@@ -2,7 +2,7 @@ use pinocchio::{
     account_info::AccountInfo,
     instruction::{AccountMeta, Instruction, Signer},
     program::invoke_signed,
-    program_error::ProgramError,
+    error::ProgramError,
     pubkey::Pubkey,
     sysvars::rent::Rent,
     ProgramResult,
diff --git a/programs/system/src/instructions/create_account_with_seed.rs b/programs/system/src/instructions/create_account_with_seed.rs
@@ -2,7 +2,7 @@ use pinocchio::{
     account_info::AccountInfo,
     instruction::{AccountMeta, Instruction, Signer},
     program::invoke_signed,
-    program_error::ProgramError,
+    error::ProgramError,
     pubkey::Pubkey,
     sysvars::rent::Rent,
     ProgramResult,
diff --git a/programs/token-2022/src/instructions/initialize_multisig.rs b/programs/token-2022/src/instructions/initialize_multisig.rs
@@ -3,8 +3,8 @@ use core::{mem::MaybeUninit, slice};
 use pinocchio::{
     account_info::AccountInfo,
     cpi::invoke_with_bounds,
+    error::ProgramError,
     instruction::{AccountMeta, Instruction},
-    program_error::ProgramError,
     pubkey::Pubkey,
     ProgramResult,
 };
diff --git a/programs/token-2022/src/instructions/initialize_multisig_2.rs b/programs/token-2022/src/instructions/initialize_multisig_2.rs
@@ -3,8 +3,8 @@ use core::{mem::MaybeUninit, slice};
 use pinocchio::{
     account_info::AccountInfo,
     cpi::invoke_with_bounds,
+    error::ProgramError,
     instruction::{AccountMeta, Instruction},
-    program_error::ProgramError,
     pubkey::Pubkey,
     ProgramResult,
 };
diff --git a/programs/token-2022/src/state/mint.rs b/programs/token-2022/src/state/mint.rs
@@ -1,6 +1,6 @@
 use pinocchio::{
     account_info::{AccountInfo, Ref},
-    program_error::ProgramError,
+    error::ProgramError,
     pubkey::Pubkey,
 };
 
diff --git a/programs/token-2022/src/state/multisig.rs b/programs/token-2022/src/state/multisig.rs
@@ -1,7 +1,7 @@
 use core::mem::size_of;
 use pinocchio::{
     account_info::{AccountInfo, Ref},
-    program_error::ProgramError,
+    error::ProgramError,
     pubkey::Pubkey,
 };
 
diff --git a/programs/token-2022/src/state/token.rs b/programs/token-2022/src/state/token.rs
@@ -1,7 +1,7 @@
 use super::AccountState;
 use pinocchio::{
     account_info::{AccountInfo, Ref},
-    program_error::ProgramError,
+    error::ProgramError,
     pubkey::Pubkey,
 };
 
diff --git a/programs/token/src/instructions/initialize_multisig.rs b/programs/token/src/instructions/initialize_multisig.rs
@@ -4,7 +4,7 @@ use pinocchio::{
     account_info::AccountInfo,
     cpi::invoke_with_bounds,
     instruction::{AccountMeta, Instruction},
-    program_error::ProgramError,
+    error::ProgramError,
     ProgramResult,
 };
 
diff --git a/programs/token/src/instructions/initialize_multisig_2.rs b/programs/token/src/instructions/initialize_multisig_2.rs
@@ -4,7 +4,7 @@ use pinocchio::{
     account_info::AccountInfo,
     cpi::invoke_with_bounds,
     instruction::{AccountMeta, Instruction},
-    program_error::ProgramError,
+    error::ProgramError,
     ProgramResult,
 };
 
diff --git a/programs/token/src/state/mint.rs b/programs/token/src/state/mint.rs
@@ -1,6 +1,6 @@
 use pinocchio::{
     account_info::{AccountInfo, Ref},
-    program_error::ProgramError,
+    error::ProgramError,
     pubkey::Pubkey,
 };
 
diff --git a/programs/token/src/state/multisig.rs b/programs/token/src/state/multisig.rs
@@ -1,7 +1,7 @@
 use core::mem::size_of;
 use pinocchio::{
     account_info::{AccountInfo, Ref},
-    program_error::ProgramError,
+    error::ProgramError,
     pubkey::Pubkey,
 };
 
diff --git a/programs/token/src/state/token.rs b/programs/token/src/state/token.rs
@@ -1,7 +1,7 @@
 use super::AccountState;
 use pinocchio::{
     account_info::{AccountInfo, Ref},
-    program_error::ProgramError,
+    error::ProgramError,
     pubkey::Pubkey,
 };
 
diff --git a/sdk/pinocchio/src/account_info.rs b/sdk/pinocchio/src/account_info.rs
@@ -11,7 +11,7 @@ use core::{
 use crate::syscalls::sol_memset_;
 
 use crate::{
-    program_error::ProgramError,
+    error::ProgramError,
     pubkey::{pubkey_eq, Pubkey},
     ProgramResult,
 };
diff --git a/sdk/pinocchio/src/cpi.rs b/sdk/pinocchio/src/cpi.rs
@@ -4,9 +4,9 @@ use core::{mem::MaybeUninit, ops::Deref, slice::from_raw_parts};
 
 use crate::{
     account_info::{AccountInfo, BorrowState},
+    error::ProgramError,
     hint::unlikely,
     instruction::{Account, Instruction, Signer},
-    program_error::ProgramError,
     pubkey::{pubkey_eq, Pubkey},
     ProgramResult,
 };
diff --git a/sdk/pinocchio/src/entrypoint/lazy.rs b/sdk/pinocchio/src/entrypoint/lazy.rs
@@ -4,7 +4,7 @@
 use crate::{
     account_info::{Account, AccountInfo},
     entrypoint::{NON_DUP_MARKER, STATIC_ACCOUNT_DATA},
-    program_error::ProgramError,
+    error::ProgramError,
     pubkey::Pubkey,
     BPF_ALIGN_OF_U128,
 };
diff --git a/sdk/pinocchio/src/lib.rs b/sdk/pinocchio/src/lib.rs
@@ -239,7 +239,7 @@ pub mod sysvars;
 
 #[deprecated(since = "0.7.0", note = "Use the `entrypoint` module instead")]
 pub use entrypoint::lazy as lazy_entrypoint;
-pub use solana_program_error as program_error;
+pub use solana_program_error as error;
 pub use solana_program_error::ProgramResult;
 
 /// Maximum number of accounts that a transaction may process.
diff --git a/sdk/pinocchio/src/pubkey.rs b/sdk/pinocchio/src/pubkey.rs
@@ -2,7 +2,7 @@
 
 use core::ptr::read_unaligned;
 
-use crate::program_error::ProgramError;
+use crate::error::ProgramError;
 
 /// Number of bytes in a pubkey.
 pub const PUBKEY_BYTES: usize = 32;
diff --git a/sdk/pinocchio/src/sysvars/clock.rs b/sdk/pinocchio/src/sysvars/clock.rs
@@ -5,7 +5,7 @@ use crate::{
     account_info::{AccountInfo, Ref},
     hint::unlikely,
     impl_sysvar_get,
-    program_error::ProgramError,
+    error::ProgramError,
     pubkey::{pubkey_eq, Pubkey},
 };
 
diff --git a/sdk/pinocchio/src/sysvars/instructions.rs b/sdk/pinocchio/src/sysvars/instructions.rs
@@ -1,7 +1,7 @@
 use crate::{
     account_info::{AccountInfo, Ref},
     instruction::AccountMeta,
-    program_error::ProgramError,
+    error::ProgramError,
     pubkey::{Pubkey, PUBKEY_BYTES},
 };
 
diff --git a/sdk/pinocchio/src/sysvars/mod.rs b/sdk/pinocchio/src/sysvars/mod.rs
@@ -2,7 +2,7 @@
 
 #[cfg(target_os = "solana")]
 use crate::syscalls::sol_get_sysvar;
-use crate::{program_error::ProgramError, pubkey::Pubkey};
+use crate::{error::ProgramError, pubkey::Pubkey};
 #[cfg(not(target_os = "solana"))]
 use core::hint::black_box;
 
@@ -44,7 +44,7 @@ pub trait Sysvar: Sized {
 #[macro_export]
 macro_rules! impl_sysvar_get {
     ($syscall_name:ident) => {
-        fn get() -> Result<Self, $crate::program_error::ProgramError> {
+        fn get() -> Result<Self, $crate::error::ProgramError> {
             let mut var = core::mem::MaybeUninit::<Self>::uninit();
             let var_addr = var.as_mut_ptr() as *mut _ as *mut u8;
 
@@ -60,7 +60,7 @@ macro_rules! impl_sysvar_get {
                     Ok(unsafe { var.assume_init() })
                 }
                 // Unexpected errors are folded into `UnsupportedSysvar`.
-                _ => Err($crate::program_error::ProgramError::UnsupportedSysvar),
+                _ => Err($crate::error::ProgramError::UnsupportedSysvar),
             }
         }
     };
diff --git a/sdk/pinocchio/src/sysvars/rent.rs b/sdk/pinocchio/src/sysvars/rent.rs
@@ -7,7 +7,7 @@ use crate::{
     account_info::{AccountInfo, Ref},
     hint::unlikely,
     impl_sysvar_get,
-    program_error::ProgramError,
+    error::ProgramError,
     pubkey::{pubkey_eq, Pubkey},
 };
 
diff --git a/sdk/pinocchio/src/sysvars/slot_hashes/mod.rs b/sdk/pinocchio/src/sysvars/slot_hashes/mod.rs
@@ -16,7 +16,7 @@ mod test_utils;
 use crate::{
     account_info::{AccountInfo, Ref},
     hint::unlikely,
-    program_error::ProgramError,
+    error::ProgramError,
     pubkey::{pubkey_eq, Pubkey},
     sysvars::clock::Slot,
 };
diff --git a/sdk/pinocchio/src/sysvars/slot_hashes/test.rs b/sdk/pinocchio/src/sysvars/slot_hashes/test.rs
@@ -1,7 +1,7 @@
 use super::test_utils::*;
 use crate::{
     account_info::{Account, AccountInfo},
-    program_error::ProgramError,
+    error::ProgramError,
     sysvars::{clock::Slot, slot_hashes::*},
 };
 use core::{
diff --git a/sdk/pinocchio/src/sysvars/slot_hashes/test_edge.rs b/sdk/pinocchio/src/sysvars/slot_hashes/test_edge.rs
@@ -1,4 +1,4 @@
-use crate::{program_error::ProgramError, sysvars::slot_hashes::*};
+use crate::{error::ProgramError, sysvars::slot_hashes::*};
 extern crate std;
 use super::test_utils::{build_slot_hashes_bytes as raw_slot_hashes, make_account_info};
 
