Skip to content

Commit c05a6c8

Browse files
authored
organize tests (#890)
* moved all contract wrappers to dao-testing * updated schema * added DAO creation testing suite scaffold * made DAO testing suites for all voting modules * rewrote dao-rewards-distributor tests using dao-testing suite * fixed integration tests
1 parent b0c7ef1 commit c05a6c8

File tree

84 files changed

+5111
-4534
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+5111
-4534
lines changed

Cargo.lock

Lines changed: 51 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,25 +85,30 @@ wynd-utils = "0.4"
8585
# optional owner.
8686
cw-ownable = "0.5"
8787

88+
btsg-ft-factory = { path = "./contracts/external/btsg-ft-factory", version = "2.5.0" }
8889
cw-admin-factory = { path = "./contracts/external/cw-admin-factory", version = "2.5.0" }
8990
cw-denom = { path = "./packages/cw-denom", version = "2.5.0" }
9091
cw-fund-distributor = { path = "./contracts/distribution/cw-fund-distributor", version = "2.5.0" }
9192
cw-hooks = { path = "./packages/cw-hooks", version = "2.5.0" }
9293
cw-paginate-storage = { path = "./packages/cw-paginate-storage", version = "2.5.0" }
9394
cw-payroll-factory = { path = "./contracts/external/cw-payroll-factory", version = "2.5.0" }
9495
cw-stake-tracker = { path = "./packages/cw-stake-tracker", version = "2.5.0" }
96+
cw-token-swap = { path = "./contracts/external/cw-token-swap", version = "2.5.0" }
9597
cw-tokenfactory-issuer = { path = "./contracts/external/cw-tokenfactory-issuer", version = "2.5.0", default-features = false }
9698
cw-tokenfactory-types = { path = "./packages/cw-tokenfactory-types", version = "2.5.0", default-features = false }
9799
cw-vesting = { path = "./contracts/external/cw-vesting", version = "2.5.0" }
98100
cw-wormhole = { path = "./packages/cw-wormhole", version = "2.5.0" }
99101
cw20-stake = { path = "./contracts/staking/cw20-stake", version = "2.5.0" }
102+
cw20-stake-external-rewards = { path = "./contracts/staking/cw20-stake-external-rewards", version = "2.5.0" }
103+
cw20-stake-reward-distributor = { path = "./contracts/staking/cw20-stake-reward-distributor", version = "2.5.0" }
100104
cw721-controllers = { path = "./packages/cw721-controllers", version = "2.5.0" }
101105
cw721-roles = { path = "./contracts/external/cw721-roles", version = "2.5.0" }
102106
dao-cw721-extensions = { path = "./packages/dao-cw721-extensions", version = "2.5.0" }
103107
dao-dao-core = { path = "./contracts/dao-dao-core", version = "2.5.0" }
104108
dao-dao-macros = { path = "./packages/dao-dao-macros", version = "2.5.0" }
105109
dao-hooks = { path = "./packages/dao-hooks", version = "2.5.0" }
106110
dao-interface = { path = "./packages/dao-interface", version = "2.5.0" }
111+
dao-migrator = { path = "./contracts/external/dao-migrator", version = "2.5.0" }
107112
dao-pre-propose-approval-single = { path = "./contracts/pre-propose/dao-pre-propose-approval-single", version = "2.5.0" }
108113
dao-pre-propose-approver = { path = "./contracts/pre-propose/dao-pre-propose-approver", version = "2.5.0" }
109114
dao-pre-propose-base = { path = "./packages/dao-pre-propose-base", version = "2.5.0" }
@@ -134,9 +139,12 @@ cw20-stake-external-rewards-v1 = { package = "stake-cw20-external-rewards", vers
134139
cw20-stake-reward-distributor-v1 = { package = "stake-cw20-reward-distributor", version = "0.1.0" }
135140
cw20-stake-v1 = { package = "cw20-stake", version = "0.2.6" }
136141
cw20-staked-balance-voting-v1 = { package = "cw20-staked-balance-voting", version = "0.1.0" }
137-
cw4-voting-v1 = { package = "cw4-voting", version = "0.1.0" }
138142
stake-cw20-v03 = { package = "stake-cw20", version = "0.2.6" }
143+
cw4-voting-v1 = { package = "cw4-voting", version = "0.1.0", git = "https://github.com/DA0-DA0/dao-contracts.git", tag = "v1.0.0" }
144+
cw-core-interface-v1 = { package = "cw-core-interface", version = "0.1.0", git = "https://github.com/DA0-DA0/dao-contracts.git", tag = "v1.0.0" }
139145
voting-v1 = { package = "dao-voting", version = "0.1.0" }
146+
cw20-v1 = { version = "0.13", package = "cw20" }
147+
cw4-v1 = { version = "0.13", package = "cw4" }
140148

141149
# v2.4.1 dependencies. used for state migrations.
142150
cw-denom-v241 = { package = "cw-denom", version = "=2.4.1" }

contracts/dao-dao-core/Cargo.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,10 @@ cw-paginate-storage = { workspace = true }
3131
cw-core-v1 = { workspace = true, features = ["library"] }
3232

3333
[dev-dependencies]
34+
dao-dao-core = { workspace = true }
3435
cw-multi-test = { workspace = true }
3536
cw20-base = { workspace = true }
3637
cw721-base = { workspace = true }
3738
dao-proposal-sudo = { workspace = true }
39+
dao-testing = { workspace = true }
3840
dao-voting-cw20-balance = { workspace = true }

0 commit comments

Comments
 (0)