update tests

astra/src/bounties.rs

@@ -229,7 +229,7 @@ mod tests {
             },
         });
         assert_eq!(contract.get_last_bounty_id(), id);
-        contract.act_proposal(id, Action::VoteApprove, None, None);
+        contract.act_proposal(id, Action::VoteApprove, None, Some(false));
         id
     }
 
@@ -269,7 +269,7 @@ mod tests {
             "bounty_done"
         );
 
-        contract.act_proposal(1, Action::VoteApprove, None, None);
+        contract.act_proposal(1, Action::VoteApprove, None, Some(false));
         testing_env!(
             context.build(),
             near_sdk::VMConfig::test(),

astra/src/lib.rs

@@ -477,6 +477,7 @@ mod tests {
         let mut contract = Contract::new(
             Config::test_config(),
             VersionedPolicy::Default(vec![accounts(1)]),
+            ndc_trust()
         );
 
         let id = create_proposal(&mut context, &mut contract);
@@ -502,6 +503,7 @@ mod tests {
         let mut contract = Contract::new(
             Config::test_config(),
             VersionedPolicy::Default(vec![accounts(1)]),
+            ndc_trust()
         );
 
         let id = create_proposal(&mut context, &mut contract);
@@ -596,12 +598,12 @@ mod tests {
         // Other members vote
         context.predecessor_account_id = council(2);
         testing_env!(context.clone());
-        contract.act_proposal(id, Action::VoteApprove, Some("vote on prosposal".to_string()));
+        contract.act_proposal(id, Action::VoteApprove, Some("vote on prosposal".to_string()), None);
         assert!(contract.get_proposal(id).proposal.votes.contains_key(&council(2)));
 
         context.predecessor_account_id = council(3);
         testing_env!(context.clone());
-        contract.act_proposal(id, Action::VoteReject, Some("vote on prosposal".to_string()));
+        contract.act_proposal(id, Action::VoteReject, Some("vote on prosposal".to_string()), None);
         assert!(contract.get_proposal(id).proposal.votes.contains_key(&council(3)));
 
         // Voting body vetos
@@ -612,7 +614,7 @@ mod tests {
         // no more members should be able to vote
         context.predecessor_account_id = council(4);
         testing_env!(context);
-        contract.act_proposal(id, Action::VoteApprove, Some("vote on prosposal".to_string()));
+        contract.act_proposal(id, Action::VoteApprove, Some("vote on prosposal".to_string()), None);
     }
 
 

astra/src/policy.rs

@@ -509,7 +509,6 @@ mod tests {
             "*:VoteReject".to_string(),
             "*:VoteRemove".to_string(),
             "*:Finalize".to_string(),
-            "*:Execute".to_string(),
         ]
         .into_iter()
         .collect();

astra/src/proposals.rs

@@ -541,15 +541,11 @@ impl Contract {
 
     /// Act on given proposal by id, if permissions allow.
     /// Memo is logged but not stored in the state. Can be used to leave notes or explain the action.
-<<<<<<< HEAD
     pub fn act_proposal(&mut self, id: u64, action: Action, memo: Option<String>, skip_execution: Option<bool>) {
-        let execute = !skip_execution.unwrap_or(true);
-=======
-    pub fn act_proposal(&mut self, id: u64, action: Action, memo: Option<String>) {
         if self.status == ContractStatus::Dissolved {
             panic!("Cannot perform this action, dao is dissolved!")
         }
->>>>>>> c5fac1d2368e58353dbf6ee3520886889121b9c2
+        let execute = !skip_execution.unwrap_or(true);
         let mut proposal: Proposal = self.proposals.get(&id).expect("ERR_NO_PROPOSAL").into();
         let policy = self.policy.get().unwrap().to_policy();
         // Check permissions for the given action.

astra/src/types.rs

@@ -61,7 +61,7 @@ pub enum Action {
     /// Move a proposal to the hub to shift into another DAO.
     MoveToHub,
     /// Execute proposal and update proposal status
-    Execute
+    Execute,
     /// Veto hook
     VetoProposal,
     /// Dissovle hook

astra/tests/utils/mod.rs

@@ -140,7 +140,7 @@ pub async fn vote(users: Vec<Account>, dao: &Contract, proposal_id: u64) -> anyh
     for user in users.into_iter() {
         let res = user
             .call(dao.id(), "act_proposal")
-            .args_json(json!({"id": proposal_id, "action": Action::VoteApprove}))
+            .args_json(json!({"id": proposal_id, "action": Action::VoteApprove, "skip_execution": false}))
             .max_gas()
             .transact()
             .await?;