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

automerge
This commit is contained in:
mergify[bot]
2020-05-01 01:58:15 -07:00
committed by GitHub
parent 5bc57ea004
commit 2deebe4d73
22 changed files with 116 additions and 79 deletions

View File

@@ -5004,7 +5004,7 @@ mod tests {
_ka: &[KeyedAccount],
_data: &[u8],
) -> std::result::Result<(), InstructionError> {
Err(InstructionError::CustomError(42))
Err(InstructionError::Custom(42))
}
assert!(bank.get_account(&solana_vote_program::id()).is_none());
@@ -5033,7 +5033,7 @@ mod tests {
bank.process_transaction(&transaction),
Err(TransactionError::InstructionError(
1,
InstructionError::CustomError(42)
InstructionError::Custom(42)
))
);
}
@@ -5053,7 +5053,7 @@ mod tests {
_ka: &[KeyedAccount],
_data: &[u8],
) -> std::result::Result<(), InstructionError> {
Err(InstructionError::CustomError(42))
Err(InstructionError::Custom(42))
}
let mock_account = Keypair::new();
@@ -5083,7 +5083,7 @@ mod tests {
bank.process_transaction(&transaction),
Err(TransactionError::InstructionError(
1,
InstructionError::CustomError(42)
InstructionError::Custom(42)
))
);
}
@@ -5099,7 +5099,7 @@ mod tests {
_ka: &[KeyedAccount],
_data: &[u8],
) -> std::result::Result<(), InstructionError> {
Err(InstructionError::CustomError(42))
Err(InstructionError::Custom(42))
}
// Non-native loader accounts can not be used for instruction processing