Merge pull request #760 from CosmWasm/schema-gen-in-bin-crate

contracts: move schema gen boilerplate to a binary crate
CosmWasm · Aug 15, 2022 · 8246967 · 8246967
2 parents 3d73325 + 972b693
commit 8246967
Show file tree

Hide file tree

Showing 30 changed files with 20 additions and 28 deletions.
diff --git a/contracts/cw1-subkeys/.cargo/config b/contracts/cw1-subkeys/.cargo/config
@@ -3,4 +3,4 @@ wasm = "build --release --target wasm32-unknown-unknown"
 wasm-debug = "build --target wasm32-unknown-unknown"
 unit-test = "test --lib"
 integration-test = "test --test integration"
-schema = "run --example schema"
+schema = "run --bin schema"
diff --git a/contracts/cw1-subkeys/Cargo.toml b/contracts/cw1-subkeys/Cargo.toml
@@ -19,6 +19,7 @@ library = []
 test-utils = []
 
 [dependencies]
+cosmwasm-schema = { version = "1.0.0" }
 cw-utils = { path = "../../packages/utils", version = "0.14.0" }
 cw1 = { path = "../../packages/cw1", version = "0.14.0" }
 cw2 = { path = "../../packages/cw2", version = "0.14.0" }
@@ -31,5 +32,4 @@ thiserror = "1.0.23"
 semver = "1"
 
 [dev-dependencies]
-cosmwasm-schema = { version = "1.0.0" }
 cw1-whitelist = { path = "../cw1-whitelist", version = "0.14.0", features = ["library", "test-utils"] }
diff --git a/contracts/cw1-subkeys/examples/schema.rs → contracts/cw1-subkeys/src/bin/schema.rs b/contracts/cw1-subkeys/examples/schema.rs → contracts/cw1-subkeys/src/bin/schema.rs
diff --git a/contracts/cw1-whitelist-ng/.cargo/config b/contracts/cw1-whitelist-ng/.cargo/config
@@ -3,4 +3,4 @@ wasm = "build --release --target wasm32-unknown-unknown"
 wasm-debug = "build --target wasm32-unknown-unknown"
 unit-test = "test --lib"
 integration-test = "test --test integration"
-schema = "run --example schema"
+schema = "run --bin schema"
diff --git a/contracts/cw1-whitelist-ng/Cargo.toml b/contracts/cw1-whitelist-ng/Cargo.toml
@@ -22,6 +22,7 @@ querier = ["library"]
 multitest = ["cw-multi-test", "anyhow"]
 
 [dependencies]
+cosmwasm-schema = { version = "1.0.0" }
 cw-utils = { path = "../../packages/utils", version = "0.14.0" }
 cw1 = { path = "../../packages/cw1", version = "0.14.0" }
 cw2 = { path = "../../packages/cw2", version = "0.14.0" }
@@ -36,6 +37,5 @@ anyhow = { version = "1", optional = true }
 [dev-dependencies]
 anyhow = "1"
 assert_matches = "1"
-cosmwasm-schema = { version = "1.0.0" }
 cw-multi-test = { path = "../../packages/multi-test", version = "0.14.0" }
 derivative = "2"
diff --git a/...racts/cw1-whitelist-ng/examples/schema.rs → contracts/cw1-whitelist-ng/src/bin/schema.rs b/...racts/cw1-whitelist-ng/examples/schema.rs → contracts/cw1-whitelist-ng/src/bin/schema.rs
diff --git a/contracts/cw1-whitelist/.cargo/config b/contracts/cw1-whitelist/.cargo/config
@@ -3,4 +3,4 @@ wasm = "build --release --target wasm32-unknown-unknown"
 wasm-debug = "build --target wasm32-unknown-unknown"
 unit-test = "test --lib"
 integration-test = "test --test integration"
-schema = "run --example schema"
+schema = "run --bin schema"
diff --git a/contracts/cw1-whitelist/Cargo.toml b/contracts/cw1-whitelist/Cargo.toml
@@ -19,6 +19,7 @@ library = []
 test-utils = []
 
 [dependencies]
