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

30
runtime/src/system_instruction_processor.rs
View File

@@ -79,7 +79,7 @@ fn allocate(
// if it looks like the `to` account is already in use, bail
// (note that the id check is also enforced by message_processor)
if !account.data().is_empty() || !system_program::check_id(&account.owner()) {
if !account.data().is_empty() || !system_program::check_id(account.owner()) {
ic_msg!(
invoke_context,
"Allocate: account {:?} already in use",
@@ -115,13 +115,13 @@ fn assign(
return Ok(());
}
if !address.is_signer(&signers) {
if !address.is_signer(signers) {
ic_msg!(invoke_context, "Assign: account {:?} must sign", address);
return Err(InstructionError::MissingRequiredSignature);
}
// guard against sysvars being made
if sysvar::check_id(&owner) {
if sysvar::check_id(owner) {
ic_msg!(invoke_context, "Assign: cannot assign to sysvar, {}", owner);
return Err(SystemError::InvalidProgramId.into());
}
@@ -300,13 +300,13 @@ pub fn process_instruction(
let from = keyed_account_at_index(keyed_accounts, 0)?;
let to = keyed_account_at_index(keyed_accounts, 1)?;
let to_address = Address::create(
&to.unsigned_key(),
to.unsigned_key(),
Some((&base, &seed, &owner)),
invoke_context,
)?;
create_account(
from,
&to,
to,
&to_address,
lamports,
space,
@@ -736,11 +736,11 @@ mod tests {
let result = create_account(
&KeyedAccount::new(&from, true, &from_account),
&KeyedAccount::new(&to, false, &to_account),
&address,
address,
50,
MAX_PERMITTED_DATA_LENGTH + 1,
&system_program::id(),
&signers,
signers,
&MockInvokeContext::new(vec![]),
);
assert!(result.is_err());
@@ -753,11 +753,11 @@ mod tests {
let result = create_account(
&KeyedAccount::new(&from, true, &from_account),
&KeyedAccount::new(&to, false, &to_account),
&address,
address,
50,
MAX_PERMITTED_DATA_LENGTH,
&system_program::id(),
&signers,
signers,
&MockInvokeContext::new(vec![]),
);
assert!(result.is_ok());
@@ -790,7 +790,7 @@ mod tests {
50,
2,
&new_owner,
&signers,
signers,
&MockInvokeContext::new(vec![]),
);
assert_eq!(result, Err(SystemError::AccountAlreadyInUse.into()));
@@ -809,7 +809,7 @@ mod tests {
50,
2,
&new_owner,
&signers,
signers,
&MockInvokeContext::new(vec![]),
);
assert_eq!(result, Err(SystemError::AccountAlreadyInUse.into()));
@@ -827,7 +827,7 @@ mod tests {
50,
2,
&new_owner,
&signers,
signers,
&MockInvokeContext::new(vec![]),
);
assert_eq!(result, Err(SystemError::AccountAlreadyInUse.into()));
@@ -1141,7 +1141,7 @@ mod tests {
transfer_with_seed(
&from_keyed_account,
&from_base_keyed_account,
&from_seed,
from_seed,
&from_owner,
&to_keyed_account,
50,
@@ -1158,7 +1158,7 @@ mod tests {
let result = transfer_with_seed(
&from_keyed_account,
&from_base_keyed_account,
&from_seed,
from_seed,
&from_owner,
&to_keyed_account,
100,
@@ -1173,7 +1173,7 @@ mod tests {
assert!(transfer_with_seed(
&from_keyed_account,
&from_base_keyed_account,
&from_seed,
from_seed,
&from_owner,
&to_keyed_account,
0,