Skip to content

Commit

Permalink
chore: migrate code to the latest miden-base (#559)
Browse files Browse the repository at this point in the history
* refactor: remove unused dependencies, migrate code to the latest `next` of `miden-base`

* chore: update `miden-base`

* refactor: migrate to `assert_matches!` macro

* chore: switch to the `next` branch of `miden-base`

* refactor: add missed `assert_matches!`
  • Loading branch information
polydez authored Dec 2, 2024
1 parent 54095db commit a686581
Show file tree
Hide file tree
Showing 14 changed files with 171 additions and 179 deletions.
123 changes: 52 additions & 71 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 5 additions & 6 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,23 +25,22 @@ exclude = [".github/"]
readme = "README.md"

[workspace.dependencies]
assert_matches = { version = "1.5" }
miden-air = { version = "0.11" }
miden-lib = { version = "0.6" }
miden-lib = { git = "https://github.com/0xPolygonMiden/miden-base.git", branch = "next" }
miden-node-block-producer = { path = "crates/block-producer", version = "0.6" }
miden-node-faucet = { path = "bin/faucet", version = "0.6" }
miden-node-proto = { path = "crates/proto", version = "0.6" }
miden-node-rpc = { path = "crates/rpc", version = "0.6" }
miden-node-rpc-proto = { path = "crates/rpc-proto", version = "0.6" }
miden-node-store = { path = "crates/store", version = "0.6" }
miden-node-test-macro = { path = "crates/test-macro" }
miden-node-utils = { path = "crates/utils", version = "0.6" }
miden-objects = { version = "0.6"}
miden-objects = { git = "https://github.com/0xPolygonMiden/miden-base.git", branch = "next" }
miden-processor = { version = "0.11" }
miden-stdlib = { version = "0.11", default-features = false }
miden-tx = { version = "0.6"}
miden-tx = { git = "https://github.com/0xPolygonMiden/miden-base.git", branch = "next" }
prost = { version = "0.13" }
rand = { version = "0.8" }
thiserror = { version = "1.0" }
thiserror = { version = "2.0", default-features = false }
tokio = { version = "1.40", features = ["rt-multi-thread"] }
tokio-stream = { version = "0.1" }
tonic = { version = "0.12" }
Expand Down
5 changes: 1 addition & 4 deletions crates/block-producer/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ tracing-forest = ["miden-node-utils/tracing-forest"]

[dependencies]
async-trait = { version = "0.1" }
figment = { version = "0.10", features = ["toml", "env"] }
itertools = { version = "0.13" }
miden-lib = { workspace = true }
miden-node-proto = { workspace = true }
Expand All @@ -29,13 +28,11 @@ serde = { version = "1.0", features = ["derive"] }
thiserror = { workspace = true }
tokio = { workspace = true, features = ["rt-multi-thread", "net", "macros", "sync", "time"] }
tokio-stream = { workspace = true, features = ["net"] }
toml = { version = "0.8" }
tonic = { workspace = true }
tracing = { workspace = true }
tracing-subscriber = { workspace = true }

[dev-dependencies]
figment = { version = "0.10", features = ["toml", "env", "test"] }
assert_matches = { workspace = true}
miden-air = { workspace = true }
miden-lib = { workspace = true, features = ["testing"] }
miden-node-test-macro = { path = "../test-macro" }
Expand Down
Loading

0 comments on commit a686581

Please sign in to comment.