+cosmwasm-schema = { version = "1.0.0" }
 cw-utils = { path = "../../packages/utils", version = "0.14.0" }
 cw1 = { path = "../../packages/cw1", version = "0.14.0" }
 cw2 = { path = "../../packages/cw2", version = "0.14.0" }
@@ -31,6 +32,5 @@ thiserror = { version = "1.0.23" }
 [dev-dependencies]
 anyhow = "1"
 assert_matches = "1"
-cosmwasm-schema = { version = "1.0.0" }
 cw-multi-test = { path = "../../packages/multi-test", version = "0.14.0" }
 derivative = "2"
diff --git a/contracts/cw1-whitelist/examples/schema.rs → contracts/cw1-whitelist/src/bin/schema.rs b/contracts/cw1-whitelist/examples/schema.rs → contracts/cw1-whitelist/src/bin/schema.rs
diff --git a/contracts/cw1155-base/.cargo/config b/contracts/cw1155-base/.cargo/config
@@ -2,4 +2,4 @@
 wasm = "build --release --target wasm32-unknown-unknown"
 wasm-debug = "build --target wasm32-unknown-unknown"
 unit-test = "test --lib"
-schema = "run --example schema"
+schema = "run --bin schema"
diff --git a/contracts/cw1155-base/Cargo.toml b/contracts/cw1155-base/Cargo.toml
@@ -18,6 +18,7 @@ backtraces = ["cosmwasm-std/backtraces"]
 library = []
 
 [dependencies]
+cosmwasm-schema = { version = "1.0.0" }
 cw-utils = { path = "../../packages/utils", version = "0.14.0" }
 cw2 = { path = "../../packages/cw2", version = "0.14.0" }
 cw1155 = { path = "../../packages/cw1155", version = "0.14.0" }
@@ -26,6 +27,3 @@ cosmwasm-std = { version = "1.0.0" }
 schemars = "0.8.1"
 serde = { version = "1.0.103", default-features = false, features = ["derive"] }
 thiserror = { version = "1.0.20" }
-
-[dev-dependencies]
-cosmwasm-schema = { version = "1.0.0" }
diff --git a/contracts/cw1155-base/examples/schema.rs → contracts/cw1155-base/src/bin/schema.rs b/contracts/cw1155-base/examples/schema.rs → contracts/cw1155-base/src/bin/schema.rs
diff --git a/contracts/cw20-base/.cargo/config b/contracts/cw20-base/.cargo/config
@@ -3,4 +3,4 @@ wasm = "build --release --target wasm32-unknown-unknown"
 wasm-debug = "build --target wasm32-unknown-unknown"
 unit-test = "test --lib"
 integration-test = "test --test integration"
-schema = "run --example schema"
+schema = "run --bin schema"
diff --git a/contracts/cw20-base/Cargo.toml b/contracts/cw20-base/Cargo.toml
@@ -18,6 +18,7 @@ backtraces = ["cosmwasm-std/backtraces"]
 library = []
 
 [dependencies]
+cosmwasm-schema = { version = "1.0.0" }
 cw-utils = { path = "../../packages/utils", version = "0.14.0" }
 cw2 = { path = "../../packages/cw2", version = "0.14.0" }
 cw20 = { path = "../../packages/cw20", version = "0.14.0" }
@@ -29,5 +30,4 @@ serde = { version = "1.0.103", default-features = false, features = ["derive"] }
 thiserror = { version = "1.0.23" }
 
 [dev-dependencies]
-cosmwasm-schema = { version = "1.0.0" }
 cw-multi-test = { path = "../../packages/multi-test", version = "0.14.0" }
