Added cw_orch fn_name for proposal executes

follows the same naming as `dao_proposal_sudo` execute
DA0-DA0 · Sep 10, 2024 · 85654cf · 85654cf
1 parent 685211d
commit 85654cf
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 5 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -154,4 +154,4 @@ dao-pre-propose-single-v241 = { package = "dao-pre-propose-single", version = "=
 dao-proposal-multiple-v241 = { package = "dao-proposal-multiple", version = "=2.4.1" }
 dao-proposal-single-v241 = { package = "dao-proposal-single", version = "=2.4.1" }
 dao-voting-cw4-v241 = { package = "dao-voting-cw4", version = "=2.4.1" }
-dao-voting-v241 = { package = "dao-voting", version = "=2.4.1" }
+dao-voting-v241 = { package = "dao-voting", version = "=2.4.1" }
diff --git a/contracts/proposal/dao-proposal-condorcet/src/msg.rs b/contracts/proposal/dao-proposal-condorcet/src/msg.rs
@@ -15,10 +15,20 @@ pub struct Choice {
 #[cw_serde]
 #[derive(cw_orch::ExecuteFns)]
 pub enum ExecuteMsg {
-    Propose { choices: Vec<Choice> },
-    Vote { proposal_id: u32, vote: Vec<u32> },
-    Execute { proposal_id: u32 },
-    Close { proposal_id: u32 },
+    Propose {
+        choices: Vec<Choice>,
+    },
+    Vote {
+        proposal_id: u32,
+        vote: Vec<u32>,
+    },
+    #[cw_orch(fn_name("proposal_execute"))]
+    Execute {
+        proposal_id: u32,
+    },
+    Close {
+        proposal_id: u32,
+    },
     SetConfig(UncheckedConfig),
 }
 

diff --git a/contracts/proposal/dao-proposal-multiple/src/msg.rs b/contracts/proposal/dao-proposal-multiple/src/msg.rs
@@ -66,6 +66,7 @@ pub enum ExecuteMsg {
     },
     /// Causes the messages associated with a passed proposal to be
     /// executed by the DAO.
+    #[cw_orch(fn_name("proposal_execute"))]
     Execute {
         /// The ID of the proposal to execute.
         proposal_id: u64,

diff --git a/contracts/proposal/dao-proposal-single/src/msg.rs b/contracts/proposal/dao-proposal-single/src/msg.rs
@@ -71,6 +71,7 @@ pub enum ExecuteMsg {
     },
     /// Causes the messages associated with a passed proposal to be
     /// executed by the DAO.
+    #[cw_orch(fn_name("proposal_execute"))]
     Execute {
         /// The ID of the proposal to execute.
         proposal_id: u64,