deps: Remove decode-error, use program-error's ToStr

interface/Cargo.toml

@@ -12,11 +12,10 @@ edition = { workspace = true }
 [dependencies]
 bytemuck = "1.23.0"
 num-derive = "0.4"
+num_enum = "0.7"
 num-traits = "0.2"
-solana-decode-error = "2.2.1"
 solana-instruction = "2.2.1"
-solana-msg = "2.2.1"
-solana-program-error = "2.2.1"
+solana-program-error = "2.2.2"
 solana-pubkey = "2.2.1"
 spl-discriminator = "0.4.0"
 spl-pod = "0.5.1"

interface/src/error.rs

@@ -1,14 +1,18 @@
 //! Interface error types
 
-use {
-    solana_decode_error::DecodeError,
-    solana_msg::msg,
-    solana_program_error::{PrintProgramError, ProgramError},
-};
+use solana_program_error::{ProgramError, ToStr};
 
 /// Errors that may be returned by the interface.
 #[repr(u32)]
-#[derive(Clone, Debug, Eq, thiserror::Error, num_derive::FromPrimitive, PartialEq)]
+#[derive(
+    Clone,
+    Debug,
+    Eq,
+    thiserror::Error,
+    num_derive::FromPrimitive,
+    num_enum::TryFromPrimitive,
+    PartialEq,
+)]
 pub enum TokenGroupError {
     /// Size is greater than proposed max size
     #[error("Size is greater than proposed max size")]
@@ -36,39 +40,23 @@ impl From<TokenGroupError> for ProgramError {
     }
 }
 
-impl<T> DecodeError<T> for TokenGroupError {
-    fn type_of() -> &'static str {
-        "TokenGroupError"
-    }
-}
-
-impl PrintProgramError for TokenGroupError {
-    fn print<E>(&self)
+impl ToStr for TokenGroupError {
+    fn to_str<E>(&self) -> &'static str
     where
-        E: 'static
-            + std::error::Error
-            + DecodeError<E>
-            + PrintProgramError
-            + num_traits::FromPrimitive,
+        E: 'static + ToStr + TryFrom<u32>,
     {
         match self {
-            TokenGroupError::SizeExceedsNewMaxSize => {
-                msg!("Size is greater than proposed max size")
-            }
-            TokenGroupError::SizeExceedsMaxSize => {
-                msg!("Size is greater than max size")
-            }
-            TokenGroupError::ImmutableGroup => {
-                msg!("Group is immutable")
-            }
+            TokenGroupError::SizeExceedsNewMaxSize => "Size is greater than proposed max size",
+            TokenGroupError::SizeExceedsMaxSize => "Size is greater than max size",
+            TokenGroupError::ImmutableGroup => "Group is immutable",
             TokenGroupError::IncorrectMintAuthority => {
-                msg!("Incorrect mint authority has signed the instruction",)
+                "Incorrect mint authority has signed the instruction"
             }
             TokenGroupError::IncorrectUpdateAuthority => {
-                msg!("Incorrect update authority has signed the instruction",)
+                "Incorrect update authority has signed the instruction"
             }
             TokenGroupError::MemberAccountIsGroupAccount => {
-                msg!("Member account should not be the same as the group account",)
+                "Member account should not be the same as the group account"
             }
         }
     }

program/Cargo.toml

@@ -14,6 +14,7 @@ no-entrypoint = []
 test-sbf = []
 
 [dependencies]
+solana-program-error = "2.2.2"
 solana-program = "2.2.1"
 spl-pod = "0.5.1"
 spl-token-2022 = { version = "9.0.0", features = ["no-entrypoint"] }

program/src/entrypoint.rs

@@ -2,10 +2,8 @@
 
 use {
     crate::processor,
-    solana_program::{
-        account_info::AccountInfo, entrypoint::ProgramResult, program_error::PrintProgramError,
-        pubkey::Pubkey,
-    },
+    solana_program::{account_info::AccountInfo, entrypoint::ProgramResult, msg, pubkey::Pubkey},
+    solana_program_error::ToStr,
     spl_token_group_interface::error::TokenGroupError,
 };
 
@@ -16,7 +14,7 @@ fn process_instruction(
     instruction_data: &[u8],
 ) -> ProgramResult {
     if let Err(error) = processor::process(program_id, accounts, instruction_data) {
-        error.print::<TokenGroupError>();
+        msg!(error.to_str::<TokenGroupError>());
         return Err(error);
     }
     Ok(())