diff --git a/contracts/cw20-base/examples/schema.rs → contracts/cw20-base/src/bin/schema.rs b/contracts/cw20-base/examples/schema.rs → contracts/cw20-base/src/bin/schema.rs
diff --git a/contracts/cw20-ics20/.cargo/config b/contracts/cw20-ics20/.cargo/config
@@ -3,4 +3,4 @@ wasm = "build --release --target wasm32-unknown-unknown"
 wasm-debug = "build --target wasm32-unknown-unknown"
 unit-test = "test --lib"
 integration-test = "test --test integration"
-schema = "run --example schema"
+schema = "run --bin schema"
diff --git a/contracts/cw20-ics20/Cargo.toml b/contracts/cw20-ics20/Cargo.toml
@@ -18,6 +18,7 @@ backtraces = ["cosmwasm-std/backtraces"]
 library = []
 
 [dependencies]
+cosmwasm-schema = { version = "1.0.0" }
 cw-utils = { path = "../../packages/utils", version = "0.14.0" }
 cw2 = { path = "../../packages/cw2", version = "0.14.0" }
 cw20 = { path = "../../packages/cw20", version = "0.14.0" }
@@ -28,6 +29,3 @@ schemars = "0.8.1"
 semver = "1"
 serde = { version = "1.0.103", default-features = false, features = ["derive"] }
 thiserror = { version = "1.0.23" }
-
-[dev-dependencies]
-cosmwasm-schema = { version = "1.0.0" }
diff --git a/contracts/cw20-ics20/examples/schema.rs → contracts/cw20-ics20/src/bin/schema.rs b/contracts/cw20-ics20/examples/schema.rs → contracts/cw20-ics20/src/bin/schema.rs
diff --git a/contracts/cw3-fixed-multisig/.cargo/config b/contracts/cw3-fixed-multisig/.cargo/config
@@ -3,4 +3,4 @@ wasm = "build --release --target wasm32-unknown-unknown"
 wasm-debug = "build --target wasm32-unknown-unknown"
 unit-test = "test --lib"
 integration-test = "test --test integration"
-schema = "run --example schema"
+schema = "run --bin schema"
diff --git a/contracts/cw3-fixed-multisig/Cargo.toml b/contracts/cw3-fixed-multisig/Cargo.toml
@@ -18,6 +18,7 @@ backtraces = ["cosmwasm-std/backtraces"]
 library = []
 
 [dependencies]
+cosmwasm-schema = { version = "1.0.0" }
 cw-utils = { path = "../../packages/utils", version = "0.14.0" }
 cw2 = { path = "../../packages/cw2", version = "0.14.0" }
 cw3 = { path = "../../packages/cw3", version = "0.14.0" }
@@ -28,7 +29,6 @@ serde = { version = "1.0.103", default-features = false, features = ["derive"] }
 thiserror = { version = "1.0.23" }
 
 [dev-dependencies]
-cosmwasm-schema = { version = "1.0.0" }
 cw20 = { path = "../../packages/cw20", version = "0.14.0" }
 cw20-base = { path = "../cw20-base", version = "0.14.0", features = ["library"] }
 cw-multi-test = { path = "../../packages/multi-test", version = "0.14.0" }
diff --git a/...cts/cw3-fixed-multisig/examples/schema.rs → ...acts/cw3-fixed-multisig/src/bin/schema.rs b/...cts/cw3-fixed-multisig/examples/schema.rs → ...acts/cw3-fixed-multisig/src/bin/schema.rs
diff --git a/contracts/cw3-flex-multisig/.cargo/config b/contracts/cw3-flex-multisig/.cargo/config
@@ -3,4 +3,4 @@ wasm = "build --release --target wasm32-unknown-unknown"
 wasm-debug = "build --target wasm32-unknown-unknown"
 unit-test = "test --lib"
 integration-test = "test --test integration"
-schema = "run --example schema"
+schema = "run --bin schema"
diff --git a/contracts/cw3-flex-multisig/Cargo.toml b/contracts/cw3-flex-multisig/Cargo.toml
@@ -18,6 +18,7 @@ backtraces = ["cosmwasm-std/backtraces"]
 library = []
 
 [dependencies]
