From a46ff43960a3fddf03a5636741d7f47f2d8ff934 Mon Sep 17 00:00:00 2001
From: Noah Saso <noahsaso@gmail.com>
Date: Thu, 7 Nov 2024 19:45:52 -0500
Subject: [PATCH] remove dao-testing dependency on cw-fund-distributor and
 don't publish

---
 .../src/testing/adversarial_tests.rs                |  5 +++--
 .../cw-fund-distributor/src/testing/mod.rs          | 13 +++++++++++++
 .../cw-fund-distributor/src/testing/tests.rs        |  5 +++--
 packages/dao-testing/src/contracts/latest.rs        | 10 ----------
 scripts/publish.sh                                  |  5 -----
 5 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/contracts/distribution/cw-fund-distributor/src/testing/adversarial_tests.rs b/contracts/distribution/cw-fund-distributor/src/testing/adversarial_tests.rs
index cc0e0c865..4f3c2591e 100644
--- a/contracts/distribution/cw-fund-distributor/src/testing/adversarial_tests.rs
+++ b/contracts/distribution/cw-fund-distributor/src/testing/adversarial_tests.rs
@@ -5,10 +5,11 @@ use cw20::{BalanceResponse, Cw20Coin};
 use cw_multi_test::{next_block, App, BankSudo, Executor, SudoMsg};
 use cw_utils::Duration;
 use dao_testing::contracts::{
-    cw20_base_contract, cw20_stake_contract, cw_fund_distributor_contract,
-    dao_voting_cw20_staked_contract,
+    cw20_base_contract, cw20_stake_contract, dao_voting_cw20_staked_contract,
 };
 
+use super::cw_fund_distributor_contract;
+
 const CREATOR_ADDR: &str = "creator";
 const FEE_DENOM: &str = "ujuno";
 
diff --git a/contracts/distribution/cw-fund-distributor/src/testing/mod.rs b/contracts/distribution/cw-fund-distributor/src/testing/mod.rs
index 9f1e9f269..281075c7d 100644
--- a/contracts/distribution/cw-fund-distributor/src/testing/mod.rs
+++ b/contracts/distribution/cw-fund-distributor/src/testing/mod.rs
@@ -1,2 +1,15 @@
+use cosmwasm_std::Empty;
+use cw_multi_test::{Contract, ContractWrapper};
+
 mod adversarial_tests;
 mod tests;
+
+pub fn cw_fund_distributor_contract() -> Box<dyn Contract<Empty>> {
+    let contract = ContractWrapper::new(
+        crate::contract::execute,
+        crate::contract::instantiate,
+        crate::contract::query,
+    )
+    .with_migrate(crate::contract::migrate);
+    Box::new(contract)
+}
diff --git a/contracts/distribution/cw-fund-distributor/src/testing/tests.rs b/contracts/distribution/cw-fund-distributor/src/testing/tests.rs
index d86ca86a0..e331293f6 100644
--- a/contracts/distribution/cw-fund-distributor/src/testing/tests.rs
+++ b/contracts/distribution/cw-fund-distributor/src/testing/tests.rs
@@ -7,8 +7,7 @@ use cw20::Cw20Coin;
 use cw_fund_distributor::ContractError;
 use cw_multi_test::{next_block, App, BankSudo, Executor, SudoMsg};
 use dao_testing::contracts::{
-    cw20_base_contract, cw20_stake_contract, cw_fund_distributor_contract,
-    dao_voting_cw20_staked_contract,
+    cw20_base_contract, cw20_stake_contract, dao_voting_cw20_staked_contract,
 };
 
 use crate::msg::ExecuteMsg::{ClaimAll, ClaimCW20, ClaimNatives};
@@ -16,6 +15,8 @@ use crate::msg::QueryMsg::TotalPower;
 use cosmwasm_std::StdError::GenericErr;
 use cw_utils::Duration;
 
+use super::cw_fund_distributor_contract;
+
 const CREATOR_ADDR: &str = "creator";
 const FEE_DENOM: &str = "ujuno";
 
diff --git a/packages/dao-testing/src/contracts/latest.rs b/packages/dao-testing/src/contracts/latest.rs
index 1bbc8aefd..cc694f2c4 100644
--- a/packages/dao-testing/src/contracts/latest.rs
+++ b/packages/dao-testing/src/contracts/latest.rs
@@ -244,16 +244,6 @@ pub fn dao_test_custom_factory_contract() -> Box<dyn Contract<Empty>> {
     Box::new(contract)
 }
 
-pub fn cw_fund_distributor_contract() -> Box<dyn Contract<Empty>> {
-    let contract = ContractWrapper::new(
-        cw_fund_distributor::contract::execute,
-        cw_fund_distributor::contract::instantiate,
-        cw_fund_distributor::contract::query,
-    )
-    .with_migrate(cw_fund_distributor::contract::migrate);
-    Box::new(contract)
-}
-
 pub fn dao_rewards_distributor_contract() -> Box<dyn Contract<Empty>> {
     let contract = ContractWrapper::new(
         dao_rewards_distributor::contract::execute,
diff --git a/scripts/publish.sh b/scripts/publish.sh
index aa5e3c973..a6f18a6f2 100755
--- a/scripts/publish.sh
+++ b/scripts/publish.sh
@@ -204,11 +204,6 @@ cd contracts/external/cw-admin-factory
 cargo hack publish --no-dev-deps --allow-dirty
 cd "$START_DIR"
 
-# TODO: uncomment once cleaned up and audited
-# cd contracts/distribution/cw-fund-distributor
-# cargo hack publish --no-dev-deps --allow-dirty
-# cd "$START_DIR"
-
 cd contracts/distribution/dao-rewards-distributor
 cargo hack publish --no-dev-deps --allow-dirty
 cd "$START_DIR"