From 965361ff6919ced61e6a5dcd380803bc0cf5c356 Mon Sep 17 00:00:00 2001 From: Jack May Date: Fri, 14 Feb 2020 14:07:53 -0800 Subject: [PATCH] Remove failure's use of GenericError (#8287) automerge --- programs/failure/src/lib.rs | 2 +- programs/failure/tests/failure.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/failure/src/lib.rs b/programs/failure/src/lib.rs index a58053ad5b..23ae5f4d94 100644 --- a/programs/failure/src/lib.rs +++ b/programs/failure/src/lib.rs @@ -13,5 +13,5 @@ fn process_instruction( _keyed_accounts: &[KeyedAccount], _data: &[u8], ) -> Result<(), InstructionError> { - Err(InstructionError::GenericError) + Err(InstructionError::CustomError(0)) } diff --git a/programs/failure/tests/failure.rs b/programs/failure/tests/failure.rs index 2def1df5f4..34ebfa0542 100644 --- a/programs/failure/tests/failure.rs +++ b/programs/failure/tests/failure.rs @@ -23,6 +23,6 @@ fn test_program_native_failure() { .send_instruction(&alice_keypair, instruction) .unwrap_err() .unwrap(), - TransactionError::InstructionError(0, InstructionError::GenericError) + TransactionError::InstructionError(0, InstructionError::CustomError(0)) ); }