-
Notifications
You must be signed in to change notification settings - Fork 2.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
refactor: make zksync_utils thinner (#3568)
## What ❔ This PR removes heavy transitive dependencies from `zksync_utils` by: * Moving `ManagedTasks` into a separate crate (ideally needs to be removed in favor of node_framework but unfortunately still used by prover and contract-verifier) * Deleting custom-written retry logic for reqwest. The only place that was using was `RegionFetcher` from prover utils. I migrated it to `reqwest-retry` instead (Cargo.lock diff looks bigger than it actually is - almost every new crate is just some wasm-specific stuff that doesn't matter). ## Why ❔ Depending on `zksync_contracts`, `zksync_multivm` and other seemingly core crates pulls in a lot of transitive dependencies right now (`reqwest`, `sentry`, `opentelemetry`, `openssl` etc) ## Checklist <!-- Check your PR fulfills the following items. --> <!-- For draft PRs check the boxes as you complete them. --> - [x] PR title corresponds to the body of PR (we generate changelog entries from PRs). - [ ] Tests for the changes have been added / updated. - [ ] Documentation comments have been added / updated. - [x] Code has been formatted via `zkstack dev fmt` and `zkstack dev lint`.
- Loading branch information
Showing
32 changed files
with
230 additions
and
691 deletions.
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
[package] | ||
name = "zksync_task_management" | ||
description = "ZKsync task management" | ||
version.workspace = true | ||
edition.workspace = true | ||
authors.workspace = true | ||
homepage.workspace = true | ||
repository.workspace = true | ||
license.workspace = true | ||
keywords.workspace = true | ||
categories.workspace = true | ||
|
||
[dependencies] | ||
zksync_utils.workspace = true | ||
zksync_vlog.workspace = true | ||
|
||
anyhow.workspace = true | ||
futures.workspace = true | ||
tokio = { workspace = true } | ||
tracing.workspace = true |
4 changes: 2 additions & 2 deletions
4
core/lib/utils/src/wait_for_tasks.rs → core/lib/task_management/src/lib.rs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,4 @@ | ||
//! Various helpers used in the ZKsync stack. | ||
pub mod env; | ||
pub mod http_with_retries; | ||
pub mod panic_extractor; | ||
pub mod wait_for_tasks; |
Oops, something went wrong.