Add active threshold functionality to CW4 voting module, closes #781 #819

theghostmac · 2024-04-06T20:57:56Z

Changelog

Added new custom error message to error.rs, InvalidThreshold
Added the query_is_active function and corresponding Query::IsActive
Added the execute_update_active_threshold function and corresponding ExecuteMsg::UpdateActiveThreshold
Added the new optional Config and updated the instantiate function to make use of it.

Author

GhostMac

…A0#781

JakeHartnell · 2024-04-07T12:12:04Z

Needs a few things:

Fix the build
Add tests for active_threshold and being able to update it
Make sure CI passes
Clean up

contracts/voting/dao-voting-cw4/src/contract.rs

JakeHartnell · 2024-04-07T12:15:25Z

contracts/voting/dao-voting-cw4/src/state.rs

+#[cw_serde]
+pub struct Config {
+    pub active_threshold_enabled: bool,
+    pub active_threshold: Option<ActiveThreshold>,
+}
+
+pub const CONFIG: Item<Config> = Item::new("config");


We don't really need this as if ACTIVE_THRESHOLD is not set, it's not enabled. There is no other config needed for this contract.

contracts/voting/dao-voting-cw4/src/contract.rs

theghostmac · 2024-04-07T12:43:02Z

Needs a few things:

Fix the build

Add tests for active_threshold and being able to update it

Make sure CI passes

Clean up

I have updated the contract with everything you pointed out. Build passes. Moving on to the tests.

…dule, closes DA0-DA0#781

contracts/voting/dao-voting-cw4/src/contract.rs

JakeHartnell · 2024-04-07T16:44:21Z

contracts/voting/dao-voting-cw4/src/state.rs

+#[cw_serde]
+pub struct Config {
+    pub active_threshold: Option<ActiveThreshold>,
+}
+
+pub const CONFIG: Item<Config> = Item::new("config");


This is the same info as ACTIVE_THRESHOLD. Delete Config struct.

contracts/voting/dao-voting-cw4/src/contract.rs

JakeHartnell · 2024-04-07T16:54:23Z

Needs a few things:

Fix the build

Add tests for active_threshold and being able to update it

Make sure CI passes

Clean up

I have updated the contract with everything you pointed out. Build passes. Moving on to the tests.

Close, but see above comments.

Get rid of CONFIG, it's duplicate state for no reason
Make sure to save ACTIVE_THRESHOLD on instantiation and validate that it's NOT ACTIVE_THRESHOLD::Percent
Get rid of ACTIVE_THRESHOLD::Percent in the IsActive query, it does nothing right now and we should not allow it
Fix linting errors and tests, CI should pass

…E_THRESHOLD in instantiate

contracts/voting/dao-voting-cw4/src/contract.rs

Co-authored-by: Jake Hartnell <[email protected]>

Add active threshold functionality to CW4 voting module, closes DA0-D…

56d007d

…A0#781

JakeHartnell reviewed Apr 7, 2024

View reviewed changes