Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(block-producer): merge in next #561

Merged
merged 11 commits into from
Dec 4, 2024

Conversation

Mirko-von-Leipzig
Copy link
Contributor

@Mirko-von-Leipzig Mirko-von-Leipzig commented Dec 4, 2024

Merge next into next-block-producer so that we can perform the reverse merge afterwards.

Doing this as a PR so we can sanity check the diff. Once CI passes I'll force push this into next-block-producer.

Mirko-von-Leipzig and others added 10 commits November 2, 2024 10:14
Clippy issue rust-lang/rust-clippy#12281 was fixed
in v1.81. We now have MSRV of 1.82 allowing us to remove our workaround.

More specifically, #[async_trait] was triggering this lint, and as of 1.81 no
longer does.
* refactor: improve `ApplyBlockErrors` variants

* docs: update `CHANGELOG.md`

* refactor: address review comments
* Update state.rs

* docs: Update expect()

* chore: Lints
Previously only http was supported.
* 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!`
@Mirko-von-Leipzig Mirko-von-Leipzig marked this pull request as ready for review December 4, 2024 11:04
@Mirko-von-Leipzig Mirko-von-Leipzig removed the request for review from polydez December 4, 2024 11:04
@Mirko-von-Leipzig Mirko-von-Leipzig merged commit 9399917 into next-block-producer Dec 4, 2024
9 checks passed
@Mirko-von-Leipzig Mirko-von-Leipzig deleted the mirko/merge-next branch December 4, 2024 11:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants