diff --git a/Cargo.lock b/Cargo.lock index 157ab5e3..c099b667 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -605,9 +605,9 @@ dependencies = [ [[package]] name = "bytemuck" -version = "1.22.0" +version = "1.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6b1fc10dbac614ebc03540c9dbd60e83887fda27794998c6528f1782047d540" +checksum = "9134a6ef01ce4b366b50689c94f82c14bc72bc5d0386829828a2e2752ef7958c" dependencies = [ "bytemuck_derive", ] diff --git a/pod/src/error.rs b/pod/src/error.rs index f67f4eab..c8325f4b 100644 --- a/pod/src/error.rs +++ b/pod/src/error.rs @@ -1,6 +1,5 @@ //! Error types use { - solana_decode_error::DecodeError, solana_msg::msg, solana_program_error::{PrintProgramError, ProgramError}, }; @@ -35,11 +34,7 @@ impl solana_decode_error::DecodeError for PodSliceError { impl PrintProgramError for PodSliceError { fn print(&self) where - E: 'static - + std::error::Error - + DecodeError - + PrintProgramError - + num_traits::FromPrimitive, + E: 'static + std::error::Error + PrintProgramError + num_traits::FromPrimitive, { match self { PodSliceError::CalculationFailure => { diff --git a/program-error/derive/src/macro_impl.rs b/program-error/derive/src/macro_impl.rs index 538a174b..d29b674e 100644 --- a/program-error/derive/src/macro_impl.rs +++ b/program-error/derive/src/macro_impl.rs @@ -104,7 +104,6 @@ pub fn print_program_error( where E: 'static + std::error::Error - + #decode_error_import::DecodeError + #program_error_import::PrintProgramError + num_traits::FromPrimitive, { diff --git a/program-error/tests/bench.rs b/program-error/tests/bench.rs index 53c97661..db3c5624 100644 --- a/program-error/tests/bench.rs +++ b/program-error/tests/bench.rs @@ -28,7 +28,6 @@ impl solana_program_error::PrintProgramError for ExampleError { where E: 'static + std::error::Error - + solana_decode_error::DecodeError + solana_program_error::PrintProgramError + num_traits::FromPrimitive, { diff --git a/tlv-account-resolution/src/error.rs b/tlv-account-resolution/src/error.rs index 3e102309..c2809048 100644 --- a/tlv-account-resolution/src/error.rs +++ b/tlv-account-resolution/src/error.rs @@ -1,7 +1,6 @@ //! Error types use { - solana_decode_error::DecodeError, solana_msg::msg, solana_program_error::{PrintProgramError, ProgramError}, }; @@ -82,20 +81,10 @@ impl From for ProgramError { } } -impl DecodeError for AccountResolutionError { - fn type_of() -> &'static str { - "AccountResolutionError" - } -} - impl PrintProgramError for AccountResolutionError { fn print(&self) where - E: 'static - + std::error::Error - + DecodeError - + PrintProgramError - + num_traits::FromPrimitive, + E: 'static + std::error::Error + PrintProgramError + num_traits::FromPrimitive, { match self { AccountResolutionError::IncorrectAccount => { diff --git a/type-length-value/src/error.rs b/type-length-value/src/error.rs index 203b200c..ce12a4f4 100644 --- a/type-length-value/src/error.rs +++ b/type-length-value/src/error.rs @@ -1,6 +1,5 @@ //! Error types use { - solana_decode_error::DecodeError, solana_msg::msg, solana_program_error::{PrintProgramError, ProgramError}, }; @@ -23,20 +22,10 @@ impl From for ProgramError { } } -impl DecodeError for TlvError { - fn type_of() -> &'static str { - "TlvError" - } -} - impl PrintProgramError for TlvError { fn print(&self) where - E: 'static - + std::error::Error - + DecodeError - + PrintProgramError - + num_traits::FromPrimitive, + E: 'static + std::error::Error + PrintProgramError + num_traits::FromPrimitive, { match self { TlvError::TypeNotFound => {