+cosmwasm-schema = { version = "1.0.0" }
 cw-utils = { path = "../../packages/utils", version = "0.14.0" }
 cw2 = { path = "../../packages/cw2", version = "0.14.0" }
 cw3 = { path = "../../packages/cw3", version = "0.14.0" }
@@ -30,6 +31,5 @@ serde = { version = "1.0.103", default-features = false, features = ["derive"] }
 thiserror = { version = "1.0.23" }
 
 [dev-dependencies]
-cosmwasm-schema = { version = "1.0.0" }
 cw4-group = { path = "../cw4-group", version = "0.14.0" }
 cw-multi-test = { path = "../../packages/multi-test", version = "0.14.0" }
diff --git a/...acts/cw3-flex-multisig/examples/schema.rs → ...racts/cw3-flex-multisig/src/bin/schema.rs b/...acts/cw3-flex-multisig/examples/schema.rs → ...racts/cw3-flex-multisig/src/bin/schema.rs
diff --git a/contracts/cw4-group/.cargo/config b/contracts/cw4-group/.cargo/config
@@ -2,4 +2,4 @@
 wasm = "build --release --target wasm32-unknown-unknown"
 wasm-debug = "build --target wasm32-unknown-unknown"
 unit-test = "test --lib"
-schema = "run --example schema"
+schema = "run --bin schema"
diff --git a/contracts/cw4-group/Cargo.toml b/contracts/cw4-group/Cargo.toml
@@ -26,6 +26,7 @@ backtraces = ["cosmwasm-std/backtraces"]
 library = []
 
 [dependencies]
+cosmwasm-schema = { version = "1.0.0" }
 cw-utils = { path = "../../packages/utils", version = "0.14.0" }
 cw2 = { path = "../../packages/cw2", version = "0.14.0" }
 cw4 = { path = "../../packages/cw4", version = "0.14.0" }
@@ -35,6 +36,3 @@ cosmwasm-std = { version = "1.0.0" }
 schemars = "0.8.1"
 serde = { version = "1.0.103", default-features = false, features = ["derive"] }
 thiserror = { version = "1.0.23" }
-
-[dev-dependencies]
-cosmwasm-schema = { version = "1.0.0" }
diff --git a/contracts/cw4-group/examples/schema.rs → contracts/cw4-group/src/bin/schema.rs b/contracts/cw4-group/examples/schema.rs → contracts/cw4-group/src/bin/schema.rs
diff --git a/contracts/cw4-stake/.cargo/config b/contracts/cw4-stake/.cargo/config
@@ -2,4 +2,4 @@
 wasm = "build --release --target wasm32-unknown-unknown"
 wasm-debug = "build --target wasm32-unknown-unknown"
 unit-test = "test --lib"
-schema = "run --example schema"
+schema = "run --bin schema"
diff --git a/contracts/cw4-stake/Cargo.toml b/contracts/cw4-stake/Cargo.toml
@@ -26,6 +26,7 @@ backtraces = ["cosmwasm-std/backtraces"]
 library = []
 
 [dependencies]
+cosmwasm-schema = { version = "1.0.0" }
 cw-utils = { path = "../../packages/utils", version = "0.14.0" }
 cw2 = { path = "../../packages/cw2", version = "0.14.0" }
 cw4 = { path = "../../packages/cw4", version = "0.14.0" }
@@ -36,6 +37,3 @@ cosmwasm-std = { version = "1.0.0" }
 schemars = "0.8.1"
 serde = { version = "1.0.103", default-features = false, features = ["derive"] }
 thiserror = { version = "1.0.23" }
-
-[dev-dependencies]
-cosmwasm-schema = { version = "1.0.0" }
diff --git a/contracts/cw4-stake/examples/schema.rs → contracts/cw4-stake/src/bin/schema.rs b/contracts/cw4-stake/examples/schema.rs → contracts/cw4-stake/src/bin/schema.rs