Merge pull request #26 from Rigidity/cleanup

Cleanup
xch-dev · May 21, 2024 · 280036a · 280036a
2 parents bb701bc + c975f1c
commit 280036a
Show file tree

Hide file tree

Showing 11 changed files with 137 additions and 104 deletions.
diff --git a/.env b/.env
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -22,10 +22,13 @@ jobs:
         with:
           components: clippy, rustfmt
 
-      - name: SQLx
+      - name: Cargo binstall
         run: |
-          cargo install sqlx-cli
-          sqlx db reset -y
+          curl -L --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/cargo-bins/cargo-binstall/main/install-from-binstall-release.sh | bash
+
+      - name: Cargo workspaces
+        run: |
+          cargo binstall cargo-workspaces --locked -y
 
       - name: Run tests
         run: cargo test --all-features
@@ -40,4 +43,4 @@ jobs:
         if: startsWith(github.event.ref, 'refs/tags')
         env:
           CARGO_REGISTRY_TOKEN: ${{ secrets.cargo_registry_token }}
-        run: cargo publish
+        run: cargo ws publish --publish-as-is
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,2 @@
 /target
-*.sqlite
 *.DS_Store
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -13,17 +13,49 @@ members = ["crates/*"]
 resolver = "2"
 
 [dependencies]
-thiserror = "1.0.61"
+thiserror.workspace = true
+chia-protocol.workspace = true
+hex.workspace = true
+bech32.workspace = true
+rand.workspace = true
+rand_chacha.workspace = true
+hex-literal.workspace = true
+indexmap.workspace = true
+chia-sdk-client.workspace = true
+chia-sdk-driver.workspace = true
+chia-sdk-parser.workspace = true
+chia-sdk-signer.workspace = true
+chia-sdk-test.workspace = true
+chia-sdk-types.workspace = true
+
+[workspace.dependencies]
+chia-sdk-client = { version = "0.8.0", path = "./crates/chia-sdk-client" }
+chia-sdk-driver = { version = "0.8.0", path = "./crates/chia-sdk-driver" }
+chia-sdk-parser = { version = "0.8.0", path = "./crates/chia-sdk-parser" }
+chia-sdk-signer = { version = "0.8.0", path = "./crates/chia-sdk-signer" }
+chia-sdk-test = { version = "0.8.0", path = "./crates/chia-sdk-test" }
+chia-sdk-types = { version = "0.8.0", path = "./crates/chia-sdk-types" }
+chia-ssl = "0.7.0"
 chia-protocol = "0.8.0"
+chia-consensus = "0.8.0"
+chia-client = "0.8.0"
+chia-traits = "0.8.0"
+chia-bls = "0.8.0"
+chia-puzzles = "0.8.0"
+clvm-traits = "0.8.0"
+clvm-utils = "0.8.0"
+clvmr = "0.7.0"
+thiserror = "1.0.61"
 hex = "0.4.3"
 bech32 = "0.9.1"
 rand = "0.8.5"
 rand_chacha = "0.3.1"
 hex-literal = "0.4.1"
 indexmap = "2.2.6"
-chia-sdk-client = { version = "0.8.0", path = "./crates/chia-sdk-client" }
-chia-sdk-driver = { version = "0.8.0", path = "./crates/chia-sdk-driver" }
-chia-sdk-parser = { version = "0.8.0", path = "./crates/chia-sdk-parser" }
-chia-sdk-signer = { version = "0.8.0", path = "./crates/chia-sdk-signer" }
-chia-sdk-test = { version = "0.8.0", path = "./crates/chia-sdk-test" }
-chia-sdk-types = { version = "0.8.0", path = "./crates/chia-sdk-types" }
+futures-util = "0.3.30"
+futures-channel = "0.3.30"
+anyhow = "1.0.86"
+once_cell = "1.19.0"
+tokio = "1.37.0"
+tokio-tungstenite = { version = "0.21.0", features = ["native-tls"] }
+native-tls = "0.2.11"
diff --git a/crates/chia-sdk-client/Cargo.toml b/crates/chia-sdk-client/Cargo.toml
@@ -4,8 +4,8 @@ version = "0.8.0"
 edition = "2021"
 
 [dependencies]
-tokio-tungstenite = { version = "0.21.0", features = ["native-tls"] }
-native-tls = "0.2.11"
-thiserror = "1.0.61"
-chia-client = "0.8.0"
-chia-ssl = "0.7.0"
+chia-client.workspace = true
+chia-ssl.workspace = true
+tokio-tungstenite.workspace = true
+native-tls.workspace = true
+thiserror.workspace = true
diff --git a/crates/chia-sdk-driver/Cargo.toml b/crates/chia-sdk-driver/Cargo.toml
@@ -4,20 +4,20 @@ version = "0.8.0"
 edition = "2021"
 
 [dependencies]
-chia-bls = "0.8.0"
-chia-protocol = "0.8.0"
-chia-puzzles = "0.8.0"
-clvm-traits = "0.8.0"
-clvm-utils = "0.8.0"
-clvmr = "0.7.0"
-thiserror = "1.0.61"
-chia-sdk-types = { version = "0.8.0", path = "../chia-sdk-types" }
-chia-sdk-test = { version = "0.8.0", path = "../chia-sdk-test" }
-chia-traits = "0.8.0"
+chia-bls.workspace = true
+chia-protocol.workspace = true
+chia-puzzles.workspace = true
+chia-traits.workspace = true
+clvm-traits.workspace = true
+clvm-utils.workspace = true
+clvmr.workspace = true
+thiserror.workspace = true
+chia-sdk-types.workspace = true
+chia-sdk-test.workspace = true
 
 [dev-dependencies]
