remove solana-decode-error (#104)

kevinheavey · web-flow · commit c7c8c604991b · 2025-06-24T12:24:09.000+02:00
* remove DecodeError

* fmt toml
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -16,7 +16,6 @@ members = [
     "commitment-config",
     "compute-budget-interface",
     "cpi",
-    "decode-error",
     "define-syscall",
     "derivation-path",
     "ed25519-program",
@@ -221,7 +220,6 @@ solana-cluster-type = { path = "cluster-type", version = "2.2.1" }
 solana-commitment-config = { path = "commitment-config", version = "2.2.1" }
 solana-compute-budget-interface = { path = "compute-budget-interface", version = "2.2.1" }
 solana-cpi = { path = "cpi", version = "2.2.1" }
-solana-decode-error = { path = "decode-error", version = "2.2.1" }
 solana-define-syscall = { path = "define-syscall", version = "2.2.1" }
 solana-derivation-path = { path = "derivation-path", version = "2.2.1" }
 solana-ed25519-program = { path = "ed25519-program", version = "2.2.1" }
@@ -354,7 +352,6 @@ opt-level = 1
 solana-account = { path = "account" }
 solana-clock = { path = "clock" }
 solana-cpi = { path = "cpi" }
-solana-decode-error = { path = "decode-error" }
 solana-frozen-abi = { path = "frozen-abi" }
 solana-frozen-abi-macro = { path = "frozen-abi-macro" }
 solana-instruction = { path = "instruction" }
diff --git a/decode-error/Cargo.toml b/decode-error/Cargo.toml
diff --git a/decode-error/src/lib.rs b/decode-error/src/lib.rs
diff --git a/precompile-error/Cargo.toml b/precompile-error/Cargo.toml
@@ -14,4 +14,3 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 num-traits = { workspace = true }
-solana-decode-error = { workspace = true }
diff --git a/precompile-error/src/lib.rs b/precompile-error/src/lib.rs
@@ -68,10 +68,3 @@ impl fmt::Display for PrecompileError {
         }
     }
 }
-
-#[allow(deprecated)]
-impl<T> solana_decode_error::DecodeError<T> for PrecompileError {
-    fn type_of() -> &'static str {
-        "PrecompileError"
-    }
-}
diff --git a/program-error/Cargo.toml b/program-error/Cargo.toml
@@ -23,7 +23,6 @@ borsh = { workspace = true, optional = true }
 num-traits = { workspace = true }
 serde = { workspace = true, optional = true }
 serde_derive = { workspace = true, optional = true }
-solana-decode-error = { workspace = true }
 solana-instruction = { workspace = true, default-features = false, features = [
     "std",
 ] }
