Wallet Create CLI manager integration #11331
Merged
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
* Wallet recover CLI Manager migration * bazel run //:gazelle -- fix * fix lint and build errors * add TODO to remove duplicate code Co-authored-by: james-prysm <90280386+james-prysm@users.noreply.github.com> Co-authored-by: Radosław Kapka <rkapka@wp.pl>
* Wallet recover CLI Manager migration * bazel run //:gazelle -- fix * fix lint and build errors * add TODO to remove duplicate code Co-authored-by: james-prysm <90280386+james-prysm@users.noreply.github.com> Co-authored-by: Radosław Kapka <rkapka@wp.pl>
james-prysm
reviewed
Aug 29, 2022
cmd/validator/wallet/create.go
Outdated
| } | ||
|
|
||
| // ExtractWalletCreationConfigFromCli prompts the user for wallet creation input. | ||
| func ExtractWalletCreationConfigFromCli(cliCtx *cli.Context, keymanagerKind keymanager.Kind) ([]accounts.Option, error) { |
There was a problem hiding this comment.
is there a better name for this now that you have refactored it to return account options?
other code is super nice to see, not seeing the cli used in the accounts package looks great!
There was a problem hiding this comment.
nice, good point! I changed it to ConstructCLIManagerOpts!
thanks!
james-prysm
approved these changes
Sep 2, 2022
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.
What type of PR is this?
Refactor/code health
What does this PR do? Why is it needed?
This PR addresses the wallet create functionality and refactors it as part of #9883. It follows up on #10554, #10686, #10824, #10841, #10890, #11136, #11278 which do similar migration for the accounts list, delete, backup, exit, import and wallet edit, recover.
This is a bit of a bigger PR, but I think closes out the refactor nicely!!!
cmd/validator/accounts/{backup_test.go, delete_test.go, exit_test.go, import_test.go}. These files all made use of theaccounts.CreateWalletWithKeymanagerfunction, which was in theaccounts/wallet_create.gofile. Since we are moving the wallet creation functionality to a member function on a accounts CLI manager object, we need to replace each of these function calls with constructing a new CLI manager and callingacc.WalletCreate. We construct each of them just with the wallet directory, the keymanager type, and the password.cmd/validator/accounts/import.go. This was a little tricky, because this file made use of theExtractWalletCreationConfigFromClifunctions which was also defined in thevalidator/accountspackage. However, we were aiming at removing all the clictx objects from that directory. Additionally, this file only used the function to extract the wallet dir and password (rather than needing all of the other logic fromExtractWalletCreationConfigFromCli. So I created a new functionExtractWalletDirPasswordwhich just extracts the wallet dir and password from the CLI. This function is also used in thecmd/validator/wallet/create_test.go.cmd/validator/wallet/create.go. This is a new file that parses the CLI flags and constructs the CLI manager with the appropriate options. On the CLI manager, it simply calls theWalletCreatemethod with thecontext.Context(no longer a need for thecli.Context). I refactoredExtractWalletCreationConfigFromClito return a slice ofOptionobjects that we use to construct the CLI manager.cmd/validator/wallet/create_test.go. This is just a moving of thevalidator/accounts/wallet_create_test.gofile into thecmd/validator/walletdirectory.validator/accounts/cli_manager.goandvalidator/accounts/cli_options.go. I added two new options that the wallet create function depends on:keymanagerKind, skipMnemonicConfirm.validator/accounts/wallet_create.go. This is where we see the benefit of this refactor. We chop out all the CLI parsing stuff from theCreateAndSaveWalletClifunction, and make it theWalletCreatemethod on the AccountsCLIManager pointer receiver.Which issues(s) does this PR fix?
This is part of the keymanager refactor defined in #9883.
It is also described in #10339.