Skip to content

Commit f12f881

Browse files
committed
Apply yarn format
1 parent 4cbc765 commit f12f881

File tree

3 files changed

+102
-69
lines changed

3 files changed

+102
-69
lines changed

solana/programs/staking/src/contexts/claim_vesting.rs

+6-3
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,11 @@ impl<'info> ClaimVesting<'info> {
8080
// If vesting_balance.stake_account_metadata is not set it means that vester has not
8181
// delegated his vests
8282
if self.vesting_balance.stake_account_metadata != Pubkey::default() {
83-
if let (Some(stake_account_metadata), Some(delegate_stake_account_metadata), Some(delegate_stake_account_checkpoints)) = (
83+
if let (
84+
Some(stake_account_metadata),
85+
Some(delegate_stake_account_metadata),
86+
Some(delegate_stake_account_checkpoints),
87+
) = (
8488
&mut self.stake_account_metadata,
8589
&mut self.delegate_stake_account_metadata,
8690
&mut self.delegate_stake_account_checkpoints,
@@ -141,8 +145,7 @@ impl<'info> ClaimVesting<'info> {
141145
if loaded_checkpoints.next_index
142146
>= self.global_config.max_checkpoints_account_limit.into()
143147
{
144-
if delegate_stake_account_metadata.key() == stake_account_metadata.key()
145-
{
148+
if delegate_stake_account_metadata.key() == stake_account_metadata.key() {
146149
stake_account_metadata.stake_account_checkpoints_last_index += 1;
147150
} else {
148151
delegate_stake_account_metadata.stake_account_checkpoints_last_index += 1;

solana/programs/staking/src/contexts/transfer_vesting.rs

+29-18
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,11 @@ impl<'info> crate::contexts::TransferVesting<'info> {
105105
}
106106

107107
if self.vesting_balance.stake_account_metadata != Pubkey::default() {
108-
if let (Some(stake_account_metadata), Some(delegate_stake_account_metadata), Some(delegate_stake_account_checkpoints)) = (
108+
if let (
109+
Some(stake_account_metadata),
110+
Some(delegate_stake_account_metadata),
111+
Some(delegate_stake_account_checkpoints),
112+
) = (
109113
&mut self.stake_account_metadata,
110114
&mut self.delegate_stake_account_metadata,
111115
&mut self.delegate_stake_account_checkpoints,
@@ -137,19 +141,21 @@ impl<'info> crate::contexts::TransferVesting<'info> {
137141
VestingError::InvalidStakeAccountOwner
138142
);
139143

140-
let (expected_delegate_stake_account_checkpoints_pda, _) = Pubkey::find_program_address(
141-
&[
142-
CHECKPOINT_DATA_SEED.as_bytes(),
143-
stake_account_metadata.delegate.key().as_ref(),
144-
delegate_stake_account_metadata
145-
.stake_account_checkpoints_last_index
146-
.to_le_bytes()
147-
.as_ref(),
148-
],
149-
&crate::ID,
150-
);
144+
let (expected_delegate_stake_account_checkpoints_pda, _) =
145+
Pubkey::find_program_address(
146+
&[
147+
CHECKPOINT_DATA_SEED.as_bytes(),
148+
stake_account_metadata.delegate.key().as_ref(),
149+
delegate_stake_account_metadata
150+
.stake_account_checkpoints_last_index
151+
.to_le_bytes()
152+
.as_ref(),
153+
],
154+
&crate::ID,
155+
);
151156
require!(
152-
expected_delegate_stake_account_checkpoints_pda == delegate_stake_account_checkpoints.key(),
157+
expected_delegate_stake_account_checkpoints_pda
158+
== delegate_stake_account_checkpoints.key(),
153159
VestingError::InvalidStakeAccountCheckpointsPDA
154160
);
155161

@@ -192,8 +198,7 @@ impl<'info> crate::contexts::TransferVesting<'info> {
192198
if loaded_checkpoints.next_index
193199
>= self.global_config.max_checkpoints_account_limit.into()
194200
{
195-
if delegate_stake_account_metadata.key() == stake_account_metadata.key()
196-
{
201+
if delegate_stake_account_metadata.key() == stake_account_metadata.key() {
197202
stake_account_metadata.stake_account_checkpoints_last_index += 1;
198203
} else {
199204
delegate_stake_account_metadata.stake_account_checkpoints_last_index += 1;
@@ -205,7 +210,11 @@ impl<'info> crate::contexts::TransferVesting<'info> {
205210
}
206211

207212
if self.new_vesting_balance.stake_account_metadata != Pubkey::default() {
208-
if let (Some(new_stake_account_metadata), Some(new_delegate_stake_account_metadata), Some(new_delegate_stake_account_checkpoints)) = (
213+
if let (
214+
Some(new_stake_account_metadata),
215+
Some(new_delegate_stake_account_metadata),
216+
Some(new_delegate_stake_account_checkpoints),
217+
) = (
209218
&mut self.new_stake_account_metadata,
210219
&mut self.new_delegate_stake_account_metadata,
211220
&mut self.new_delegate_stake_account_checkpoints,
@@ -232,7 +241,8 @@ impl<'info> crate::contexts::TransferVesting<'info> {
232241

233242
// Verify that the actual new_delegate_stake_account_metadata address matches the expected one
234243
require!(
235-
new_stake_account_metadata.delegate == new_delegate_stake_account_metadata.owner,
244+
new_stake_account_metadata.delegate
245+
== new_delegate_stake_account_metadata.owner,
236246
VestingError::InvalidStakeAccountOwner
237247
);
238248

@@ -297,7 +307,8 @@ impl<'info> crate::contexts::TransferVesting<'info> {
297307
{
298308
new_stake_account_metadata.stake_account_checkpoints_last_index += 1;
299309
} else {
300-
new_delegate_stake_account_metadata.stake_account_checkpoints_last_index += 1;
310+
new_delegate_stake_account_metadata.stake_account_checkpoints_last_index +=
311+
1;
301312
}
302313
}
303314
} else {

0 commit comments

Comments
 (0)