Sync with upstream (aptos-cli-v4.0.0) #60
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
Devnet merge
Make `services` pub
Let developers configure their VSCode without turning this into commit fests and battles of preferences.
chore: remove VSCode configuration from git
Check the tx events have been removed. This should include new block events, but we can't directly test that because the test block data generator used in aptos-db does not generate BlockMetadata transactions. Make variable naming more consistent in the tests.
…es-and-reorder aptos-db: `revert_commit` reordering and improvements
…it-config Change CLI init config branding from Aptos to Movement
Add finalized_block_height method for FinalityView, retrieving a previously set block height. This is needed for sanity checks.
…es-update Services Update
…eight-getter `finalized_block_height` getter for `FinalityView`
Remove all upstream GitHub workflows, save the one we're going to use with adaptations.
…orkflows Clean up .github/workflows
Replaced with instruction during choose network prompt.
Fix: Recommend --skip-faucet flag on movement init with testnet and link to faucet after creating profile
We were returning ` return Err(
"For testnet, start over and run movement init --skip-faucet");`
which compiled locally for me, but I noticed it caused CI to fail [this job](movementlabsxyz/movement#506) with error
```
Compiling aptos-node v0.0.0-main (/home/runner/actions-runner/_work/movement/movement/aptos-core/aptos-node)
error[E0308]: mismatched types
--> crates/aptos/src/common/init.rs:130:24
|
130 | return Err("For testnet, start over and run movement init --skip-faucet");
| --- ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `CliError`, found `&str`
| |
| arguments to this enum variant are incorrect
|
help: the type constructed contains `&'static str` due to the type of the argument passed
--> crates/aptos/src/common/init.rs:130:20
|
130 | return Err("For testnet, start over and run movement init --skip-faucet");
| ^^^^-------------------------------------------------------------^
| |
| this argument influences the type of `Err`
```
It looks like we need to specify the arg type, hence this fix.
Co-authored-by: Mikhail Zabaluev <[email protected]>
…t-fix Fix error return format in init.rs
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: #54 #55
As previously with this kind of PRs, comparing against upstream's merge point.
To be merged into
movementwhen ready.