Work on voting tests

I think there's a bug in the removal of multiple hooks at the same time

Cargo.toml

@@ -117,6 +117,7 @@ dao-voting-cw20-staked = { path = "./contracts/voting/dao-voting-cw20-staked", v
 dao-voting-cw4 = { path = "./contracts/voting/dao-voting-cw4", version = "2.4.0" }
 dao-voting-cw721-roles = { path = "./contracts/voting/dao-voting-cw721-roles", version = "2.4.0" }
 dao-voting-cw721-staked = { path = "./contracts/voting/dao-voting-cw721-staked", version = "2.4.0" }
+dao-voting-incentives = { path = "./contracts/external/dao-voting-incentives", version = "2.4.0" }
 dao-voting-token-staked = { path = "./contracts/voting/dao-voting-token-staked", version = "2.4.0" }
 
 # v1 dependencies. used for state migrations.

contracts/external/dao-proposal-incentives/README.md

@@ -12,11 +12,13 @@ To instantiate the contract, provide the following parameters:
 - `owner`: The DAO sending this contract proposal hooks.
 - `proposal_incentives`: Configuration for the incentives to be awarded for successful proposals. This should be specified using the `ProposalIncentivesUnchecked` structure.
 
-## Setup
+## Configuration
 
 - This contract should be added as a `ProposalHook` to either the `dao-voting-single` or `dao-voting-multiple` proposal modules.
 - The DAO must be set as the `owner` of this contract to manage incentives and ownership.
 
+The incentives can be adjusted at any time by the owner of the contract. The rewards are determined based on the configuration at the proposal's `start_time`. This allows for dynamic adjustment of incentives to reflect the DAO's evolving priorities and resources.
+
 ## Execute
 
 - **ProposalHook(ProposalHookMsg)**: Triggered when a proposal's status changes. This is used to evaluate and potentially reward successful proposals.
@@ -27,7 +29,3 @@ To instantiate the contract, provide the following parameters:
 ## Query
 
 - **ProposalIncentives { height: Option<u64> }**: Returns the current configuration of the proposal incentives. The `height` parameter is optional and can be used to query the incentives at a specific blockchain height, providing a snapshot of the incentives at that point in time.
-
-## Configuration
-
-The incentives can be adjusted at any time by the owner of the contract. The rewards are determined based on the configuration at the proposal's `start_time`. This allows for dynamic adjustment of incentives to reflect the DAO's evolving priorities and resources.

contracts/external/dao-proposal-incentives/src/tests.rs

@@ -2,17 +2,15 @@ use std::vec;
 
 use cosmwasm_std::{
     testing::{mock_dependencies, mock_env},
-    to_json_binary, Addr, Binary, Coin, CosmosMsg, Empty, Uint128, WasmMsg,
+    to_json_binary, Addr, Binary, Coin, CosmosMsg, Uint128, WasmMsg,
 };
 
 use cw20::Cw20Coin;
 use cw_denom::{CheckedDenom, UncheckedDenom};
-use cw_multi_test::{
-    error::AnyResult, App, AppBuilder, AppResponse, Contract, ContractWrapper, Executor,
-};
+use cw_multi_test::{error::AnyResult, App, AppBuilder, AppResponse, Executor};
 use cw_ownable::Ownership;
 use dao_testing::{
-    contracts::{dao_proposal_incentives_contract, proposal_single_contract},
+    contracts::{cw20_base_contract, dao_proposal_incentives_contract, proposal_single_contract},
     helpers::instantiate_with_cw4_groups_governance,
 };
 use dao_voting::{proposal::SingleChoiceProposeMsg, threshold::Threshold};
@@ -35,15 +33,6 @@ struct Context {
     dao_proposal_incentives_code_id: u64,
 }
 
-fn cw20_base_contract() -> Box<dyn Contract<Empty>> {
-    let contract = ContractWrapper::new(
-        cw20_base::contract::execute,
-        cw20_base::contract::instantiate,
-        cw20_base::contract::query,
-    );
-    Box::new(contract)
-}
-
 fn get_context() -> Context {
     // Set up app with native balances
     let mut app = AppBuilder::default().build(|router, _, storage| {
@@ -352,28 +341,26 @@ pub fn test_hook() {
     assert!(result.is_ok());
 
     // Propose adding a hook
-    context
-        .app
-        .execute_contract(
-            Addr::unchecked(ADDR1),
-            context.proposal_single_addr.clone(),
-            &dao_proposal_single::msg::ExecuteMsg::Propose(SingleChoiceProposeMsg {
-                title: "Add proposal hook".to_string(),
-                description: "Adding a proposal hook to test the dao_proposal_incentives contract"
-                    .to_string(),
-                msgs: vec![CosmosMsg::Wasm(WasmMsg::Execute {
-                    contract_addr: context.proposal_single_addr.to_string(),
-                    msg: to_json_binary(&dao_proposal_single::msg::ExecuteMsg::AddProposalHook {
-                        address: dao_proposal_incentives_addr.to_string(),
-                    })
-                    .unwrap(),
-                    funds: vec![],
-                })],
-                proposer: None,
-            }),
-            &[],
-        )
-        .unwrap();
+    let result = context.app.execute_contract(
+        Addr::unchecked(ADDR1),
+        context.proposal_single_addr.clone(),
+        &dao_proposal_single::msg::ExecuteMsg::Propose(SingleChoiceProposeMsg {
+            title: "Add proposal hook".to_string(),
+            description: "Adding a proposal hook to test the dao_proposal_incentives contract"
+                .to_string(),
+            msgs: vec![CosmosMsg::Wasm(WasmMsg::Execute {
+                contract_addr: context.proposal_single_addr.to_string(),
+                msg: to_json_binary(&dao_proposal_single::msg::ExecuteMsg::AddProposalHook {
+                    address: dao_proposal_incentives_addr.to_string(),
+                })
+                .unwrap(),
+                funds: vec![],
+            })],
+            proposer: None,
+        }),
+        &[],
+    );
+    assert!(result.is_ok());
 
     // Vote and execute the proposal to add the proposal hook
     vote_yes_on_proposal(&mut context, 1u64).unwrap();

contracts/external/dao-voting-incentives/Cargo.toml

@@ -36,3 +36,6 @@ cw-multi-test = { workspace = true }
 dao-dao-core = { workspace = true, features = ["library"] }
 cw20-base = { workspace = true, features = ["library"] }
 cw-hooks = { workspace = true }
+dao-testing = { workspace = true }
+dao-hooks = { workspace = true }
+dao-proposal-single = { workspace = true, features = ["library"] }

contracts/external/dao-voting-incentives/src/contract.rs

@@ -5,6 +5,7 @@ use cosmwasm_std::{
 };
 use cw2::set_contract_version;
 use cw_ownable::get_ownership;
+use cw_utils::Expiration;
 
 use crate::error::ContractError;
 use crate::msg::{ExecuteMsg, InstantiateMsg, MigrateMsg, QueryMsg};
@@ -33,6 +34,11 @@ pub fn instantiate(
     if msg.expiration.is_expired(&env.block) {
         return Err(ContractError::AlreadyExpired {});
     }
+    if let Expiration::Never {} = msg.expiration {
+        return Err(ContractError::NotExpired {
+            expiration: Expiration::Never {},
+        });
+    }
 
     // Save voting incentives config
     CONFIG.save(
@@ -81,6 +87,7 @@ pub fn query(deps: Deps, env: Env, msg: QueryMsg) -> StdResult<Binary> {
         }
         QueryMsg::Config {} => to_json_binary(&query::config(deps)?),
         QueryMsg::Ownership {} => to_json_binary(&get_ownership(deps.storage)?),
+        QueryMsg::Votes { address } => to_json_binary(&query::votes(deps, address)?),
     }
 }
 

contracts/external/dao-voting-incentives/src/lib.rs

@@ -7,4 +7,7 @@ pub mod msg;
 pub mod query;
 pub mod state;
 
+#[cfg(test)]
+mod tests;
+
 pub use crate::error::ContractError;

contracts/external/dao-voting-incentives/src/msg.rs

@@ -42,6 +42,9 @@ pub enum QueryMsg {
     /// Returns the expected rewards for the given address
     #[returns(RewardResponse)]
     ExpectedRewards { address: String },
+    /// Returns the votes count for the given address
+    #[returns(Uint128)]
+    Votes { address: String },
 }
 
 #[cw_serde]

contracts/external/dao-voting-incentives/src/query.rs

@@ -1,8 +1,8 @@
-use cosmwasm_std::{Deps, Env, StdError, StdResult};
+use cosmwasm_std::{Deps, Env, StdError, StdResult, Uint128};
 
 use crate::{
     msg::RewardResponse,
-    state::{self, Config, CONFIG},
+    state::{self, Config, CONFIG, USER_VOTE_COUNT},
 };
 
 pub fn rewards(deps: Deps, address: String) -> StdResult<RewardResponse> {
@@ -21,3 +21,11 @@ pub fn expected_rewards(deps: Deps, env: Env, address: String) -> StdResult<Rewa
 pub fn config(deps: Deps) -> StdResult<Config> {
     CONFIG.load(deps.storage)
 }
+
+pub fn votes(deps: Deps, address: String) -> StdResult<Uint128> {
+    let address = deps.api.addr_validate(&address)?;
+
+    Ok(USER_VOTE_COUNT
+        .may_load(deps.storage, &address)?
+        .unwrap_or_default())
+}