* chore: cargo +nightly clippy --fix -Z unstable-options (cherry picked from commit6514096a67
) # 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 commit789f33e8db
) * Updates BPF program assert_instruction_count tests. (cherry picked from commitc1e03f3410
) # 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:
@@ -588,7 +588,7 @@ pub mod tests {
|
||||
use super::*;
|
||||
|
||||
fn make_two_accounts(key: &Pubkey) -> (Account, AccountSharedData) {
|
||||
let mut account1 = Account::new(1, 2, &key);
|
||||
let mut account1 = Account::new(1, 2, key);
|
||||
account1.executable = true;
|
||||
account1.rent_epoch = 4;
|
||||
let mut account2 = AccountSharedData::new(1, 2, key);
|
||||
|
Reference in New Issue
Block a user