updated kleo noop

yieldmos · Dec 27, 2023 · a0f81c4 · a0f81c4
1 parent 0400583
commit a0f81c4
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 13 deletions.
diff --git a/contracts/junodca/src/execute.rs b/contracts/junodca/src/execute.rs
@@ -7,7 +7,7 @@ use outpost_utils::{
         calc_additional_tax_split, calculate_compound_amounts, is_authorized_compounder, prefs_sum_to_one, DestProjectMsgs,
         TaxSplitResult,
     },
-    juno_comp_prefs::{JunoCompPrefs, JunoDestinationProject},
+    juno_comp_prefs::{JunoCompPrefs, JunoDestinationProject, StakingDao},
     msg_gen::create_exec_msg,
 };
 use terraswap_helpers::terraswap_swap::create_terraswap_swap_msg_with_simulation;
@@ -165,9 +165,13 @@ pub fn prefs_to_msgs(
 
                     JunoDestinationProject::DaoStaking(dao) => {
                         if let StakingDao::Kleomedes = dao {
-                            return vec![DestProjectMsgs::default().append_events(vec![Event::new("dao_stake")
+                            let mut noop_resp = DestProjectMsgs::default();
+
+                            noop_resp.events.push(Event::new("dao_stake")
                                 .add_attribute("dao", dao.to_string())
-                                .add_attribute("status", "disabled")])];
+                                .add_attribute("status", "disabled"));
+
+                            return Ok(noop_resp);
                         }
 
                         let dao_addresses = dao.get_daos_addresses(&project_addrs.destination_projects.daos);

diff --git a/contracts/junostake/src/execute.rs b/contracts/junostake/src/execute.rs
@@ -156,9 +156,13 @@ pub fn prefs_to_msgs(
 
                     JunoDestinationProject::DaoStaking(dao) => {
                         if let StakingDao::Kleomedes = dao {
-                            return vec![DestProjectMsgs::default().append_events(vec![Event::new("dao_stake")
+                            let mut noop_resp = DestProjectMsgs::default();
+
+                            noop_resp.events.push(Event::new("dao_stake")
                                 .add_attribute("dao", dao.to_string())
-                                .add_attribute("status", "disabled")])];
+                                .add_attribute("status", "disabled"));
+
+                            return Ok(noop_resp);
                         }
 
                         let dao_addresses = dao.get_daos_addresses(&project_addrs.destination_projects.daos);

diff --git a/contracts/junowwmarket/src/execute.rs b/contracts/junowwmarket/src/execute.rs
@@ -6,7 +6,7 @@ use juno_helpers::dest_project_gen::{
 use outpost_utils::{
     comp_prefs::DestinationAction,
     helpers::{calculate_compound_amounts, is_authorized_compounder, prefs_sum_to_one, sum_coins, DestProjectMsgs, TaxSplitResult},
-    juno_comp_prefs::{JunoCompPrefs, JunoDestinationProject},
+    juno_comp_prefs::{JunoCompPrefs, JunoDestinationProject, StakingDao},
     msg_gen::create_exec_msg,
 };
 use std::iter;
@@ -164,9 +164,13 @@ pub fn prefs_to_msgs(
 
                     JunoDestinationProject::DaoStaking(dao) => {
                         if let StakingDao::Kleomedes = dao {
-                            return vec![DestProjectMsgs::default().append_events(vec![Event::new("dao_stake")
+                            let mut noop_resp = DestProjectMsgs::default();
+
+                            noop_resp.events.push(Event::new("dao_stake")
                                 .add_attribute("dao", dao.to_string())
-                                .add_attribute("status", "disabled")])];
+                                .add_attribute("status", "disabled"));
+
+                            return Ok(noop_resp);
                         }
 
 

diff --git a/contracts/wyndstake/src/execute.rs b/contracts/wyndstake/src/execute.rs
@@ -4,7 +4,7 @@ use cosmwasm_std::{Addr, Attribute, Coin, Decimal, Deps, DepsMut, Env, Event, Me
 use outpost_utils::{
     comp_prefs::DestinationAction,
     helpers::{calculate_compound_amounts, is_authorized_compounder, prefs_sum_to_one, DestProjectMsgs, RewardSplit},
-    juno_comp_prefs::{JunoCompPrefs, JunoDestinationProject},
+    juno_comp_prefs::{JunoCompPrefs, JunoDestinationProject, StakingDao},
     msg_gen::create_exec_msg,
 };
 use terraswap_helpers::terraswap_swap::create_terraswap_swap_msg_with_simulation;
@@ -172,13 +172,16 @@ pub fn prefs_to_msgs(
                 },
 
                     JunoDestinationProject::DaoStaking(dao) => {
-
                         if let StakingDao::Kleomedes = dao {
-                            return vec![DestProjectMsgs::default().append_events(vec![Event::new("dao_stake")
+                            let mut noop_resp = DestProjectMsgs::default();
+
+                            noop_resp.events.push(Event::new("dao_stake")
                                 .add_attribute("dao", dao.to_string())
-                                .add_attribute("status", "disabled")])];
-                        }
+                                .add_attribute("status", "disabled"));
 
+                            return Ok(noop_resp);
+                        }
+
                         let dao_addresses = dao.get_daos_addresses(&project_addrs.destination_projects.daos);
 
                         let (swap_msgs, expected_dao_token_amount) =