Merge previous 'factory-pattern' work into development

Cargo.toml

@@ -5,9 +5,9 @@ members = [
 	"contracts/proposal/*",
 	"contracts/pre-propose/*",
 	"contracts/staking/*",
+	"contracts/test/*",
 	"contracts/voting/*",
 	"packages/*",
-	"test-contracts/*",
 	"ci/*",
 ]
 exclude = ["ci/configs/", "wasmvm/libwasmvm"]
@@ -72,6 +72,8 @@ syn = { version = "1.0", features = ["derive"] }
 test-context = "0.1"
 thiserror = { version = "1.0" }
 token-bindings = "0.11.0"
+vending-factory = "2.4.0"
+vending-minter = "2.4.0"
 wynd-utils = "0.4"
 
 # One commit ahead of version 0.3.0. Allows initialization with an
@@ -103,11 +105,12 @@ dao-pre-propose-single = { path = "./contracts/pre-propose/dao-pre-propose-singl
 dao-proposal-condorcet = { path = "./contracts/proposal/dao-proposal-condorcet", version = "2.2.0" }
 dao-proposal-multiple = { path = "./contracts/proposal/dao-proposal-multiple", version = "2.2.0" }
 dao-proposal-single = { path = "./contracts/proposal/dao-proposal-single", version = "2.2.0" }
-dao-proposal-sudo = { path = "./test-contracts/dao-proposal-sudo", version = "2.2.0" }
-dao-proposal-hook-counter = { path = "./test-contracts/dao-proposal-hook-counter", version = "2.2.0" }
+dao-proposal-sudo = { path = "./contracts/test/dao-proposal-sudo", version = "2.2.0" }
+dao-proposal-hook-counter = { path = "./contracts/test/dao-proposal-hook-counter", version = "2.2.0" }
+dao-test-custom-factory = { path = "./contracts/test/dao-test-custom-factory", version = "*" }
 dao-testing = { path = "./packages/dao-testing", version = "2.2.0" }
 dao-voting = { path = "./packages/dao-voting", version = "2.2.0" }
-dao-voting-cw20-balance = { path = "./test-contracts/dao-voting-cw20-balance", version = "2.2.0" }
+dao-voting-cw20-balance = { path = "./contracts/test/dao-voting-cw20-balance", version = "2.2.0" }
 dao-voting-cw20-staked = { path = "./contracts/voting/dao-voting-cw20-staked", version = "2.2.0" }
 dao-voting-cw4 = { path = "./contracts/voting/dao-voting-cw4", version = "2.2.0" }
 dao-voting-cw721-roles = { path = "./contracts/voting/dao-voting-cw721-roles", version = "*" }

ci/bootstrap-env/src/main.rs

@@ -73,6 +73,7 @@ fn main() -> Result<()> {
                 },
                 active_threshold: None,
             })?,
+            funds: vec![],
             admin: Some(Admin::CoreModule {}),
             label: "DAO DAO Voting Module".to_string(),
         },
@@ -101,12 +102,14 @@ fn main() -> Result<()> {
                         })
                         .unwrap(),
                         admin: Some(Admin::CoreModule {}),
+                        funds: vec![],
                         label: "DAO DAO Pre-Propose Module".to_string(),
                     },
                 },
                 close_proposal_on_execution_failure: false,
             })?,
             admin: Some(Admin::CoreModule {}),
+            funds: vec![],
             label: "DAO DAO Proposal Module".to_string(),
         }],
         initial_items: None,