v1.1 backport custom error rename (bp #9826) (#9838)

automerge
2020-05-01 01:58:15 -07:00
parent 5bc57ea004
commit 2deebe4d73
22 changed files with 116 additions and 79 deletions
--- 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::CustomError(0))
+    Err(InstructionError::Custom(0))
 }
--- 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::CustomError(0))
+        TransactionError::InstructionError(0, InstructionError::Custom(0))
    );
 }