Sync With Upstream: fixups, updating the CLI to 3.5.0 #43
Conversation
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
When syncing with upstream, merge conflicts of the "changed by them/ removed by us" kind have been resolved by updating the conflicting files to the latest upstream revision. This only partially recovered the source for crates that have been removed for Monza. Restore the crates fully. Some of the changes made for Monza are overwritten from upstream to reduce the delta and allow resurrecting some crates erased in the work for Monza: - ring dependency removal from aptos-crypto, moving the noise implementation to aptos-network; - removal of tokio synchronization slots from aptos-types. This means this branch no longer supports Monza, and those changes would need to be re-applied if the Monza direction is taken again.
The storage interface used by tests added by Movement needed to be updated to the upstream changes.
Pull the README from upstream and remove the duplicate workspace entry.
mzabaluev
changed the title
|
Yes, working. Looks reasonable. |
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Resolves #41
Description
Fixes build failures in #30 with mainly the following changes:
mainby resolving merge conflicts in a mechanical way.monzabranch:movementCLI with upstream changes up to aptos CLI 3.5.0.Testing
cargo check -p movementcargo checkcargo test -p aptos-storage-interface