solana: Add more Cargo tests (#638)

This PR is based on #219.
This PR also adds missing Cargo tests mentioned in #320.

Author: nvsriram

solana/programs/example-native-token-transfers/tests/admin.rs

@@ -10,11 +10,8 @@ use solana_program_test::*;
 use solana_sdk::{instruction::InstructionError, signer::Signer, transaction::TransactionError};
 
 use crate::{
-    common::{
-        query::GetAccountDataAnchor,
-        setup::{setup, TestData},
-        submit::Submittable,
-    },
+    common::{query::GetAccountDataAnchor, setup::setup, submit::Submittable},
+    sdk::accounts::{good_ntt, NTTAccounts},
     sdk::instructions::admin::{
         deregister_transceiver, register_transceiver, set_threshold, DeregisterTransceiver,
         RegisterTransceiver, SetThreshold,
@@ -24,23 +21,18 @@ use crate::{
 pub mod common;
 pub mod sdk;
 
-async fn assert_threshold(
-    ctx: &mut ProgramTestContext,
-    test_data: &TestData,
-    expected_threshold: u8,
-) {
-    let config_account: Config = ctx.get_account_data_anchor(test_data.ntt.config()).await;
+async fn assert_threshold(ctx: &mut ProgramTestContext, expected_threshold: u8) {
+    let config_account: Config = ctx.get_account_data_anchor(good_ntt.config()).await;
     assert_eq!(config_account.threshold, expected_threshold);
 }
 
 async fn assert_transceiver_id(
     ctx: &mut ProgramTestContext,
-    test_data: &TestData,
     transceiver: &Pubkey,
     expected_id: u8,
 ) {
     let registered_transceiver_account: RegisteredTransceiver = ctx
-        .get_account_data_anchor(test_data.ntt.registered_transceiver(transceiver))
+        .get_account_data_anchor(good_ntt.registered_transceiver(transceiver))
         .await;
     assert_eq!(
         registered_transceiver_account.transceiver_address,
@@ -55,7 +47,7 @@ async fn test_invalid_transceiver() {
 
     // try registering system program
     let err = register_transceiver(
-        &test_data.ntt,
+        &good_ntt,
         RegisterTransceiver {
             payer: ctx.payer.pubkey(),
             owner: test_data.program_owner.pubkey(),
@@ -89,7 +81,7 @@ async fn test_reregister_all_transceivers() {
     // register dummy transceivers
     for (idx, transceiver) in dummy_transceivers.iter().enumerate() {
         register_transceiver(
-            &test_data.ntt,
+            &good_ntt,
             RegisterTransceiver {
                 payer: ctx.payer.pubkey(),
                 owner: test_data.program_owner.pubkey(),
@@ -99,12 +91,12 @@ async fn test_reregister_all_transceivers() {
         .submit_with_signers(&[&test_data.program_owner], &mut ctx)
         .await
         .unwrap();
-        assert_transceiver_id(&mut ctx, &test_data, transceiver, idx as u8 + 1).await;
+        assert_transceiver_id(&mut ctx, transceiver, idx as u8 + 1).await;
     }
 
     // set threshold = 1 (for baked-in transceiver) + num_dummy_transceivers
     set_threshold(
-        &test_data.ntt,
+        &good_ntt,
         SetThreshold {
             owner: test_data.program_owner.pubkey(),
         },
@@ -117,7 +109,7 @@ async fn test_reregister_all_transceivers() {
     // deregister dummy transceivers
     for (idx, transceiver) in dummy_transceivers.iter().enumerate() {
         deregister_transceiver(
-            &test_data.ntt,
+            &good_ntt,
             DeregisterTransceiver {
                 owner: test_data.program_owner.pubkey(),
                 transceiver: *transceiver,
@@ -126,12 +118,12 @@ async fn test_reregister_all_transceivers() {
         .submit_with_signers(&[&test_data.program_owner], &mut ctx)
         .await
         .unwrap();
-        assert_threshold(&mut ctx, &test_data, num_dummy_transceivers - idx as u8).await;
+        assert_threshold(&mut ctx, num_dummy_transceivers - idx as u8).await;
     }
 
     // deregister baked-in transceiver
     deregister_transceiver(
-        &test_data.ntt,
+        &good_ntt,
         DeregisterTransceiver {
             owner: test_data.program_owner.pubkey(),
             transceiver: example_native_token_transfers::ID,
@@ -140,12 +132,12 @@ async fn test_reregister_all_transceivers() {
     .submit_with_signers(&[&test_data.program_owner], &mut ctx)
     .await
     .unwrap();
-    assert_threshold(&mut ctx, &test_data, 1).await;
+    assert_threshold(&mut ctx, 1).await;
 
     // reregister dummy transceiver
     for (idx, transceiver) in dummy_transceivers.iter().enumerate() {
         register_transceiver(
-            &test_data.ntt,
+            &good_ntt,
             RegisterTransceiver {
                 payer: ctx.payer.pubkey(),
                 owner: test_data.program_owner.pubkey(),
@@ -155,13 +147,13 @@ async fn test_reregister_all_transceivers() {
         .submit_with_signers(&[&test_data.program_owner], &mut ctx)
         .await
         .unwrap();
-        assert_transceiver_id(&mut ctx, &test_data, transceiver, idx as u8 + 1).await;
-        assert_threshold(&mut ctx, &test_data, 1).await;
+        assert_transceiver_id(&mut ctx, transceiver, idx as u8 + 1).await;
+        assert_threshold(&mut ctx, 1).await;
     }
 
     // reregister baked-in transceiver
     register_transceiver(
-        &test_data.ntt,
+        &good_ntt,
         RegisterTransceiver {
             payer: ctx.payer.pubkey(),
             owner: test_data.program_owner.pubkey(),
@@ -171,16 +163,16 @@ async fn test_reregister_all_transceivers() {
     .submit_with_signers(&[&test_data.program_owner], &mut ctx)
     .await
     .unwrap();
-    assert_transceiver_id(&mut ctx, &test_data, &example_native_token_transfers::ID, 0).await;
-    assert_threshold(&mut ctx, &test_data, 1).await;
+    assert_transceiver_id(&mut ctx, &example_native_token_transfers::ID, 0).await;
+    assert_threshold(&mut ctx, 1).await;
 }
 
 #[tokio::test]
 async fn test_zero_threshold() {
     let (mut ctx, test_data) = setup(Mode::Locking).await;
 
     let err = set_threshold(
-        &test_data.ntt,
+        &good_ntt,
         SetThreshold {
             owner: test_data.program_owner.pubkey(),
         },
@@ -203,7 +195,7 @@ async fn test_threshold_too_high() {
     let (mut ctx, test_data) = setup(Mode::Burning).await;
 
     let err = set_threshold(
-        &test_data.ntt,
+        &good_ntt,
         SetThreshold {
             owner: test_data.program_owner.pubkey(),
         },

solana/programs/example-native-token-transfers/tests/broadcast.rs

@@ -13,6 +13,7 @@ use wormhole_anchor_sdk::wormhole::PostedVaa;
 
 use crate::common::query::GetAccountDataAnchor;
 use crate::common::setup::{setup, OTHER_TRANSCEIVER};
+use crate::sdk::accounts::{good_ntt, NTTAccounts};
 use crate::sdk::transceivers::wormhole::instructions::broadcast_id::{broadcast_id, BroadcastId};
 use crate::{
     common::submit::Submittable,
@@ -24,12 +25,12 @@ pub mod sdk;
 
 #[tokio::test]
 async fn test_broadcast_peer() {
-    let (mut ctx, test_data) = setup(Mode::Locking).await;
+    let (mut ctx, _test_data) = setup(Mode::Locking).await;
 
     let wh_message = Keypair::new();
 
     broadcast_peer(
-        &test_data.ntt,
+        &good_ntt,
         BroadcastPeer {
             payer: ctx.payer.pubkey(),
             wormhole_message: wh_message.pubkey(),
@@ -60,7 +61,7 @@ async fn test_broadcast_id() {
     let wh_message = Keypair::new();
 
     broadcast_id(
-        &test_data.ntt,
+        &good_ntt,
         BroadcastId {
             payer: ctx.payer.pubkey(),
             wormhole_message: wh_message.pubkey(),
@@ -78,7 +79,7 @@ async fn test_broadcast_id() {
     assert_eq!(
         *msg.data(),
         WormholeTransceiverInfo {
-            manager_address: test_data.ntt.program.to_bytes(),
+            manager_address: good_ntt.program().to_bytes(),
             manager_mode: Mode::Locking,
             token_address: test_data.mint.to_bytes(),
             token_decimals: 9,