Fix: broken error macros and remove confusing err macro (#277)

- Removed err macro (unnecessary and confusing with `error`​)
- fixed error macros and added extra tests to make sure they all compile in all variants

Author: stegaBOB

CHANGELOG.md

@@ -7,6 +7,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Fixed
+
+- Fixed error macros and add tests (#277)
+
+### Removed
+
+- Removed `err` macro (#277)
+
 ## [0.26.0] - 2025-09-25
 
 ### Added

star_frame/src/account_set/single_set.rs

@@ -264,15 +264,13 @@ where
         match rent_lamports.cmp(&lamports) {
             Ordering::Equal => Ok(()),
             Ordering::Greater => {
-                if lamports > 0 {
-                    err!(
-                        ProgramError::InsufficientFunds,
-                        "Tried to refund rent from {} but does not have enough lamports to cover rent",
-                        account.pubkey()
-                    )
-                } else {
-                    Ok(())
-                }
+                ensure!(
+                    lamports > 0,
+                    ProgramError::InsufficientFunds,
+                    "Tried to refund rent from {} but does not have enough lamports to cover rent",
+                    account.pubkey()
+                );
+                Ok(())
             }
             Ordering::Less => {
                 let transfer_amount = lamports - rent_lamports;

star_frame/src/errors.rs

@@ -83,13 +83,13 @@ macro_rules! ensure_eq {
         let left = $left;
         let right = $right;
         if left != right {
-            return $crate::err!($err, format!("expected {:?}, found {:?}", right, left)).into();
+            return Err($crate::error!($err, "expected {right:?}, found {left:?}").into());
         }
     }};
 
     ($left:expr, $right:expr, $err:expr, $($ctx:tt)*) => {{
         if $left != $right {
-            return $crate::err!($err, $($ctx)*).into();
+            return Err($crate::error!($err, $($ctx)*).into());
         }
     }};
 }
@@ -101,17 +101,17 @@ macro_rules! ensure_eq {
 macro_rules! ensure_ne {
     ($left:expr, $right:expr, $err:expr $(,)?) => {{
         let right = $right;
+        let left = $left;
         if left == right {
-            return $crate::err!(
+            return Err($crate::error!(
                 $err,
-                format!("expected to not be {:?}, found {:?}", right, left)
-            )
-            .into();
+                "expected to not be {right:?}, found {left:?}"
+            ).into());
         }
     }};
     ($left:expr, $right:expr, $err:expr, $($ctx:tt)*) => {{
         if $left == $right {
-            return $crate::err!($err, $($ctx)*).into();
+            return Err($crate::error!($err, $($ctx)*).into());
         }
     }};
 }
@@ -121,7 +121,7 @@ macro_rules! ensure_ne {
 macro_rules! ensure {
     ($cond:expr, $err:expr $(, $($ctx:tt)*)?) => {
         if !$cond {
-            return Err($crate::error!($err, $($($ctx)*)*)).into();
+            return Err($crate::error!($err, $($($ctx)*)*).into());
         }
     };
 }
@@ -130,15 +130,7 @@ macro_rules! ensure {
 #[macro_export]
 macro_rules! bail {
     ($err:expr $(, $($ctx:tt)*)?) => {
-        return $crate::err!($err, $($($ctx)*)*).into()
-    };
-}
-
-/// Construcs an [`Err<Error>`](Error)
-#[macro_export]
-macro_rules! err {
-    ($err:expr $(, $($ctx:tt)*)?) => {
-        Err($crate::error!($err, $($($ctx)*)*))
+        return Err($crate::error!($err, $($($ctx)*)*).into())
     };
 }
 
@@ -589,7 +581,9 @@ mod tests {
         ensure!(true, ErrorCode::BorrowError, "Hello {}!", "world");
         let res: Result<(), Error> = (|| {
             ensure_eq!(0, 1, ProgramError::IllegalOwner, "Test {:?}", "aaa");
+            ensure_eq!(0, 1, ProgramError::IllegalOwner);
             ensure_ne!(0, 1, ProgramError::IllegalOwner, "Test {}", "aaa");
+            ensure_ne!(0, 1, ProgramError::IllegalOwner);
             Ok(())
         })();
 

star_frame/src/prelude.rs

@@ -30,7 +30,7 @@ pub use crate::{
         ClockExt, GetKeyFor as _, GetOptionalKeyFor as _, KeyFor, OptionalKeyFor, OptionalPubkey,
         PackedValue, SetKeyFor as _, UnitVal,
     },
-    ensure, ensure_eq, ensure_ne, err, error,
+    ensure, ensure_eq, ensure_ne, error,
     errors::{star_frame_error, Error, ErrorInfo as _},
     instruction::{
         star_frame_instruction, InstructionArgs, InstructionDiscriminant as _, InstructionSet,