diff --git a/program-error/src/lib.rs b/program-error/src/lib.rs
@@ -129,26 +129,18 @@ impl fmt::Display for ProgramError {
 pub trait PrintProgramError {
     fn print<E>(&self)
     where
-        E: 'static
-            + std::error::Error
-            + solana_decode_error::DecodeError<E>
-            + PrintProgramError
-            + FromPrimitive;
+        E: 'static + std::error::Error + PrintProgramError + FromPrimitive;
 }
 
 #[allow(deprecated)]
 impl PrintProgramError for ProgramError {
     fn print<E>(&self)
     where
-        E: 'static
-            + std::error::Error
-            + solana_decode_error::DecodeError<E>
-            + PrintProgramError
-            + FromPrimitive,
+        E: 'static + std::error::Error + PrintProgramError + FromPrimitive,
     {
         match self {
             Self::Custom(error) => {
-                if let Some(custom_error) = E::decode_custom_error_to_enum(*error) {
+                if let Some(custom_error) = E::from_u32(*error) {
                     custom_error.print::<E>();
                 } else {
                     msg!("Error: Unknown");
diff --git a/program/Cargo.toml b/program/Cargo.toml
@@ -66,7 +66,6 @@ solana-blake3-hasher = { workspace = true, features = ["blake3"] }
 solana-borsh = { workspace = true, optional = true }
 solana-clock = { workspace = true, features = ["serde", "sysvar"] }
 solana-cpi = { workspace = true }
-solana-decode-error = { workspace = true }
 solana-epoch-rewards = { workspace = true, features = ["serde", "sysvar"] }
 solana-epoch-schedule = { workspace = true, features = ["serde", "sysvar"] }
 solana-fee-calculator = { workspace = true, features = ["serde"] }
diff --git a/pubkey/Cargo.toml b/pubkey/Cargo.toml
@@ -39,7 +39,6 @@ rand = { workspace = true, optional = true }
 serde = { workspace = true, optional = true }
 serde_derive = { workspace = true, optional = true }
 solana-atomic-u64 = { workspace = true }
-solana-decode-error = { workspace = true }
 solana-frozen-abi = { workspace = true, optional = true, features = [
     "frozen-abi",
 ] }
diff --git a/pubkey/src/lib.rs b/pubkey/src/lib.rs
@@ -119,12 +119,6 @@ impl fmt::Display for PubkeyError {
     }
 }
 
-#[allow(deprecated)]
-impl<T> solana_decode_error::DecodeError<T> for PubkeyError {
-    fn type_of() -> &'static str {
-        "PubkeyError"
-    }
-}
 impl From<u64> for PubkeyError {
     fn from(error: u64) -> Self {
         match error {
@@ -381,13 +375,6 @@ impl From<Infallible> for ParsePubkeyError {
     }
 }
 
-#[allow(deprecated)]
-impl<T> solana_decode_error::DecodeError<T> for ParsePubkeyError {
-    fn type_of() -> &'static str {
-        "ParsePubkeyError"
-    }
-}
-
 impl FromStr for Pubkey {
     type Err = ParsePubkeyError;
 
diff --git a/scripts/patch-crates-functions.sh b/scripts/patch-crates-functions.sh
@@ -22,7 +22,6 @@ crate_dirs=(
   commitment-config
   compute-budget-interface
   cpi
-  decode-error
   define-syscall
   derivation-path
   ed25519-program
diff --git a/vote-interface/Cargo.toml b/vote-interface/Cargo.toml
@@ -51,7 +51,6 @@ num-traits = { workspace = true }
 serde = { workspace = true, optional = true }
 serde_derive = { workspace = true, optional = true }
 solana-clock = { workspace = true }
-solana-decode-error = { workspace = true }
 solana-frozen-abi = { workspace = true, features = [
     "frozen-abi",
 ], optional = true }
diff --git a/vote-interface/src/error.rs b/vote-interface/src/error.rs
@@ -71,42 +71,3 @@ impl fmt::Display for VoteError {
         })
     }
 }
-
-#[allow(deprecated)]
-impl<E> solana_decode_error::DecodeError<E> for VoteError {
-    fn type_of() -> &'static str {
-        "VoteError"
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use {super::*, solana_instruction::error::InstructionError};
-
-    #[test]
-    fn test_custom_error_decode() {
-        use num_traits::FromPrimitive;
-        #[allow(deprecated)]
-        fn pretty_err<T>(err: InstructionError) -> String
-        where
-            T: 'static + std::error::Error + solana_decode_error::DecodeError<T> + FromPrimitive,
-        {
-            if let InstructionError::Custom(code) = err {
-                let specific_error: T = T::decode_custom_error_to_enum(code).unwrap();
-                format!(
-                    "{:?}: {}::{:?} - {}",
-                    err,
-                    T::type_of(),
-                    specific_error,
-                    specific_error,
-                )
-            } else {
-                "".to_string()
-            }
-        }
-        assert_eq!(
-            "Custom(0): VoteError::VoteTooOld - vote already recorded or not in slot hashes history",
-            pretty_err::<VoteError>(VoteError::VoteTooOld.into())
-        )
-    }
-}

Original file line number	Diff line number	Diff line change
`@@ -14,4 +14,3 @@ targets = ["x86_64-unknown-linux-gnu"]`
`14`	`14`
`15`	`15`	`[dependencies]`
`16`	`16`	`num-traits = { workspace = true }`
`17`		`-solana-decode-error = { workspace = true }`
Original file line number	Diff line number	Diff line change
`@@ -68,10 +68,3 @@ impl fmt::Display for PrecompileError {`
`68`	`68`	`}`
`69`	`69`	`}`
`70`	`70`	`}`
`71`		`-`
`72`		`-#[allow(deprecated)]`
`73`		`-impl<T> solana_decode_error::DecodeError<T> for PrecompileError {`
`74`		`- fn type_of() -> &'static str {`
`75`		`- "PrecompileError"`
`76`		`- }`
`77`		`-}`