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

10
program-test/src/lib.rs
View File

@@ -311,7 +311,7 @@ impl solana_sdk::program_stubs::SyscallStubs for SyscallStubs {
{
let mut program_signer = false;
for seeds in signers_seeds.iter() {
let signer = Pubkey::create_program_address(&seeds, &caller).unwrap();
let signer = Pubkey::create_program_address(seeds, &caller).unwrap();
if instruction_account.pubkey == signer {
program_signer = true;
break;
@@ -324,7 +324,7 @@ impl solana_sdk::program_stubs::SyscallStubs for SyscallStubs {
}
}
invoke_context.record_instruction(&instruction);
invoke_context.record_instruction(instruction);
solana_runtime::message_processor::MessageProcessor::process_cross_program_instruction(
&message,
@@ -769,7 +769,7 @@ impl ProgramTest {
// Add commonly-used SPL programs as a convenience to the user
for (program_id, account) in programs::spl_programs(&Rent::default()).iter() {
bank.store_account(program_id, &account);
bank.store_account(program_id, account);
}
// User-supplied additional builtins
@@ -782,10 +782,10 @@ impl ProgramTest {
}
for (address, account) in self.accounts.iter() {
if bank.get_account(&address).is_some() {
if bank.get_account(address).is_some() {
info!("Overriding account at {}", address);
}
bank.store_account(&address, &account);
bank.store_account(address, account);
}
bank.set_capitalization();
if let Some(max_units) = self.bpf_compute_max_units {