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

Fix Nightly Clippy Warnings (backport #18065) (#18070)

Browse Source 
* chore: cargo +nightly clippy --fix -Z unstable-options

(cherry picked from commit 6514096a67)

# Conflicts:
#	core/src/banking_stage.rs
#	core/src/cost_model.rs
#	core/src/cost_tracker.rs
#	core/src/execute_cost_table.rs
#	core/src/replay_stage.rs
#	core/src/tvu.rs
#	ledger-tool/src/main.rs
#	programs/bpf_loader/build.rs
#	rbpf-cli/src/main.rs
#	sdk/cargo-build-bpf/src/main.rs
#	sdk/cargo-test-bpf/src/main.rs
#	sdk/src/secp256k1_instruction.rs

* chore: cargo fmt

(cherry picked from commit 789f33e8db)

* Updates BPF program assert_instruction_count tests.

(cherry picked from commit c1e03f3410)

# Conflicts:
#	programs/bpf/tests/programs.rs

* Resolve conflicts

Co-authored-by: Alexander Meißner <AlexanderMeissner@gmx.net>
Co-authored-by: Michael Vines <mvines@gmail.com>
This commit is contained in:
mergify[bot]
2021-06-18 20:02:48 +00:00
committed by GitHub
parent c330016109
commit 0e7512a225
173 changed files with 1250 additions and 1056 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
tokens/src/commands.rs
View File

@@ -139,7 +139,7 @@ fn apply_previous_transactions(
for transaction_info in transaction_infos {
let mut amount = transaction_info.amount;
for allocation in allocations.iter_mut() {
if !has_same_recipient(&allocation, &transaction_info) {
if !has_same_recipient(allocation, transaction_info) {
continue;
}
if allocation.amount >= amount {
@@ -161,7 +161,7 @@ fn transfer<S: Signer>(
to_pubkey: &Pubkey,
) -> ClientResult<Transaction> {
let create_instruction =
system_instruction::transfer(&sender_keypair.pubkey(), &to_pubkey, lamports);
system_instruction::transfer(&sender_keypair.pubkey(), to_pubkey, lamports);
let message = Message::new(&[create_instruction], Some(&sender_keypair.pubkey()));
let (recent_blockhash, _fees) = client.get_recent_blockhash()?;
Ok(Transaction::new(
@@ -215,7 +215,7 @@ fn distribution_instructions(
}
stake_instruction::create_account(
&sender_pubkey,
&new_stake_account_address,
new_stake_account_address,
&authorized,
&lockup,
allocation.amount - unlocked_sol,
@@ -231,12 +231,12 @@ fn distribution_instructions(
&sender_stake_args.stake_account_address,
&stake_authority,
allocation.amount - unlocked_sol,
&new_stake_account_address,
new_stake_account_address,
);
// Make the recipient the new stake authority
instructions.push(stake_instruction::authorize(
&new_stake_account_address,
new_stake_account_address,
&stake_authority,
&recipient,
StakeAuthorize::Staker,
@@ -245,7 +245,7 @@ fn distribution_instructions(
// Make the recipient the new withdraw authority
instructions.push(stake_instruction::authorize(
&new_stake_account_address,
new_stake_account_address,
&withdraw_authority,
&recipient,
StakeAuthorize::Withdrawer,
@@ -260,7 +260,7 @@ fn distribution_instructions(
custodian: None,
};
instructions.push(stake_instruction::set_lockup(
&new_stake_account_address,
new_stake_account_address,
&lockup,
&stake_args.lockup_authority.unwrap(),
));
@@ -673,7 +673,7 @@ fn update_finalized_transactions(
{
statuses.extend(
client
.get_signature_statuses(&unconfirmed_signatures_chunk)?
.get_signature_statuses(unconfirmed_signatures_chunk)?
.value
.into_iter(),
);