Move test-contracts to contracts/test

Needed for workspace optimizer as we are now using test contract binaries with tests
DA0-DA0 · Sep 15, 2023 · d936210 · d936210
1 parent 5e64f30
commit d936210
Show file tree

Hide file tree

Showing 57 changed files with 42 additions and 42 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/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"]
@@ -105,12 +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-test-custom-factory = { path = "./test-contracts/dao-test-custom-factory", version = "*" }
+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 = "*" }

diff --git a/...s/dao-proposal-hook-counter/.cargo/config → ...t/dao-proposal-hook-counter/.cargo/config b/...s/dao-proposal-hook-counter/.cargo/config → ...t/dao-proposal-hook-counter/.cargo/config
diff --git a/...acts/dao-proposal-hook-counter/.gitignore → ...test/dao-proposal-hook-counter/.gitignore b/...acts/dao-proposal-hook-counter/.gitignore → ...test/dao-proposal-hook-counter/.gitignore
diff --git a/...acts/dao-proposal-hook-counter/Cargo.toml → ...test/dao-proposal-hook-counter/Cargo.toml b/...acts/dao-proposal-hook-counter/Cargo.toml → ...test/dao-proposal-hook-counter/Cargo.toml
diff --git a/...racts/dao-proposal-hook-counter/README.md → .../test/dao-proposal-hook-counter/README.md b/...racts/dao-proposal-hook-counter/README.md → .../test/dao-proposal-hook-counter/README.md
diff --git a/...-proposal-hook-counter/examples/schema.rs → ...-proposal-hook-counter/examples/schema.rs b/...-proposal-hook-counter/examples/schema.rs → ...-proposal-hook-counter/examples/schema.rs
diff --git a/...osal-hook-counter/schema/execute_msg.json → ...osal-hook-counter/schema/execute_msg.json b/...osal-hook-counter/schema/execute_msg.json → ...osal-hook-counter/schema/execute_msg.json
diff --git a/...-hook-counter/schema/instantiate_msg.json → ...-hook-counter/schema/instantiate_msg.json b/...-hook-counter/schema/instantiate_msg.json → ...-hook-counter/schema/instantiate_msg.json
diff --git a/...oposal-hook-counter/schema/query_msg.json → ...oposal-hook-counter/schema/query_msg.json b/...oposal-hook-counter/schema/query_msg.json → ...oposal-hook-counter/schema/query_msg.json
diff --git a/...dao-proposal-hook-counter/src/contract.rs → ...dao-proposal-hook-counter/src/contract.rs b/...dao-proposal-hook-counter/src/contract.rs → ...dao-proposal-hook-counter/src/contract.rs
diff --git a/...ts/dao-proposal-hook-counter/src/error.rs → ...st/dao-proposal-hook-counter/src/error.rs b/...ts/dao-proposal-hook-counter/src/error.rs → ...st/dao-proposal-hook-counter/src/error.rs
diff --git a/...acts/dao-proposal-hook-counter/src/lib.rs → ...test/dao-proposal-hook-counter/src/lib.rs b/...acts/dao-proposal-hook-counter/src/lib.rs → ...test/dao-proposal-hook-counter/src/lib.rs
diff --git a/...acts/dao-proposal-hook-counter/src/msg.rs → ...test/dao-proposal-hook-counter/src/msg.rs b/...acts/dao-proposal-hook-counter/src/msg.rs → ...test/dao-proposal-hook-counter/src/msg.rs
diff --git a/...ts/dao-proposal-hook-counter/src/state.rs → ...st/dao-proposal-hook-counter/src/state.rs b/...ts/dao-proposal-hook-counter/src/state.rs → ...st/dao-proposal-hook-counter/src/state.rs
diff --git a/...ts/dao-proposal-hook-counter/src/tests.rs → ...st/dao-proposal-hook-counter/src/tests.rs b/...ts/dao-proposal-hook-counter/src/tests.rs → ...st/dao-proposal-hook-counter/src/tests.rs
diff --git a/...contracts/dao-proposal-sudo/.cargo/config → ...acts/test/dao-proposal-sudo/.cargo/config b/...contracts/dao-proposal-sudo/.cargo/config → ...acts/test/dao-proposal-sudo/.cargo/config
diff --git a/test-contracts/dao-proposal-sudo/.gitignore → contracts/test/dao-proposal-sudo/.gitignore b/test-contracts/dao-proposal-sudo/.gitignore → contracts/test/dao-proposal-sudo/.gitignore
diff --git a/test-contracts/dao-proposal-sudo/Cargo.toml → contracts/test/dao-proposal-sudo/Cargo.toml b/test-contracts/dao-proposal-sudo/Cargo.toml → contracts/test/dao-proposal-sudo/Cargo.toml
diff --git a/test-contracts/dao-proposal-sudo/README → contracts/test/dao-proposal-sudo/README b/test-contracts/dao-proposal-sudo/README → contracts/test/dao-proposal-sudo/README
diff --git a/...acts/dao-proposal-sudo/examples/schema.rs → ...test/dao-proposal-sudo/examples/schema.rs b/...acts/dao-proposal-sudo/examples/schema.rs → ...test/dao-proposal-sudo/examples/schema.rs
diff --git a/...-proposal-sudo/schema/admin_response.json → ...-proposal-sudo/schema/admin_response.json b/...-proposal-sudo/schema/admin_response.json → ...-proposal-sudo/schema/admin_response.json
diff --git a/...ao-proposal-sudo/schema/dao_response.json → ...ao-proposal-sudo/schema/dao_response.json b/...ao-proposal-sudo/schema/dao_response.json → ...ao-proposal-sudo/schema/dao_response.json
diff --git a/...dao-proposal-sudo/schema/execute_msg.json → ...dao-proposal-sudo/schema/execute_msg.json b/...dao-proposal-sudo/schema/execute_msg.json → ...dao-proposal-sudo/schema/execute_msg.json
diff --git a/...o-proposal-sudo/schema/info_response.json → ...o-proposal-sudo/schema/info_response.json b/...o-proposal-sudo/schema/info_response.json → ...o-proposal-sudo/schema/info_response.json
diff --git a/...proposal-sudo/schema/instantiate_msg.json → ...proposal-sudo/schema/instantiate_msg.json b/...proposal-sudo/schema/instantiate_msg.json → ...proposal-sudo/schema/instantiate_msg.json
diff --git a/...s/dao-proposal-sudo/schema/query_msg.json → ...t/dao-proposal-sudo/schema/query_msg.json b/...s/dao-proposal-sudo/schema/query_msg.json → ...t/dao-proposal-sudo/schema/query_msg.json
diff --git a/...ntracts/dao-proposal-sudo/src/contract.rs → ...ts/test/dao-proposal-sudo/src/contract.rs b/...ntracts/dao-proposal-sudo/src/contract.rs → ...ts/test/dao-proposal-sudo/src/contract.rs
diff --git a/...-contracts/dao-proposal-sudo/src/error.rs → ...racts/test/dao-proposal-sudo/src/error.rs b/...-contracts/dao-proposal-sudo/src/error.rs → ...racts/test/dao-proposal-sudo/src/error.rs
diff --git a/test-contracts/dao-proposal-sudo/src/lib.rs → contracts/test/dao-proposal-sudo/src/lib.rs b/test-contracts/dao-proposal-sudo/src/lib.rs → contracts/test/dao-proposal-sudo/src/lib.rs
diff --git a/test-contracts/dao-proposal-sudo/src/msg.rs → contracts/test/dao-proposal-sudo/src/msg.rs b/test-contracts/dao-proposal-sudo/src/msg.rs → contracts/test/dao-proposal-sudo/src/msg.rs
diff --git a/...-contracts/dao-proposal-sudo/src/state.rs → ...racts/test/dao-proposal-sudo/src/state.rs b/...-contracts/dao-proposal-sudo/src/state.rs → ...racts/test/dao-proposal-sudo/src/state.rs
diff --git a/...cts/dao-test-custom-factory/.cargo/config → ...est/dao-test-custom-factory/.cargo/config b/...cts/dao-test-custom-factory/.cargo/config → ...est/dao-test-custom-factory/.cargo/config
diff --git a/...tracts/dao-test-custom-factory/Cargo.toml → ...s/test/dao-test-custom-factory/Cargo.toml b/...tracts/dao-test-custom-factory/Cargo.toml → ...s/test/dao-test-custom-factory/Cargo.toml
diff --git a/...-contracts/dao-test-custom-factory/README → ...racts/test/dao-test-custom-factory/README b/...-contracts/dao-test-custom-factory/README → ...racts/test/dao-test-custom-factory/README
diff --git a/...ao-test-custom-factory/examples/schema.rs → ...ao-test-custom-factory/examples/schema.rs b/...ao-test-custom-factory/examples/schema.rs → ...ao-test-custom-factory/examples/schema.rs
diff --git a/...s/dao-test-custom-factory/src/contract.rs → ...t/dao-test-custom-factory/src/contract.rs b/...s/dao-test-custom-factory/src/contract.rs → ...t/dao-test-custom-factory/src/contract.rs
diff --git a/...acts/dao-test-custom-factory/src/error.rs → ...test/dao-test-custom-factory/src/error.rs b/...acts/dao-test-custom-factory/src/error.rs → ...test/dao-test-custom-factory/src/error.rs
diff --git a/...tracts/dao-test-custom-factory/src/lib.rs → ...s/test/dao-test-custom-factory/src/lib.rs b/...tracts/dao-test-custom-factory/src/lib.rs → ...s/test/dao-test-custom-factory/src/lib.rs
diff --git a/...tracts/dao-test-custom-factory/src/msg.rs → ...s/test/dao-test-custom-factory/src/msg.rs b/...tracts/dao-test-custom-factory/src/msg.rs → ...s/test/dao-test-custom-factory/src/msg.rs
diff --git a/...cts/dao-voting-cw20-balance/.cargo/config → ...est/dao-voting-cw20-balance/.cargo/config b/...cts/dao-voting-cw20-balance/.cargo/config → ...est/dao-voting-cw20-balance/.cargo/config
diff --git a/...tracts/dao-voting-cw20-balance/.gitignore → ...s/test/dao-voting-cw20-balance/.gitignore b/...tracts/dao-voting-cw20-balance/.gitignore → ...s/test/dao-voting-cw20-balance/.gitignore
diff --git a/...tracts/dao-voting-cw20-balance/Cargo.toml → ...s/test/dao-voting-cw20-balance/Cargo.toml b/...tracts/dao-voting-cw20-balance/Cargo.toml → ...s/test/dao-voting-cw20-balance/Cargo.toml
diff --git a/...ntracts/dao-voting-cw20-balance/README.md → ...ts/test/dao-voting-cw20-balance/README.md b/...ntracts/dao-voting-cw20-balance/README.md → ...ts/test/dao-voting-cw20-balance/README.md
diff --git a/...ao-voting-cw20-balance/examples/schema.rs → ...ao-voting-cw20-balance/examples/schema.rs b/...ao-voting-cw20-balance/examples/schema.rs → ...ao-voting-cw20-balance/examples/schema.rs
diff --git a/...ting-cw20-balance/schema/execute_msg.json → ...ting-cw20-balance/schema/execute_msg.json b/...ting-cw20-balance/schema/execute_msg.json → ...ting-cw20-balance/schema/execute_msg.json
diff --git a/...ng-cw20-balance/schema/info_response.json → ...ng-cw20-balance/schema/info_response.json b/...ng-cw20-balance/schema/info_response.json → ...ng-cw20-balance/schema/info_response.json
diff --git a/...-cw20-balance/schema/instantiate_msg.json → ...-cw20-balance/schema/instantiate_msg.json b/...-cw20-balance/schema/instantiate_msg.json → ...-cw20-balance/schema/instantiate_msg.json
diff --git a/...voting-cw20-balance/schema/query_msg.json → ...voting-cw20-balance/schema/query_msg.json b/...voting-cw20-balance/schema/query_msg.json → ...voting-cw20-balance/schema/query_msg.json
diff --git a/...chema/total_power_at_height_response.json → ...chema/total_power_at_height_response.json b/...chema/total_power_at_height_response.json → ...chema/total_power_at_height_response.json
diff --git a/...hema/voting_power_at_height_response.json → ...hema/voting_power_at_height_response.json b/...hema/voting_power_at_height_response.json → ...hema/voting_power_at_height_response.json
diff --git a/...s/dao-voting-cw20-balance/src/contract.rs → ...t/dao-voting-cw20-balance/src/contract.rs b/...s/dao-voting-cw20-balance/src/contract.rs → ...t/dao-voting-cw20-balance/src/contract.rs
diff --git a/...acts/dao-voting-cw20-balance/src/error.rs → ...test/dao-voting-cw20-balance/src/error.rs b/...acts/dao-voting-cw20-balance/src/error.rs → ...test/dao-voting-cw20-balance/src/error.rs
diff --git a/...tracts/dao-voting-cw20-balance/src/lib.rs → ...s/test/dao-voting-cw20-balance/src/lib.rs b/...tracts/dao-voting-cw20-balance/src/lib.rs → ...s/test/dao-voting-cw20-balance/src/lib.rs
diff --git a/...tracts/dao-voting-cw20-balance/src/msg.rs → ...s/test/dao-voting-cw20-balance/src/msg.rs b/...tracts/dao-voting-cw20-balance/src/msg.rs → ...s/test/dao-voting-cw20-balance/src/msg.rs
diff --git a/...acts/dao-voting-cw20-balance/src/state.rs → ...test/dao-voting-cw20-balance/src/state.rs b/...acts/dao-voting-cw20-balance/src/state.rs → ...test/dao-voting-cw20-balance/src/state.rs
diff --git a/...acts/dao-voting-cw20-balance/src/tests.rs → ...test/dao-voting-cw20-balance/src/tests.rs b/...acts/dao-voting-cw20-balance/src/tests.rs → ...test/dao-voting-cw20-balance/src/tests.rs