-anyhow = "1.0.86"
-chia-consensus = "0.8.0"
-hex = "0.4.3"
-hex-literal = "0.4.1"
-tokio = { version = "1.37.0", features = ["full"] }
+anyhow.workspace = true
+chia-consensus.workspace = true
+hex.workspace = true
+hex-literal.workspace = true
+tokio = { workspace = true, features = ["full"] }
diff --git a/crates/chia-sdk-parser/Cargo.toml b/crates/chia-sdk-parser/Cargo.toml
@@ -4,15 +4,15 @@ version = "0.8.0"
 edition = "2021"
 
 [dependencies]
-chia-protocol = "0.8.0"
-chia-puzzles = "0.8.0"
-clvm-traits = "0.8.0"
-clvm-utils = "0.8.0"
-clvmr = "0.7.0"
-thiserror = "1.0.61"
-chia-sdk-types = { version = "0.8.0", path = "../chia-sdk-types" }
+chia-protocol.workspace = true
+chia-puzzles.workspace = true
+clvm-traits.workspace = true
+clvm-utils.workspace = true
+clvmr.workspace = true
+thiserror.workspace = true
+chia-sdk-types.workspace = true
 
 [dev-dependencies]
-anyhow = "1.0.86"
-chia-bls = "0.8.0"
-chia-sdk-driver = { version = "0.8.0", path = "../chia-sdk-driver" }
+anyhow.workspace = true
+chia-bls.workspace = true
+chia-sdk-driver.workspace = true
diff --git a/crates/chia-sdk-signer/Cargo.toml b/crates/chia-sdk-signer/Cargo.toml
@@ -4,14 +4,14 @@ version = "0.8.0"
 edition = "2021"
 
 [dependencies]
-chia-bls = "0.8.0"
-chia-protocol = "0.8.0"
-chia-sdk-types = { version = "0.8.0", path = "../chia-sdk-types" }
-clvm-traits = "0.8.0"
-clvmr = "0.7.0"
-thiserror = "1.0.61"
+chia-bls.workspace = true
+chia-protocol.workspace = true
+clvm-traits.workspace = true
+clvmr.workspace = true
+thiserror.workspace = true
+chia-sdk-types.workspace = true
 
 [dev-dependencies]
-chia-puzzles = "0.8.0"
-hex = "0.4.3"
-hex-literal = "0.4.1"
+chia-puzzles.workspace = true
+hex.workspace = true
+hex-literal.workspace = true
diff --git a/crates/chia-sdk-test/Cargo.toml b/crates/chia-sdk-test/Cargo.toml
@@ -4,24 +4,24 @@ version = "0.8.0"
 edition = "2021"
 
 [dependencies]
-chia-bls = "0.8.0"
-chia-client = "0.8.0"
-chia-consensus = "0.8.0"
-chia-protocol = "0.8.0"
-chia-puzzles = "0.8.0"
-chia-traits = "0.8.0"
-clvm-utils = "0.8.0"
-clvmr = "0.7.0"
-futures-channel = { version = "0.3.30", features = ["sink"] }
-futures-util = "0.3.30"
-indexmap = "2.2.6"
-rand = "0.8.5"
-rand_chacha = "0.3.1"
-tokio = { version = "1.37.0", features = ["full"] }
-tokio-tungstenite = { version = "0.21.0", features = ["native-tls"] }
-anyhow = "1.0.86"
-clvm-traits = "0.8.0"
-hex-literal = "0.4.1"
-once_cell = "1.19.0"
-chia-sdk-types = { version = "0.8.0", path = "../chia-sdk-types" }
-chia-sdk-signer = { version = "0.8.0", path = "../chia-sdk-signer" }
+chia-bls.workspace = true
+chia-client.workspace = true
+chia-consensus.workspace = true
+chia-protocol.workspace = true
+chia-puzzles.workspace = true
+chia-traits.workspace = true
+clvm-utils.workspace = true
+clvm-traits.workspace = true
+clvmr.workspace = true
+futures-channel = { workspace = true, features = ["sink"] }
+futures-util.workspace = true
+indexmap.workspace = true
+rand.workspace = true
+rand_chacha.workspace = true
+anyhow.workspace = true
+hex-literal.workspace = true
+once_cell.workspace = true
+tokio = { workspace = true, features = ["full"] }
+tokio-tungstenite.workspace = true
+chia-sdk-types.workspace = true
+chia-sdk-signer.workspace = true
diff --git a/crates/chia-sdk-types/Cargo.toml b/crates/chia-sdk-types/Cargo.toml
@@ -4,12 +4,12 @@ version = "0.8.0"
 edition = "2021"
 
 [dependencies]
-chia-bls = "0.8.0"
-chia-protocol = "0.8.0"
-chia-puzzles = "0.8.0"
-clvm-traits = "0.8.0"
-clvmr = "0.7.0"
+chia-bls.workspace = true
+chia-protocol.workspace = true
+chia-puzzles.workspace = true
+clvm-traits.workspace = true
+clvmr.workspace = true
 
 [dev-dependencies]
-hex = "0.4.3"
-hex-literal = "0.4.1"
+hex.workspace = true
+hex-literal.workspace = true