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/cli/src/cli.rs
+++ b/cli/src/cli.rs
@@ -538,7 +538,7 @@ impl CliConfig<'_> {
        if !self.signers.is_empty() {
            self.signers[0].try_pubkey()
        } else {
-            Err(SignerError::CustomError(
+            Err(SignerError::Custom(
                "Default keypair must be set if pubkey arg not provided".to_string(),
            ))
        }
@@ -2183,7 +2183,7 @@ where
        Err(err) => {
            if let ClientErrorKind::TransactionError(TransactionError::InstructionError(
                _,
-                InstructionError::CustomError(code),
+                InstructionError::Custom(code),
            )) = err.kind()
            {
                if let Some(specific_error) = E::decode_custom_error_to_enum(*code) {