d0zingcat/ore
1
0
Fork 0
mirror of https://github.com/d0zingcat/ore.git synced 2026-05-24 15:10:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

little fix

Browse Source
This commit is contained in:
Hardhat Chad
2024-02-15 20:29:19 +00:00
parent e5e39364dc
commit c9e24ce015
7 changed files with 111 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
tests/test_mine.rs
View File

@@ -1,7 +1,6 @@
use std::str::FromStr;
use ore::{
instruction::{CreateProofArgs, MineArgs, OreInstruction},
state::{Proof, Treasury},
utils::AccountDeserialize,
BUS, PROOF, TREASURY,
@@ -9,10 +8,9 @@ use ore::{
use solana_program::{
clock::Clock,
epoch_schedule::DEFAULT_SLOTS_PER_EPOCH,
instruction::{AccountMeta, Instruction},
keccak::{hashv, Hash as KeccakHash},
pubkey::Pubkey,
system_program, sysvar,
sysvar,
};
use solana_program_test::{processor, BanksClient, ProgramTest};
use solana_sdk::{
@@ -25,21 +23,9 @@ async fn test_mine() {
// Setup
let (mut banks, payer, hash) = setup_program_test_env().await;
// Build proof ix
// Build register ix
let proof_pda = Pubkey::find_program_address(&[PROOF, payer.pubkey().as_ref()], &ore::id());
let ix_0 = Instruction {
program_id: ore::id(),
accounts: vec![
AccountMeta::new(payer.pubkey(), true),
AccountMeta::new(proof_pda.0, false),
AccountMeta::new_readonly(system_program::id(), false),
],
data: [
OreInstruction::CreateProof.to_vec(),
CreateProofArgs { bump: proof_pda.1 }.to_bytes().to_vec(),
]
.concat(),
};
let ix_0 = ore::instruction::register(payer.pubkey());
// Submit tx
let tx = Transaction::new_signed_with_payer(&[ix_0], Some(&payer.pubkey()), &[&payer], hash);
@@ -65,29 +51,7 @@ async fn test_mine() {
// Build mine ix
let bus_pda = Pubkey::find_program_address(&[BUS, &[0]], &ore::id());
let treasury_pda = Pubkey::find_program_address(&[TREASURY], &ore::id());
let ix_1 = Instruction {
program_id: ore::id(),
accounts: vec![
AccountMeta::new(payer.pubkey(), true),
AccountMeta::new(bus_pda.0, false),
AccountMeta::new(proof_pda.0, false),
AccountMeta::new_readonly(treasury_pda.0, false),
// AccountMeta::new(treasury_pda.0, false),
// AccountMeta::new(proof_pda.0, false),
AccountMeta::new_readonly(sysvar::slot_hashes::id(), false),
],
data: [
OreInstruction::Mine.to_vec(),
MineArgs {
hash: next_hash.into(),
nonce: nonce.to_le_bytes(),
}
.to_bytes()
.to_vec(),
]
.concat(),
};
let ix_1 = ore::instruction::mine(payer.pubkey(), bus_pda.0, next_hash.into(), nonce);
// Submit tx
let tx = Transaction::new_signed_with_payer(&[ix_1], Some(&payer.pubkey()), &[&payer], hash);

33
tests/test_reset.rs
View File

@@ -1,21 +1,14 @@
use std::str::FromStr;
use ore::{
instruction::OreInstruction,
state::{Bus, Treasury},
utils::AccountDeserialize,
BUS, BUS_COUNT, BUS_EPOCH_REWARDS, INITIAL_DIFFICULTY, INITIAL_REWARD_RATE, MAX_EPOCH_REWARDS,
MINT, TREASURY,
};
use solana_program::{
clock::Clock,
epoch_schedule::DEFAULT_SLOTS_PER_EPOCH,
hash::Hash,
instruction::{AccountMeta, Instruction},
program_option::COption,
program_pack::Pack,
pubkey::Pubkey,
sysvar,
clock::Clock, epoch_schedule::DEFAULT_SLOTS_PER_EPOCH, hash::Hash, program_option::COption,
program_pack::Pack, pubkey::Pubkey, sysvar,
};
use solana_program_test::{processor, BanksClient, ProgramTest};
use solana_sdk::{
@@ -45,28 +38,8 @@ async fn test_reset() {
let treasury_tokens_address =
spl_associated_token_account::get_associated_token_address(&treasury_pda.0, &mint_pda.0);
// Build ix
let ix = Instruction {
program_id: ore::ID,
accounts: vec![
AccountMeta::new(payer.pubkey(), true),
AccountMeta::new(bus_pdas[0].0, false),
AccountMeta::new(bus_pdas[1].0, false),
AccountMeta::new(bus_pdas[2].0, false),
AccountMeta::new(bus_pdas[3].0, false),
AccountMeta::new(bus_pdas[4].0, false),
AccountMeta::new(bus_pdas[5].0, false),
AccountMeta::new(bus_pdas[6].0, false),
AccountMeta::new(bus_pdas[7].0, false),
AccountMeta::new(mint_pda.0, false),
AccountMeta::new(treasury_pda.0, false),
AccountMeta::new(treasury_tokens_address, false),
AccountMeta::new_readonly(spl_token::id(), false),
],
data: [OreInstruction::Reset.to_vec()].concat(),
};
// Submit tx
let ix = ore::instruction::reset(payer.pubkey());
let tx = Transaction::new_signed_with_payer(&[ix], Some(&payer.pubkey()), &[&payer], hash);
let res = banks.process_transaction(tx).await;
assert!(res.is_ok());