Discriminator

This commit is contained in:
Hardhat Chad
2024-02-15 18:00:30 +00:00
parent c2692c89d2
commit 9476fc5b21
11 changed files with 107 additions and 58 deletions

View File

@@ -93,6 +93,12 @@ async fn test_initialize() {
assert_eq!(bus.bump as u8, bus_pdas[i].1);
assert_eq!(bus.id as u8, i as u8);
assert_eq!(bus.available_rewards, 0);
println!(
"Bus {:?} {:?} {:?}",
bus_pdas[i].0,
bus_account,
bs64::encode(&bus_account.data)
);
}
// Test treasury state
@@ -105,6 +111,12 @@ async fn test_initialize() {
assert_eq!(treasury.epoch_start_at as u8, 0);
assert_eq!(treasury.reward_rate, INITIAL_REWARD_RATE);
assert_eq!(treasury.total_claimed_rewards as u8, 0);
println!(
"Treasury {:?} {:?} {:?}",
treasury_pda.0,
treasury_account,
bs64::encode(&treasury_account.data)
);
// Test mint state
let mint_account = banks.get_account(mint_pda.0).await.unwrap().unwrap();
@@ -133,13 +145,6 @@ async fn test_initialize() {
assert_eq!(treasury_tokens.delegated_amount, 0);
assert_eq!(treasury_tokens.close_authority, COption::None);
// println!(
// "Treasury {:?} {:?} {:?}",
// treasury_pda.0,
// treasury_account,
// bs64::encode(&treasury_account.data)
// );
// assert!(false);
}

View File

@@ -74,7 +74,6 @@ async fn test_mine() {
AccountMeta::new_readonly(treasury_pda.0, false),
// AccountMeta::new(treasury_pda.0, false),
// AccountMeta::new(proof_pda.0, false),
// AccountMeta::new(bus_pda.0, false),
AccountMeta::new_readonly(sysvar::slot_hashes::id(), false),
],
data: [
@@ -126,49 +125,49 @@ async fn setup_program_test_env() -> (BanksClient, Keypair, solana_program::hash
Pubkey::from_str("2uwqyH2gKqstgAFCSniirx73X4iQek5ETc2vVJKUiNMg").unwrap(),
1002240,
ore::id(),
"/wAAAAAAAACAsuYOAAAAAA==",
"ZAAAAAAAAAD/AAAAAAAAAICy5g4AAAAA",
);
program_test.add_account_with_base64_data(
Pubkey::from_str("FRMC6jVczm1cRaEs5EhDsfw7X8vsmSDpf3bJWVkawngu").unwrap(),
1002240,
ore::id(),
"/gAAAAEAAACAsuYOAAAAAA==",
"ZAAAAAAAAAD+AAAAAQAAAICy5g4AAAAA",
);
program_test.add_account_with_base64_data(
Pubkey::from_str("9nWyycs4GHjnLujPR2sbA1A8K8CkiLc5VzxWUD4hg2uM").unwrap(),
1002240,
ore::id(),
"/wAAAAIAAACAsuYOAAAAAA==",
"ZAAAAAAAAAD/AAAAAgAAAICy5g4AAAAA",
);
program_test.add_account_with_base64_data(
Pubkey::from_str("Kt7kqD3MyvxLbj4ek9urXUxkDoxaMuQn82K2VdYD1jM").unwrap(),
1002240,
ore::id(),
"+gAAAAMAAACAsuYOAAAAAA==",
"ZAAAAAAAAAD6AAAAAwAAAICy5g4AAAAA",
);
program_test.add_account_with_base64_data(
Pubkey::from_str("8r9mXYnFQXhwrNfvatGUTxbbNSqxScuCwp4sBTSxDVTJ").unwrap(),
1002240,
ore::id(),
"/QAAAAQAAACAsuYOAAAAAA==",
"ZAAAAAAAAAD9AAAABAAAAICy5g4AAAAA",
);
program_test.add_account_with_base64_data(
Pubkey::from_str("D9cEH32k8p9uWc4w5RrStK9rWssU8NuX1Dg5YaUim4wL").unwrap(),
1002240,
ore::id(),
"/wAAAAUAAACAsuYOAAAAAA==",
"ZAAAAAAAAAD/AAAABQAAAICy5g4AAAAA",
);
program_test.add_account_with_base64_data(
Pubkey::from_str("H1RKMYADPzd4C1j1RZu51NvRSVktoTYEJyeVy98Kmdyu").unwrap(),
1002240,
ore::id(),
"/wAAAAYAAACAsuYOAAAAAA==",
"ZAAAAAAAAAD/AAAABgAAAICy5g4AAAAA",
);
program_test.add_account_with_base64_data(
Pubkey::from_str("3XbdZNbBjjp8qnDJjv1RxaKisyfx6ahznYkSigs6dayy").unwrap(),
1002240,
ore::id(),
"+QAAAAcAAACAsuYOAAAAAA==",
"ZAAAAAAAAAD5AAAABwAAAICy5g4AAAAA",
);
// Treasury (difficulty = MAX)
@@ -176,8 +175,7 @@ async fn setup_program_test_env() -> (BanksClient, Keypair, solana_program::hash
Pubkey::from_str("67PLJej6iZm915WbEu6NLeZtRZtnHc5nSVQvkHRZyPiC").unwrap(),
1559040,
ore::id(),
"/wAAAAAAAADHPztpT4Jpqy1n9x6y1psKOUdDt07/OgR6noRFAOuOcP//////////////////////////////////////////ZAAAAAAAAAD0AQAAAAAAAAAAAAAAAAAA"
// "/wAAAAAAAACO+OozfX3xTr9I8U/aRel4qp0ixaw9/PjyseBa6CcLyv//////////////////////////////////////////AAAAAAAAAADoAwAAAAAAAAAAAAAAAAAA"
"ZgAAAAAAAAD/AAAAAAAAAI9MXkItHZzhz/U8d4MsXPzDSQZSRgZsJnNpvgvcborr//////////////////////////////////////////9kAAAAAAAAAPQBAAAAAAAAAAAAAAAAAAA=",
);
// Mint

View File

@@ -93,7 +93,7 @@ async fn test_reset() {
assert_eq!(treasury.bump as u8, treasury_pda.1);
assert_eq!(
treasury.admin,
Pubkey::from_str("EQn4AkZ9UvLcwRgyx1B8Y9sRM3KjfKyti8mjUJW1kL6B").unwrap()
Pubkey::from_str("AeNqnoLwFanMd3ig9WoMxQZVwQHtCtqKMMBsT1sTrvz6").unwrap()
);
assert_eq!(treasury.difficulty, INITIAL_DIFFICULTY.into());
assert_eq!(treasury.epoch_start_at as u8, 100);
@@ -115,12 +115,12 @@ async fn test_reset() {
assert_eq!(mint.decimals, ore::TOKEN_DECIMALS);
assert_eq!(mint.is_initialized, true);
assert_eq!(mint.freeze_authority, COption::None);
println!(
"Mint {:?} {:?} {:?}",
mint_pda.0,
mint_account,
bs64::encode(&mint_account.data)
);
// println!(
// "Mint {:?} {:?} {:?}",
// mint_pda.0,
// mint_account,
// bs64::encode(&mint_account.data)
// );
// Test treasury token state
let treasury_tokens_account = banks
@@ -138,12 +138,12 @@ async fn test_reset() {
assert_eq!(treasury_tokens.is_native, COption::None);
assert_eq!(treasury_tokens.delegated_amount, 0);
assert_eq!(treasury_tokens.close_authority, COption::None);
println!(
"Treasury tokens {:?} {:?} {:?}",
treasury_tokens_address,
treasury_tokens_account,
bs64::encode(&treasury_tokens_account.data)
);
// println!(
// "Treasury tokens {:?} {:?} {:?}",
// treasury_tokens_address,
// treasury_tokens_account,
// bs64::encode(&treasury_tokens_account.data)
// );
// assert!(false);
}
@@ -157,49 +157,49 @@ async fn setup_program_test_env() -> (BanksClient, Keypair, Hash) {
Pubkey::from_str("2uwqyH2gKqstgAFCSniirx73X4iQek5ETc2vVJKUiNMg").unwrap(),
1002240,
ore::id(),
"/wAAAAAAAAAAAAAAAAAAAA==",
"ZAAAAAAAAAD/AAAAAAAAAAAAAAAAAAAA",
);
program_test.add_account_with_base64_data(
Pubkey::from_str("FRMC6jVczm1cRaEs5EhDsfw7X8vsmSDpf3bJWVkawngu").unwrap(),
1002240,
ore::id(),
"/gAAAAEAAAAAAAAAAAAAAA==",
"ZAAAAAAAAAD+AAAAAQAAAAAAAAAAAAAA",
);
program_test.add_account_with_base64_data(
Pubkey::from_str("9nWyycs4GHjnLujPR2sbA1A8K8CkiLc5VzxWUD4hg2uM").unwrap(),
1002240,
ore::id(),
"/wAAAAIAAAAAAAAAAAAAAA==",
"ZAAAAAAAAAD/AAAAAgAAAAAAAAAAAAAA",
);
program_test.add_account_with_base64_data(
Pubkey::from_str("Kt7kqD3MyvxLbj4ek9urXUxkDoxaMuQn82K2VdYD1jM").unwrap(),
1002240,
ore::id(),
"+gAAAAMAAAAAAAAAAAAAAA==",
"ZAAAAAAAAAD6AAAAAwAAAAAAAAAAAAAA",
);
program_test.add_account_with_base64_data(
Pubkey::from_str("8r9mXYnFQXhwrNfvatGUTxbbNSqxScuCwp4sBTSxDVTJ").unwrap(),
1002240,
ore::id(),
"/QAAAAQAAAAAAAAAAAAAAA==",
"ZAAAAAAAAAD9AAAABAAAAAAAAAAAAAAA",
);
program_test.add_account_with_base64_data(
Pubkey::from_str("D9cEH32k8p9uWc4w5RrStK9rWssU8NuX1Dg5YaUim4wL").unwrap(),
1002240,
ore::id(),
"/wAAAAUAAAAAAAAAAAAAAA==",
"ZAAAAAAAAAD/AAAABQAAAAAAAAAAAAAA",
);
program_test.add_account_with_base64_data(
Pubkey::from_str("H1RKMYADPzd4C1j1RZu51NvRSVktoTYEJyeVy98Kmdyu").unwrap(),
1002240,
ore::id(),
"/wAAAAYAAAAAAAAAAAAAAA==",
"ZAAAAAAAAAD/AAAABgAAAAAAAAAAAAAA",
);
program_test.add_account_with_base64_data(
Pubkey::from_str("3XbdZNbBjjp8qnDJjv1RxaKisyfx6ahznYkSigs6dayy").unwrap(),
1002240,
ore::id(),
"+QAAAAcAAAAAAAAAAAAAAA==",
"ZAAAAAAAAAD5AAAABwAAAAAAAAAAAAAA",
);
// Treasury
@@ -207,7 +207,7 @@ async fn setup_program_test_env() -> (BanksClient, Keypair, Hash) {
Pubkey::from_str("67PLJej6iZm915WbEu6NLeZtRZtnHc5nSVQvkHRZyPiC").unwrap(),
1559040,
ore::id(),
"/wAAAAAAAADHPztpT4Jpqy1n9x6y1psKOUdDt07/OgR6noRFAOuOcAAA////////////////////////////////////////AAAAAAAAAADoAwAAAAAAAAAAAAAAAAAA",
"ZgAAAAAAAAD/AAAAAAAAAI9MXkItHZzhz/U8d4MsXPzDSQZSRgZsJnNpvgvcborrAAD///////////////////////////////////////8AAAAAAAAAAOgDAAAAAAAAAAAAAAAAAAA=",
);
// Mint