fix core voter tests

Author: 0xShuk

Anchor.toml

@@ -5,7 +5,7 @@ solana_version = "1.18.18"
 seeds = false
 
 [programs.localnet]
-core-voter = "Gcore62Vw7rfgmXMG8T7B9Ye2smpE35rk12RxkuMNc6a"
+core-voter = "cNFTHBQuERFVrbmks1UzqFQPBHzquRmoLbmgpHBbczF"
 nft_voter = "GnftV5kLjd67tvHpNGyodwWveEKivz3ZWvvE3Z4xi2iw"
 gateway = "GgathUhdrCWRHowoRKACjgWhYHfxCEdBi5ViqYN6HVxk"
 quadratic = "quadCSapU8nTdLg73KHDnmdxKnJQsh7GUbu5tZfnRRr"

programs/core-voter/src/lib.rs

@@ -11,7 +11,7 @@ pub mod tools;
 
 use crate::state::*;
 
-declare_id!("Gcore62Vw7rfgmXMG8T7B9Ye2smpE35rk12RxkuMNc6a");
+declare_id!("cNFTHBQuERFVrbmks1UzqFQPBHzquRmoLbmgpHBbczF");
 
 #[program]
 pub mod core_voter {

programs/core-voter/tests/program_test/core_voter_test.rs

@@ -377,6 +377,8 @@ impl CoreVoterTest {
         registrar_cookie: &RegistrarCookie,
         voter_weight_record_cookie: &mut VoterWeightRecordCookie,
         voter_weight_action: VoterWeightAction,
+        asset_voter_cookie: &WalletCookie,
+        voter_token_owner_record_cookie: &TokenOwnerRecordCookie,
         asset_cookies: &[&AssetCookie],
     ) -> Result<(), BanksClientError> {
         let data = anchor_lang::InstructionData::data(
@@ -388,6 +390,8 @@ impl CoreVoterTest {
         let accounts = gpl_core_voter::accounts::UpdateVoterWeightRecord {
             registrar: registrar_cookie.address,
             voter_weight_record: voter_weight_record_cookie.address,
+            voter_token_owner_record: voter_token_owner_record_cookie.address,
+            voter_authority: asset_voter_cookie.address,
         };
 
         let mut account_metas = anchor_lang::ToAccountMetas::to_account_metas(&accounts, None);

programs/core-voter/tests/update_voter_weight_record.rs

@@ -26,11 +26,19 @@ async fn test_update_voter_weight_record() -> Result<(), TransportError> {
 
     let voter_cookie = core_voter_test.bench.with_wallet().await;
 
+    let voter_token_owner_record_cookie = core_voter_test
+        .governance
+        .with_token_owner_record(&realm_cookie, &voter_cookie)
+        .await?;
+
     let asset_cookie1 = core_voter_test
         .core
         .create_asset(&collection_cookie, &voter_cookie)
         .await?;
 
+    let voter_cookie = core_voter_test.bench.with_wallet().await;
+
+
     msg!("Register the collection to the registrar");
     // Register the collection to the registrar
     let _collection_config_cookie = core_voter_test
@@ -55,7 +63,9 @@ async fn test_update_voter_weight_record() -> Result<(), TransportError> {
             &registrar_cookie,
             &mut voter_weight_record_cookie,
             VoterWeightAction::CreateProposal,
-            &[&asset_cookie1],
+            &voter_cookie,
+            &voter_token_owner_record_cookie,
+            &[&asset_cookie1]
         )
         .await?;
 
@@ -117,6 +127,11 @@ async fn test_update_voter_weight_with_multiple_nfts() -> Result<(), TransportEr
         .with_voter_weight_record(&registrar_cookie, &voter_cookie)
         .await?;
 
+    let voter_token_owner_record_cookie = core_voter_test
+        .governance
+        .with_token_owner_record(&realm_cookie, &voter_cookie)
+        .await?;
+
     core_voter_test.bench.advance_clock().await;
     let clock = core_voter_test.bench.get_clock().await;
 
@@ -126,6 +141,8 @@ async fn test_update_voter_weight_with_multiple_nfts() -> Result<(), TransportEr
             &registrar_cookie,
             &mut voter_weight_record_cookie,
             VoterWeightAction::CreateProposal,
+            &voter_cookie,
+            &voter_token_owner_record_cookie,
             &[&asset_cookie1, &asset_cookie2],
         )
         .await?;
@@ -182,12 +199,19 @@ async fn test_update_voter_weight_with_cast_vote_not_allowed_error() -> Result<(
         .with_voter_weight_record(&registrar_cookie, &voter_cookie)
         .await?;
 
+    let voter_token_owner_record_cookie = core_voter_test
+        .governance
+        .with_token_owner_record(&realm_cookie, &voter_cookie)
+        .await?;
+
     // Act
     let err = core_voter_test
         .update_voter_weight_record(
             &registrar_cookie,
             &mut voter_weight_record_cookie,
             VoterWeightAction::CastVote,
+            &voter_cookie,
+            &voter_token_owner_record_cookie,
             &[&asset_cookie1],
         )
         .await
@@ -237,12 +261,19 @@ async fn test_update_voter_weight_with_invalid_owner_error() -> Result<(), Trans
         .with_voter_weight_record(&registrar_cookie, &voter_cookie)
         .await?;
 
+    let voter_token_owner_record_cookie = core_voter_test
+        .governance
+        .with_token_owner_record(&realm_cookie, &voter_cookie)
+        .await?;
+
     // Act
     let err = core_voter_test
         .update_voter_weight_record(
             &registrar_cookie,
             &mut voter_weight_record_cookie,
             VoterWeightAction::CreateGovernance,
+            &voter_cookie,
+            &voter_token_owner_record_cookie,
             &[&asset_cookie1],
         )
         .await
@@ -297,12 +328,19 @@ async fn test_update_voter_weight_with_invalid_collection_error() -> Result<(),
         .with_voter_weight_record(&registrar_cookie, &voter_cookie)
         .await?;
 
+    let voter_token_owner_record_cookie = core_voter_test
+        .governance
+        .with_token_owner_record(&realm_cookie, &voter_cookie)
+        .await?;
+
     // Act
     let err = core_voter_test
         .update_voter_weight_record(
             &registrar_cookie,
             &mut voter_weight_record_cookie,
             VoterWeightAction::CreateGovernance,
+            &voter_cookie,
+            &voter_token_owner_record_cookie,
             &[&asset_cookie1],
         )
         .await
@@ -350,12 +388,19 @@ async fn test_update_voter_weight_with_same_nft_error() -> Result<(), TransportE
         .with_voter_weight_record(&registrar_cookie, &voter_cookie)
         .await?;
 
+    let voter_token_owner_record_cookie = core_voter_test
+        .governance
+        .with_token_owner_record(&realm_cookie, &voter_cookie)
+        .await?;
+
     // Act
     let err = core_voter_test
         .update_voter_weight_record(
             &registrar_cookie,
             &mut voter_weight_record_cookie,
             VoterWeightAction::CreateProposal,
+            &voter_cookie,
+            &voter_token_owner_record_cookie,
             &[&asset_cookie, &asset_cookie],
         )
         .await