From 4db7f970b226dffa5268b6b0a3c787f39b495555 Mon Sep 17 00:00:00 2001 From: Hardhat Chad Date: Fri, 27 Sep 2024 01:26:26 +0000 Subject: [PATCH] cleanup --- Cargo.lock | 2 +- program/src/claim.rs | 8 ++++---- program/src/mine.rs | 6 +++--- program/src/upgrade.rs | 8 ++++---- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 19d48f8..06734de 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2211,7 +2211,7 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] name = "steel" -version = "1.0.0" +version = "1.1.0" dependencies = [ "bytemuck", "num_enum", diff --git a/program/src/claim.rs b/program/src/claim.rs index 6e594fb..8668190 100644 --- a/program/src/claim.rs +++ b/program/src/claim.rs @@ -11,19 +11,19 @@ pub fn process_claim(accounts: &[AccountInfo<'_>], data: &[u8]) -> ProgramResult let amount = u64::from_le_bytes(args.amount); // Load accounts. - let [signer, beneficiary_info, proof_info, treasury_info, treasury_tokens_info, token_program] = + let [signer_info, beneficiary_info, proof_info, treasury_info, treasury_tokens_info, token_program] = accounts else { return Err(ProgramError::NotEnoughAccountKeys); }; - signer.is_signer()?; + signer_info.is_signer()?; beneficiary_info .is_writable()? .to_token_account()? - .check(|t| t.mint.eq(&MINT_ADDRESS))?; + .check(|t| t.mint == MINT_ADDRESS)?; let proof = proof_info .to_account_mut::(&ore_api::ID)? - .check_mut(|p| p.authority == *signer.key)?; + .check_mut(|p| p.authority == *signer_info.key)?; treasury_info.is_treasury()?; treasury_tokens_info.is_writable()?.is_treasury_tokens()?; token_program.is_program(&spl_token::ID)?; diff --git a/program/src/mine.rs b/program/src/mine.rs index b5af8db..1fb35e6 100644 --- a/program/src/mine.rs +++ b/program/src/mine.rs @@ -30,17 +30,17 @@ pub fn process_mine(accounts: &[AccountInfo], data: &[u8]) -> ProgramResult { let args = Mine::try_from_bytes(data)?; // Load accounts. - let [signer, bus_info, config_info, proof_info, instructions_sysvar, slot_hashes_sysvar] = + let [signer_info, bus_info, config_info, proof_info, instructions_sysvar, slot_hashes_sysvar] = accounts else { return Err(ProgramError::NotEnoughAccountKeys); }; - signer.is_signer()?; + signer_info.is_signer()?; let bus = bus_info.to_account_mut::(&ore_api::ID)?; let config = config_info.to_account::(&ore_api::ID)?; let proof = proof_info .to_account_mut::(&ore_api::ID)? - .check_mut(|p| p.authority.eq(signer.key))?; + .check_mut(|p| p.miner == *signer_info.key)?; instructions_sysvar.is_sysvar(&sysvar::instructions::ID)?; slot_hashes_sysvar.is_sysvar(&sysvar::slot_hashes::ID)?; diff --git a/program/src/upgrade.rs b/program/src/upgrade.rs index f530d2b..202eb53 100644 --- a/program/src/upgrade.rs +++ b/program/src/upgrade.rs @@ -22,8 +22,8 @@ pub fn process_upgrade(accounts: &[AccountInfo<'_>], data: &[u8]) -> ProgramResu beneficiary_info .is_writable()? .to_token_account()? - .check(|t| t.owner.eq(signer_info.key))? - .check(|t| t.mint.eq(&MINT_ADDRESS))?; + .check(|t| t.owner == *signer_info.key)? + .check(|t| t.mint == MINT_ADDRESS)?; mint_info .is_writable()? .has_address(&MINT_ADDRESS)? @@ -35,8 +35,8 @@ pub fn process_upgrade(accounts: &[AccountInfo<'_>], data: &[u8]) -> ProgramResu sender_info .is_writable()? .to_token_account()? - .check(|t| t.owner.eq(signer_info.key))? - .check(|t| t.mint.eq(&MINT_V1_ADDRESS))?; + .check(|t| t.owner == *signer_info.key)? + .check(|t| t.mint == MINT_V1_ADDRESS)?; token_program.is_program(&spl_token::ID)?; // Burn v1 tokens