clean up error module

This commit is contained in:
De Facto 2021-02-04 16:30:19 +08:00
parent 124e0ab7ae
commit c9fddd52f3
1 changed files with 2 additions and 48 deletions

View File

@ -14,37 +14,13 @@ use thiserror::Error;
/// Errors that may be returned by the program.
#[derive(Clone, Debug, Eq, Error, FromPrimitive, PartialEq)]
pub enum Error {
/// Invalid instruction
#[error("Invalid instruction")]
InvalidInstruction,
/// Already in use
#[error("Already in use")]
AlreadyInUse,
/// Not rent exempt
#[error("Not rent exempt")]
NotRentExempt,
/// Not found aggregator
#[error("Not found aggregator")]
NotFoundAggregator,
/// Oracle exist
#[error("Oracle exist")]
OracleExist,
/// Owner mismatch
#[error("Owner mismatch")]
OwnerMismatch,
/// Not found oracle
#[error("Not found oracle")]
NotFoundOracle,
/// Not found oracle
#[error("Submission value out of range")]
SubmissonValueOutOfRange,
/// Submit cooling
#[error("Submission cooling")]
SubmissonCooling,
/// Insufficient withdrawable
#[error("Insufficient withdrawable")]
InsufficientWithdrawable,
/// Aggregator key not match
#[error("Aggregator key not match")]
AggregatorMismatch,
@ -64,28 +40,6 @@ pub enum Error {
UnknownError,
}
// impl PrintProgramError for Error {
// fn print<E>(&self)
// where
// E: 'static + std::error::Error + DecodeError<E> + PrintProgramError + FromPrimitive,
// {
// match self {
// Error::InvalidInstruction => msg!("Error: Invalid instruction"),
// Error::AlreadyInUse => msg!("Error: Already in use"),
// Error::NotRentExempt => msg!("Error: No rent exempt"),
// Error::NotFoundAggregator => msg!("Error: no found aggregator"),
// Error::OracleExist => msg!("Error: Oracle exist"),
// Error::OwnerMismatch => msg!("Error: Owner mismatch"),
// Error::NotFoundOracle => msg!("Error: Not found oracle"),
// Error::SubmissonValueOutOfRange => msg!("Error: Submisson value out of range"),
// Error::SubmissonCooling => msg!("Submission cooling"),
// Error::InsufficientWithdrawable => msg!("Insufficient withdrawable"),
// Error::AggregatorMismatch => msg!("Aggregator key not match"),
// Error::MaxOralcesReached => msg!("Max oracles reached"),
// }
// }
// }
impl From<Error> for ProgramError {
fn from(e: Error) -> Self {
ProgramError::Custom(e as u32)