Wrote 5 tests for active threshold functionality in the CW4 voting mo…

…dule, closes DA0-DA0#781

contracts/pre-propose/dao-pre-propose-approval-single/src/tests.rs

@@ -135,6 +135,7 @@ fn setup_default_test(
                 amount: Uint128::new(8),
             },
         ]),
+        None,
     );
     let proposal_modules: Vec<ProposalModule> = app
         .wrap()
@@ -1385,6 +1386,7 @@ fn test_instantiate_with_zero_native_deposit() {
                 amount: Uint128::new(8),
             },
         ]),
+        None,
     );
 }
 
@@ -1450,6 +1452,7 @@ fn test_instantiate_with_zero_cw20_deposit() {
                 amount: Uint128::new(8),
             },
         ]),
+        None,
     );
 }
 

contracts/pre-propose/dao-pre-propose-approver/src/tests.rs

@@ -201,6 +201,7 @@ fn setup_default_test(
                 amount: Uint128::new(8),
             },
         ]),
+        None,
     );
     let proposal_modules: Vec<ProposalModule> = app
         .wrap()
@@ -255,6 +256,7 @@ fn setup_default_test(
                 amount: Uint128::new(8),
             },
         ]),
+        None,
     );
     let proposal_modules: Vec<ProposalModule> = app
         .wrap()

contracts/pre-propose/dao-pre-propose-multiple/src/tests.rs

@@ -134,6 +134,7 @@ fn setup_default_test(
                 amount: Uint128::new(8),
             },
         ]),
+        None,
     );
     let proposal_modules: Vec<ProposalModule> = app
         .wrap()
@@ -1088,6 +1089,7 @@ fn test_instantiate_with_zero_native_deposit() {
                 amount: Uint128::new(8),
             },
         ]),
+        None,
     );
 }
 
@@ -1151,6 +1153,7 @@ fn test_instantiate_with_zero_cw20_deposit() {
                 amount: Uint128::new(8),
             },
         ]),
+        None,
     );
 }
 

contracts/pre-propose/dao-pre-propose-single/src/tests.rs

@@ -132,6 +132,7 @@ fn setup_default_test(
                 amount: Uint128::new(8),
             },
         ]),
+        None,
     );
     let proposal_modules: Vec<ProposalModule> = app
         .wrap()
@@ -1024,6 +1025,7 @@ fn test_instantiate_with_zero_native_deposit() {
                 amount: Uint128::new(8),
             },
         ]),
+        None,
     );
 }
 
@@ -1087,6 +1089,7 @@ fn test_instantiate_with_zero_cw20_deposit() {
                 amount: Uint128::new(8),
             },
         ]),
+        None,
     );
 }
 

contracts/proposal/dao-proposal-condorcet/src/testing/suite.rs

@@ -8,7 +8,7 @@ use dao_interface::{
 use dao_testing::contracts::{
     cw4_group_contract, dao_dao_contract, dao_voting_cw4_contract, proposal_condorcet_contract,
 };
-use dao_voting::threshold::PercentageThreshold;
+use dao_voting::threshold::{ActiveThreshold, PercentageThreshold};
 use dao_voting_cw4::msg::GroupContract;
 
 use crate::{
@@ -30,6 +30,7 @@ pub(crate) struct SuiteBuilder {
     pub instantiate: InstantiateMsg,
     with_proposal: Option<u32>,
     with_voters: Vec<(String, u64)>,
+    active_threshold: Option<ActiveThreshold>,
 }
 
 impl Default for SuiteBuilder {
@@ -43,6 +44,7 @@ impl Default for SuiteBuilder {
             },
             with_proposal: None,
             with_voters: vec![("sender".to_string(), 10)],
+            active_threshold: None,
         }
     }
 }
@@ -93,6 +95,7 @@ impl SuiteBuilder {
                         cw4_group_code_id: cw4_id,
                         initial_members,
                     },
+                    active_threshold: self.active_threshold.clone(),
                 })
                 .unwrap(),
                 admin: Some(Admin::CoreModule {}),

contracts/proposal/dao-proposal-multiple/src/testing/instantiate.rs

@@ -766,6 +766,7 @@ pub fn _instantiate_with_cw4_groups_governance(
     app: &mut App,
     proposal_module_instantiate: InstantiateMsg,
     initial_weights: Option<Vec<Cw20Coin>>,
+    active_threshold: Option<dao_voting::threshold::ActiveThreshold>,
 ) -> Addr {
     let proposal_module_code_id = app.store_code(proposal_multiple_contract());
     let cw4_id = app.store_code(cw4_group_contract());
@@ -813,6 +814,7 @@ pub fn _instantiate_with_cw4_groups_governance(
                     cw4_group_code_id: cw4_id,
                     initial_members: initial_weights,
                 },
+                active_threshold,
             })
             .unwrap(),
             admin: Some(Admin::CoreModule {}),

