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

[refactor] #3289: Use workspace inheritance #3708

Merged
merged 1 commit into from
Jul 17, 2023

Conversation

DCNick3
Copy link
Contributor

@DCNick3 DCNick3 commented Jul 13, 2023

Description

This PR extracts all common dependencies (2 usages or more) into a workspace level, so that it is easier to update them in lockstep.

Also, all iroha crates besides except inner _derive crates are also specified at workspace level.

Issues

There are two places where I couldn't unify the dependencies:

  1. tokio-tungstenite of versions 0.16 and 0.17 is used
    https://github.com/hyperledger/iroha/blob/39504a5a8029080e0a7fe93b0f06a74710dba347/client/Cargo.toml#L44-L43

  2. clap v3 and v4 is used:
    https://github.com/hyperledger/iroha/blob/39504a5a8029080e0a7fe93b0f06a74710dba347/client_cli/Cargo.toml#L31-L30

I haven't tried too hard, but it seems that it would require some code changes to update these places.

Linked issue

Closes #3289

@github-actions github-actions bot added the iroha2-dev The re-implementation of a BFT hyperledger in RUST label Jul 13, 2023
@coveralls
Copy link

coveralls commented Jul 13, 2023

Pull Request Test Coverage Report for Build 5580834861

  • 0 of 0 changed or added relevant lines in 0 files are covered.
  • 1384 unchanged lines in 29 files lost coverage.
  • Overall coverage decreased (-0.1%) to 59.336%

Files with Coverage Reduction New Missed Lines %
client_cli/src/main.rs 1 0%
client/src/http_default.rs 1 0%
cli/src/main.rs 1 0%
core/src/smartcontracts/isi/asset.rs 1 29.79%
derive_primitives/src/lib.rs 1 0%
macro/derive/src/lib.rs 1 94.59%
wasm_codec/derive/src/lib.rs 1 90.68%
config/base/src/lib.rs 2 91.94%
cli/derive/src/lib.rs 5 93.14%
cli/src/samples.rs 5 0%
Totals Coverage Status
Change from base Build 5423219773: -0.1%
Covered Lines: 19861
Relevant Lines: 33472

💛 - Coveralls

0x009922
0x009922 previously approved these changes Jul 14, 2023
Copy link
Contributor

@0x009922 0x009922 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Aahh, so pleasant set of changes.

As for clap's v3 vs v4: it was quite easy to migrate in Kagami. However, it is better to do in a separate PR.

logger/Cargo.toml Outdated Show resolved Hide resolved
tools/parity_scale_decoder/Cargo.toml Outdated Show resolved Hide resolved
cli/Cargo.toml Outdated Show resolved Hide resolved
config/Cargo.toml Outdated Show resolved Hide resolved
config/base/Cargo.toml Outdated Show resolved Hide resolved
core/Cargo.toml Outdated Show resolved Hide resolved
p2p/Cargo.toml Outdated Show resolved Hide resolved
p2p/Cargo.toml Outdated Show resolved Hide resolved
primitives/Cargo.toml Outdated Show resolved Hide resolved
primitives/Cargo.toml Outdated Show resolved Hide resolved
telemetry/Cargo.toml Outdated Show resolved Hide resolved
tools/kagami/Cargo.toml Outdated Show resolved Hide resolved
Signed-off-by: Nikita Strygin <DCNick3@users.noreply.github.com>
@appetrosyan appetrosyan merged commit 37ba88c into hyperledger-iroha:iroha2-dev Jul 17, 2023
DCNick3 added a commit to DCNick3/iroha that referenced this pull request Jul 18, 2023
…-iroha#3708 to make UI tests pass

Signed-off-by: Nikita Strygin <DCNick3@users.noreply.github.com>
appetrosyan pushed a commit that referenced this pull request Jul 18, 2023
Signed-off-by: Nikita Strygin <DCNick3@users.noreply.github.com>
mversic pushed a commit that referenced this pull request Oct 17, 2023
Signed-off-by: Nikita Strygin <DCNick3@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
iroha2-dev The re-implementation of a BFT hyperledger in RUST
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants