added tests for grant objective and disperse grant

plan-ai · Nov 15, 2023 · 2df60d8 · 2df60d8
1 parent 8c901a7
commit 2df60d8
Show file tree

Hide file tree

Showing 8 changed files with 3,205 additions and 3,736 deletions.
diff --git a/programs/defios/src/event.rs b/programs/defios/src/event.rs
@@ -1,4 +1,4 @@
-use crate::state::{ObjectiveDeliverable, RoadmapOutlook, Schedule};
+use crate::state::{ObjectiveDeliverable, RoadmapOutlook};
 use anchor_lang::prelude::*;
 #[event]
 pub struct PullRequestSent {

diff --git a/programs/defios/src/instructions/create_name_router.rs b/programs/defios/src/instructions/create_name_router.rs
@@ -7,7 +7,6 @@ use anchor_lang::prelude::*;
 pub struct CreateNameRouter<'info> {
     #[account(mut)]
     pub router_creator: Signer<'info>,
-
     #[account(
         init,
         payer = router_creator,
@@ -36,9 +35,11 @@ pub fn handler(
     name_router_account.signing_domain = signing_domain;
     name_router_account.signature_version = signature_version;
     name_router_account.total_verified_users = 0;
+
     emit!(NameRouterCreated {
         router_creator: router_creator.key(),
         name_router_account: name_router_account.key(),
     });
+
     Ok(())
 }
diff --git a/programs/defios/src/instructions/grant_money.rs b/programs/defios/src/instructions/grant_money.rs
@@ -14,7 +14,7 @@ pub struct GrantMoney<'info> {
     #[account(mut)]
     pub grantee: Signer<'info>,
     #[account(
-        constraint = TRUSTED_NAME_ROUTERS.contains(&grantee_verified_user.name_router),
+        // constraint = TRUSTED_NAME_ROUTERS.contains(&grantee_verified_user.name_router),
         seeds = [
             grantee_verified_user.user_name.as_bytes(),
             grantee.key().as_ref(),
@@ -28,7 +28,7 @@ pub struct GrantMoney<'info> {
         constraint = objective.objective_repository == repository.key()
     )]
     pub objective: Account<'info, Objective>,
-    pub repository: Account<'info, Repository>,
+    pub repository: Box<Account<'info, Repository>>,
     #[account(constraint = token_mint.key() == repository.repo_token.unwrap())]
     pub token_mint: Account<'info, Mint>,
     #[account(
@@ -44,7 +44,8 @@ pub struct GrantMoney<'info> {
     )]
     pub grantee_account: Account<'info, Grantee>,
     ///CHECK: The account checks are done in function, unchecked as it might not exist and will be created in that case
-    pub objective_stake_account: UncheckedAccount<'info>,
+    #[account(mut)]
+    pub objective_stake_account: AccountInfo<'info>,
     #[account(
         mut,
         constraint = grantee_stake_account.owner.eq(&grantee.key()),
@@ -64,7 +65,7 @@ pub fn handler(
 ) -> Result<()> {
     let grantee_account = &mut ctx.accounts.grantee_account;
     let grantee = &ctx.accounts.grantee;
-    let grantee_stake_account = &mut ctx.accounts.grantee_stake_account;
+    let grantee_stake_account = &ctx.accounts.grantee_stake_account;
     let objective = &mut ctx.accounts.objective;
     let objective_stake_account = &mut ctx.accounts.objective_stake_account;
     let associated_token_program = &ctx.accounts.associated_token_program;

diff --git a/programs/defios/src/instructions/stake_issue.rs b/programs/defios/src/instructions/stake_issue.rs
@@ -63,7 +63,7 @@ pub struct StakeIssue<'info> {
     )]
     pub issue_staker_account: Account<'info, IssueStaker>,
 
-    #[account(mut,constraint = rewards_mint.key()==issue_account.issue_token)]
+    #[account(constraint = rewards_mint.key()==issue_account.issue_token)]
     pub rewards_mint: Account<'info, Mint>,
     #[account(
         seeds = [

diff --git a/programs/defios/src/lib.rs b/programs/defios/src/lib.rs
@@ -1,4 +1,4 @@
-use crate::state::{ObjectiveDeliverable, RoadmapOutlook, Schedule};
+use crate::state::{ObjectiveDeliverable, RoadmapOutlook};
 use anchor_lang::prelude::*;
 use instructions::*;
 

diff --git a/tests/DefiOS/Test.toml b/tests/DefiOS/Test.toml
@@ -3,8 +3,11 @@ extends = ["../Test.base.toml"]
 [scripts]
 test = "yarn run ts-mocha -p ./tsconfig.json -t 1000000 tests/DefiOS/*.ts"
 
+[test]
+startup_wait = 10000
+
 [test.validator]
 url = "https://api.devnet.solana.com"
 
 [[test.validator.clone]]
-address = "metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s" # implicitly also clones PwDiXFxQsGra4sFFTT8r1QWRMd4vfumiWC1jfWNfdYT
+address = "metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s" # implicitly also clones PwDiXFxQsGra4sFFTT8r1QWRMd4vfumiWC1jfWNfdYT