gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

More clippy

Browse Source
This commit is contained in:
Michael Vines
2019-10-02 18:33:01 -07:00
parent 9fe8c98047
commit f9f5bc2eb5
21 changed files with 97 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
programs/stake_api/src/stake_instruction.rs
View File

@ -273,7 +273,7 @@ pub fn process_instruction(
trace!("keyed_accounts: {:?}", keyed_accounts);
if keyed_accounts.is_empty() {
Err(InstructionError::InvalidInstructionData)?;
return Err(InstructionError::InvalidInstructionData);
}
let (me, rest) = &mut keyed_accounts.split_at_mut(1);
@ -287,7 +287,7 @@ pub fn process_instruction(
}
StakeInstruction::DelegateStake => {
if rest.len() < 3 {
Err(InstructionError::InvalidInstructionData)?;
return Err(InstructionError::InvalidInstructionData);
}
let vote = &rest[0];
@ -300,7 +300,7 @@ pub fn process_instruction(
}
StakeInstruction::RedeemVoteCredits => {
if rest.len() != 4 {
Err(InstructionError::InvalidInstructionData)?;
return Err(InstructionError::InvalidInstructionData);
}
let (vote, rest) = rest.split_at_mut(1);
let vote = &mut vote[0];
@ -316,7 +316,7 @@ pub fn process_instruction(
}
StakeInstruction::Withdraw(lamports) => {
if rest.len() < 3 {
Err(InstructionError::InvalidInstructionData)?;
return Err(InstructionError::InvalidInstructionData);
}
let (to, rest) = &mut rest.split_at_mut(1);
let mut to = &mut to[0];
@ -331,7 +331,7 @@ pub fn process_instruction(
}
StakeInstruction::Deactivate => {
if rest.len() < 2 {
Err(InstructionError::InvalidInstructionData)?;
return Err(InstructionError::InvalidInstructionData);
}
let (vote, rest) = rest.split_at_mut(1);
let vote = &mut vote[0];

2
programs/stake_api/src/stake_state.rs
View File

@ -614,7 +614,7 @@ impl<'a> StakeAccount for KeyedAccount<'a> {
};
if lockup.slot > clock.slot && lockup.custodian != *to.unsigned_key() {
return Err(StakeError::LockupInForce)?;
return Err(StakeError::LockupInForce.into());
}
if lamports > self.account.lamports {
return Err(InstructionError::InsufficientFunds);