project-serum
/
anchor
mirror of https://github.com/project-serum/anchor.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Feature/error equality (#1544)

This commit is contained in:
guibescos 2022-04-20 18:12:50 -05:00 committed by GitHub
parent 269200b3b8
commit 0916361f5e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -15,6 +15,7 @@ The minor version will be incremented upon a breaking change and the patch versi
* cli: Add `--program-keypair` to `anchor deploy` ([#1786](https://github.com/project-serum/anchor/pull/1786)).
* spl: Add more derived traits to `TokenAccount` to `Mint` ([#1818](https://github.com/project-serum/anchor/pull/1818)).
* cli: Add compilation optimizations to cli template ([#1807](https://github.com/project-serum/anchor/pull/1807)).
* lang: Add `PartialEq` and `Eq` for `anchor_lang::Error` ([#1544](https://github.com/project-serum/anchor/pull/1544)).
### Fixes

19
lang/src/error.rs
View File

@ -195,7 +195,7 @@ pub enum ErrorCode {
Deprecated = 5000,
}
#[derive(Debug)]
#[derive(Debug, PartialEq, Eq)]
pub enum Error {
AnchorError(AnchorError),
ProgramError(ProgramErrorWithOrigin),
@ -302,6 +302,14 @@ pub struct ProgramErrorWithOrigin {
pub compared_values: Option<ComparedValues>,
}
// Two ProgramErrors are equal when they have the same error code
impl PartialEq for ProgramErrorWithOrigin {
fn eq(&self, other: &Self) -> bool {
self.program_error == other.program_error
}
}
impl Eq for ProgramErrorWithOrigin {}
impl Display for ProgramErrorWithOrigin {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
Display::fmt(&self.program_error, f)
@ -458,6 +466,15 @@ impl Display for AnchorError {
}
}
/// Two `AnchorError`s are equal when they have the same error code
impl PartialEq for AnchorError {
fn eq(&self, other: &Self) -> bool {
self.error_code_number == other.error_code_number
}
}
impl Eq for AnchorError {}
impl std::convert::From<Error> for anchor_lang::solana_program::program_error::ProgramError {
fn from(e: Error) -> anchor_lang::solana_program::program_error::ProgramError {
match e {