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

Feature-gate Resolver #1007

Merged
merged 3 commits into from
Sep 12, 2022
Merged

Feature-gate Resolver #1007

merged 3 commits into from
Sep 12, 2022

Conversation

PhilippGackstatter
Copy link
Contributor

Description of change

Feature gate the resolver in identity_iota, and add client extension traits to the prelude.

Links to any relevant issues

Follow up to #1000.

Type of change

Add an x to the boxes that are relevant to your changes.

  • Bug fix (a non-breaking change which fixes an issue)
  • Enhancement (a non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Documentation Fix

How the change has been tested

cargo check

Change checklist

Add an x to the boxes that are relevant to your changes.

  • I have followed the contribution guidelines for this project
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I have added tests that prove my fix is effective or that my feature works
  • New and existing unit tests pass locally with my changes

@PhilippGackstatter PhilippGackstatter added Breaking change A change to the API that requires a major release. Part of "Changed" section in changelog Rust Related to the core Rust code. Becomes part of the Rust changelog. labels Sep 12, 2022
@PhilippGackstatter PhilippGackstatter added this to the v0.7 Features milestone Sep 12, 2022
Copy link
Contributor

@cycraig cycraig left a comment

Choose a reason for hiding this comment

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

Looks good to me but please take the PR out of draft mode so the CI runs.

I got an error in the Wasm bindings, which needed a cargo update to fix, since the Cargo.lock versions of future are conflicting. Not sure if that's just a local problem. Edit: the Wasm Cargo.lock is gitignored, unlike the Stronghold bindings one, so it should be fine.

$ cargo clippy
    Updating crates.io index
error: failed to select a version for `futures`.
    ... required by package `iota-client v2.0.0-beta.3`
    ... which satisfies dependency `iota-client = "^2.0.0-beta.3"` of package `identity_iota_core v0.6.0 (/home/craig/Desktop/work/identity.rs/identity_iota_core)`
    ... which satisfies path dependency `identity_iota_core` (locked to 0.6.0) of package `identity_iota v0.6.0 (/home/craig/Desktop/work/identity.rs/identity_iota)`
    ... which satisfies path dependency `identity_iota` (locked to 0.6.0) of package `identity_wasm v0.6.0 (/home/craig/Desktop/work/identity.rs/bindings/wasm)`
versions that meet the requirements `^0.3.24` are: 0.3.24

all possible versions conflict with previously selected packages.

  previously selected package `futures v0.3.21`
    ... which satisfies dependency `futures = "^0.3"` (locked to 0.3.21) of package `identity_iota_core v0.6.0 (/home/craig/Desktop/work/identity.rs/identity_iota_core)`
    ... which satisfies path dependency `identity_iota_core` (locked to 0.6.0) of package `identity_iota v0.6.0 (/home/craig/Desktop/work/identity.rs/identity_iota)`
    ... which satisfies path dependency `identity_iota` (locked to 0.6.0) of package `identity_wasm v0.6.0 (/home/craig/Desktop/work/identity.rs/bindings/wasm)`

failed to select a version for `futures` which could resolve this conflict

@PhilippGackstatter PhilippGackstatter marked this pull request as ready for review September 12, 2022 09:22
@PhilippGackstatter
Copy link
Contributor Author

I got an error in the Wasm bindings, which needed a cargo update to fix, since the Cargo.lock versions of future are conflicting. Not sure if that's just a local problem.

I think since we don't commit the Cargo.lock it should be okay? I didn't have the error locally and we don't have a very restrictive version for futures selected in our crates (just version = "0.3") so I'm not sure where it could originate from.

@PhilippGackstatter PhilippGackstatter merged commit d2478c3 into dev Sep 12, 2022
@PhilippGackstatter PhilippGackstatter deleted the chore/feature-gate-resolver branch September 12, 2022 10:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Breaking change A change to the API that requires a major release. Part of "Changed" section in changelog Rust Related to the core Rust code. Becomes part of the Rust changelog.
Projects
Development

Successfully merging this pull request may close these issues.

2 participants