contracts/proposal/dao-proposal-single/src/testing/adversarial_tests.rs

@@ -33,7 +33,7 @@ struct CommonTest {
 fn setup_test(messages: Vec<CosmosMsg>) -> CommonTest {
     let mut app = App::default();
     let instantiate = get_default_token_dao_proposal_module_instantiate(&mut app);
-    let core_addr = instantiate_with_staked_balances_governance(&mut app, instantiate, None);
+    let core_addr = instantiate_with_staked_balances_governance(&mut app, instantiate, None, None);
     let proposal_module = query_single_proposal_module(&app, &core_addr);
     let gov_token = query_dao_token(&app, &core_addr);
 
@@ -199,6 +199,7 @@ pub fn test_executed_prop_state_remains_after_vote_swing() {
                 amount: Uint128::new(30),
             },
         ]),
+        None,
     );
     let proposal_module = query_single_proposal_module(&app, &core_addr);
     let gov_token = query_dao_token(&app, &core_addr);
@@ -298,6 +299,7 @@ pub fn test_passed_prop_state_remains_after_vote_swing() {
                 amount: Uint128::new(30),
             },
         ]),
+        None,
     );
     let proposal_module = query_single_proposal_module(&app, &core_addr);
     let gov_token = query_dao_token(&app, &core_addr);

contracts/proposal/dao-proposal-single/src/testing/do_votes.rs

@@ -94,7 +94,12 @@ fn do_test_votes<F>(
     setup_governance: F,
 ) -> (App, Addr)
 where
-    F: Fn(&mut App, InstantiateMsg, Option<Vec<Cw20Coin>>) -> Addr,
+    F: Fn(
+        &mut App,
+        InstantiateMsg,
+        Option<Vec<Cw20Coin>>,
+        Option<dao_voting::threshold::ActiveThreshold>,
+    ) -> Addr,
 {
     let mut app = App::default();
 
@@ -144,7 +149,7 @@ where
         pre_propose_info,
     };
 
-    let core_addr = setup_governance(&mut app, instantiate, Some(initial_balances));
+    let core_addr = setup_governance(&mut app, instantiate, Some(initial_balances), None);
 
     let governance_modules: Vec<ProposalModule> = app
         .wrap()

contracts/proposal/dao-proposal-single/src/testing/instantiate.rs

@@ -96,6 +96,7 @@ pub(crate) fn instantiate_with_staked_cw721_governance(
     app: &mut App,
     proposal_module_instantiate: InstantiateMsg,
     initial_balances: Option<Vec<Cw20Coin>>,
+    active_threshold: Option<ActiveThreshold>,
 ) -> Addr {
     let proposal_module_code_id = app.store_code(proposal_single_contract());
 
@@ -230,6 +231,7 @@ pub(crate) fn instantiate_with_native_staked_balances_governance(
     app: &mut App,
     proposal_module_instantiate: InstantiateMsg,
     initial_balances: Option<Vec<Cw20Coin>>,
+    active_threshold: Option<dao_voting::threshold::ActiveThreshold>,
 ) -> Addr {
     let proposal_module_code_id = app.store_code(proposal_single_contract());
 
@@ -341,6 +343,7 @@ pub(crate) fn instantiate_with_staked_balances_governance(
     app: &mut App,
     proposal_module_instantiate: InstantiateMsg,
     initial_balances: Option<Vec<Cw20Coin>>,
+    active_threshold: Option<dao_voting::threshold::ActiveThreshold>,
 ) -> Addr {
     let proposal_module_code_id = app.store_code(proposal_single_contract());
 
@@ -542,6 +545,7 @@ pub(crate) fn instantiate_with_cw4_groups_governance(
     app: &mut App,
     proposal_module_instantiate: InstantiateMsg,
     initial_weights: Option<Vec<Cw20Coin>>,
+    active_threshold: Option<ActiveThreshold>,
 ) -> Addr {
     let proposal_module_code_id = app.store_code(proposal_single_contract());
     let cw4_id = app.store_code(cw4_group_contract());
@@ -590,6 +594,7 @@ pub(crate) fn instantiate_with_cw4_groups_governance(
                     cw4_group_code_id: cw4_id,
                     initial_members: initial_weights,
                 },
+                active_threshold,
             })
             .unwrap(),
             admin: Some(Admin::CoreModule {}),