chore: update ErrorCode and add require macro (#300)

Aursen · web-flow · commit 32a27b4cd2ae · 2025-11-19T13:34:52.000+07:00
* chore: update ErrorCode and add require macro

* update scripts

* bump litesvm version

* update benchmark

---------

Co-authored-by: Aursen &lt;aursen@users.noreply.github.com&gt;
diff --git a/benches/program-bench/Cargo.toml b/benches/program-bench/Cargo.toml
@@ -9,7 +9,7 @@ name = "bench"
 harness = false
 
 [dependencies]
-litesvm = "0.8"
+litesvm = "0.8.2"
 serde = "1.0"
 solana-hash = "3.0"
 solana-instruction = "3.0"
diff --git a/crates/errors/src/error_code.rs b/crates/errors/src/error_code.rs
@@ -2,7 +2,7 @@ use pinocchio::program_error::{ProgramError, ToStr};
 
 #[derive(Debug, PartialEq, Eq)]
 pub enum ErrorCode {
-    InvalidProgramExecutable = 100,
+    UnknownInstruction = 100,
     AccountNotSigner,
     AccountDiscriminatorMismatch,
     HasOneConstraint,
@@ -12,7 +12,6 @@ pub enum ErrorCode {
     TokenConstraintViolated,
     BufferFull,
     InvalidReturnData,
-    UnknownInstruction,
     InvalidDataLength,
     InvalidDataAlignment,
 }
@@ -22,7 +21,7 @@ impl TryFrom<u32> for ErrorCode {
 
     fn try_from(value: u32) -> Result<Self, Self::Error> {
         match value {
-            100 => Ok(ErrorCode::InvalidProgramExecutable),
+            100 => Ok(ErrorCode::UnknownInstruction),
             101 => Ok(ErrorCode::AccountNotSigner),
             102 => Ok(ErrorCode::AccountDiscriminatorMismatch),
             103 => Ok(ErrorCode::HasOneConstraint),
@@ -32,9 +31,8 @@ impl TryFrom<u32> for ErrorCode {
             107 => Ok(ErrorCode::TokenConstraintViolated),
             108 => Ok(ErrorCode::BufferFull),
             109 => Ok(ErrorCode::InvalidReturnData),
-            110 => Ok(ErrorCode::UnknownInstruction),
-            111 => Ok(ErrorCode::InvalidDataLength),
-            112 => Ok(ErrorCode::InvalidDataAlignment),
+            110 => Ok(ErrorCode::InvalidDataLength),
+            111 => Ok(ErrorCode::InvalidDataAlignment),
             _ => Err(ProgramError::InvalidArgument),
         }
     }
@@ -52,7 +50,7 @@ impl ToStr for ErrorCode {
         E: 'static + ToStr + TryFrom<u32>,
     {
         match self {
-            ErrorCode::InvalidProgramExecutable => "Error: Program is not executable",
+            ErrorCode::UnknownInstruction => "Error: Unknown instruction",
             ErrorCode::AccountNotSigner => "Error: Account is not a signer",
             ErrorCode::AccountDiscriminatorMismatch => {
                 "Error: Discriminator did not match what was expected"
@@ -66,7 +64,6 @@ impl ToStr for ErrorCode {
             ErrorCode::TokenConstraintViolated => "Error: Token constraint was violated",
             ErrorCode::BufferFull => "Error: Buffer is full",
             ErrorCode::InvalidReturnData => "Error: The return data is invalid",
-            ErrorCode::UnknownInstruction => "Error: Unknown instruction",
             ErrorCode::InvalidDataLength => "Error: Invalid data length",
             ErrorCode::InvalidDataAlignment => "Error: Invalid data alignment",
         }
diff --git a/crates/errors/src/lib.rs b/crates/errors/src/lib.rs
@@ -89,3 +89,12 @@ macro_rules! impl_error_logger {
         }
     };
 }
+
+#[macro_export]
+macro_rules! require {
+    ( $constraint:expr, $error:expr ) => {
+        if !$constraint {
+            return Err($error.into());
+        }
+    };
+}
diff --git a/examples/anchor-cpi/tests/Cargo.toml b/examples/anchor-cpi/tests/Cargo.toml
@@ -6,7 +6,7 @@ publish = false
 
 [dev-dependencies]
 bytemuck = "1.23"
-litesvm = "0.8"
+litesvm = "0.8.2"
 typhoon = { path = "../../../crates/lib" }
 solana-instruction = "3.0"
 solana-keypair = "3.0"
diff --git a/examples/counter/Cargo.toml b/examples/counter/Cargo.toml
@@ -24,7 +24,7 @@ typhoon = { path = "../../crates/lib" }
 typhoon-idl-generator = { path = "../../crates/idl-generator" }
 
 [dev-dependencies]
-litesvm = "0.8"
+litesvm = "0.8.2"
 solana-instruction = "3.0"
 solana-keypair = "3.0"
 solana-native-token = "3.0"
diff --git a/examples/cpi/Cargo.toml b/examples/cpi/Cargo.toml
@@ -15,7 +15,7 @@ unexpected_cfgs = { level = "warn", check-cfg = [
 bytemuck = "1.23"
 hand-interface = { path = "interfaces/hand" }
 lever-interface = { path = "interfaces/lever" }
-litesvm = "0.8"
+litesvm = "0.8.2"
 typhoon = { path = "../../crates/lib" }
 typhoon-instruction-builder = { path = "../../crates/instruction-builder" }
 solana-pubkey = "3.0"
diff --git a/examples/escrow/Cargo.toml b/examples/escrow/Cargo.toml
@@ -15,7 +15,7 @@ unexpected_cfgs = { level = "warn", check-cfg = [
 [workspace.dependencies]
 bytemuck = "1.23"
 escrow-interface = { path = "interfaces/escrow" }
-litesvm = "0.8"
+litesvm = "0.8.2"
 typhoon = { path = "../../crates/lib" }
 typhoon-token = { path = "../../crates/token" }
 typhoon-instruction-builder = { path = "../../crates/instruction-builder" }
diff --git a/examples/hello-world/Cargo.toml b/examples/hello-world/Cargo.toml
@@ -19,7 +19,7 @@ unexpected_cfgs = { level = "warn", check-cfg = [
 typhoon = { path = "../../crates/lib" }
 
 [dev-dependencies]
-litesvm = "0.8"
+litesvm = "0.8.2"
 solana-instruction = "3.0"
 solana-keypair = "3.0"
 solana-native-token = "3.0"
diff --git a/examples/instruction-data/Cargo.toml b/examples/instruction-data/Cargo.toml
@@ -20,7 +20,7 @@ bytemuck = { version = "1.21.0", features = ["derive"] }
 typhoon = { path = "../../crates/lib" }
 
 [dev-dependencies]
-litesvm = "0.8"
+litesvm = "0.8.2"
 solana-instruction = "3.0"
 solana-keypair = "3.0"
 solana-native-token = "3.0"
diff --git a/examples/misc/Cargo.toml b/examples/misc/Cargo.toml
@@ -18,4 +18,4 @@ solana-keypair = "3.0"
 misc-interface = { path = "interface" }
 typhoon = { path = "../../crates/lib" }
 typhoon-instruction-builder = { path = "../../crates/instruction-builder" }
-litesvm = "0.8"
+litesvm = "0.8.2"
diff --git a/examples/seeded/Cargo.toml b/examples/seeded/Cargo.toml
@@ -20,7 +20,7 @@ bytemuck = { version = "1.21.0", features = ["derive"] }
 typhoon = { path = "../../crates/lib" }
 
 [dev-dependencies]
-litesvm = "0.8"
+litesvm = "0.8.2"
 solana-instruction = "3.0"
 solana-keypair = "3.0"
 solana-native-token = "3.0"
diff --git a/examples/seeds/Cargo.toml b/examples/seeds/Cargo.toml
@@ -20,7 +20,7 @@ bytemuck = { version = "1.21.0", features = ["derive"] }
 typhoon = { path = "../../crates/lib" }
 
 [dev-dependencies]
-litesvm = "0.8"
+litesvm = "0.8.2"
 solana-instruction = "3.0"
 solana-keypair = "3.0"
 solana-native-token = "3.0"
diff --git a/examples/transfer-sol/Cargo.toml b/examples/transfer-sol/Cargo.toml
@@ -20,7 +20,7 @@ bytemuck = { version = "1.21.0", features = ["derive"] }
 typhoon = { path = "../../crates/lib" }
 
 [dev-dependencies]
-litesvm = "0.8"
+litesvm = "0.8.2"
 solana-instruction = "3.0"
 solana-keypair = "3.0"
 solana-native-token = "3.0"
diff --git a/examples/transfer-token/Cargo.toml b/examples/transfer-token/Cargo.toml
@@ -21,8 +21,8 @@ typhoon = { path = "../../crates/lib" }
 typhoon-token = { path = "../../crates/token" }
 
 [dev-dependencies]
-litesvm = "0.8"
-litesvm-token = "0.8"
+litesvm = "0.8.2"
+litesvm-token = "0.8.2"
 solana-instruction = "3.0"
 solana-keypair = "3.0"
 solana-native-token = "3.0"
diff --git a/justfile b/justfile
@@ -56,3 +56,16 @@ test example:
 # Show the example list
 list-examples:
 	@ls -d examples/*/ | xargs -n1 basename
+
+# Run an arbitrary cargo command in every example directory
+cargo-examples command='build':
+	#!/usr/bin/env bash
+	set -euo pipefail
+	for e in examples/*/; do
+	  e=${e%/}
+	  e=${e##*/}
+	  if [ -f "examples/$e/Cargo.toml" ]; then
+	    echo "[cargo {{command}}] examples/$e"
+	    (cd examples/"$e" && cargo {{command}})
+	  fi
+	done

Original file line number	Diff line number	Diff line change
`@@ -89,3 +89,12 @@ macro_rules! impl_error_logger {`
`89`	`89`	`}`
`90`	`90`	`};`
`91`	`91`	`}`
	`92`	`+`
	`93`	`+#[macro_export]`
	`94`	`+macro_rules! require {`
	`95`	`+ ( $constraint:expr, $error:expr ) => {`
	`96`	`+ if !$constraint {`
	`97`	`+ return Err($error.into());`
	`98`	`+ }`
	`99`	`+ };`
	`100`	`+}`