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.

Sign up for GitHub

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

Jump to bottom

fix: --dry-run not working when using tx command #11558

Merged
merged 8 commits into from
Apr 11, 2022
Merged

fix: --dry-run not working when using tx command #11558

merged 8 commits into from
Apr 11, 2022

Conversation

julienrbrt
Copy link
Member

@julienrbrt julienrbrt commented Apr 6, 2022 •
edited
Loading

Description

Closes: #11149

  • Let --dry-run not use the local keyring
  • Fixes for required flags not shown
  • Make --generate-only behavior consistent

Author Checklist

All items are required. Please add a note to the item if the item is not applicable and
please add links to any relevant follow up issues.

I have...

  • included the correct type prefix in the PR title
  • added ! to the type prefix if API or client breaking change
  • targeted the correct branch (see PR Targeting)
  • provided a link to the relevant issue or specification
  • followed the guidelines for building modules
  • included the necessary unit and integration tests
  • added a changelog entry to CHANGELOG.md
  • included comments for documenting Go code
  • updated the relevant documentation or specification
  • reviewed "Files changed" and left comments if necessary
  • confirmed all CI checks have passed

Reviewers Checklist

All items are required. Please add a note if the item is not applicable and please add
your handle next to the items reviewed if you only reviewed selected items.

I have...

  • confirmed the correct type prefix in the PR title
  • confirmed ! in the type prefix if API or client breaking change
  • confirmed all author checklist items have been addressed
  • reviewed state machine logic
  • reviewed API design and naming
  • reviewed documentation is accurate
  • reviewed tests and test coverage
  • manually tested (if applicable)

@julienrbrt julienrbrt linked an issue Apr 6, 2022 that may be closed by this pull request
--dry-run not worked when use tx command #11149
Closed
4 tasks
julienrbrt
julienrbrt commented Apr 6, 2022
View reviewed changes
client/context.go Outdated Show resolved Hide resolved
julienrbrt
julienrbrt commented Apr 7, 2022
View reviewed changes
client/context.go
@@ -365,7 +374,7 @@ func GetFromFields(kr keyring.Keyring, from string, genOnly bool) (sdk.AccAddres

// NewKeyringFromBackend gets a Keyring object from a backend
func NewKeyringFromBackend(ctx Context, backend string) (keyring.Keyring, error) {
if ctx.GenerateOnly || ctx.Simulate {
if ctx.Simulate {
Copy link
Member Author

@julienrbrt julienrbrt Apr 7, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

This is removed because --generate-only should be able to read the key ring (for this feature #9838) so it should not be overwritten.
Moreover this was actually never true as NewKeyringFromBackend was called before that the generate flag was read by readTxCommandFlags:

@julienrbrt julienrbrt marked this pull request as ready for review April 7, 2022 10:42
@julienrbrt julienrbrt requested a review from aaronc as a code owner April 7, 2022 10:42
@julienrbrt julienrbrt changed the title cli: fix --dry-run not working when using tx command fix: fix --dry-run not working when using tx command Apr 8, 2022
@julienrbrt julienrbrt changed the title fix: fix --dry-run not working when using tx command fix: --dry-run not working when using tx command Apr 8, 2022
anilcse
anilcse approved these changes Apr 11, 2022
View reviewed changes
Copy link
Collaborator

@anilcse anilcse left a comment

Choose a reason for hiding this comment

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

lgtm

alexanderbez
alexanderbez reviewed Apr 11, 2022
View reviewed changes
Copy link
Contributor

@alexanderbez alexanderbez left a comment

Choose a reason for hiding this comment

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

Looks great @julienrbrt! Just one small comment. Love the tests too.

client/cmd.go
@@ -248,7 +248,7 @@ func readTxCommandFlags(clientCtx Context, flagSet *pflag.FlagSet) (Context, err

if clientCtx.From == "" || flagSet.Changed(flags.FlagFrom) {
from, _ := flagSet.GetString(flags.FlagFrom)
fromAddr, fromName, keyType, err := GetFromFields(clientCtx.Keyring, from, clientCtx.GenerateOnly)
fromAddr, fromName, keyType, err := GetFromFields(clientCtx, clientCtx.Keyring, from)
Copy link
Contributor

Choose a reason for hiding this comment

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

So I dont think there's a need to pass both clientCtx and clientCtx.Keyring, we might as well just pass clientCtx and get the keyring from that in GetFromFields.

Copy link
Member Author

Choose a reason for hiding this comment

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

Correct, however the keyring used is not always took from the context ⇾ https://github.com/cosmos/cosmos-sdk/pull/11558/files#diff-eb0834c140c5c40cca7f39ab9d334536d3529642fce425754b8608c5e79b6430R110

Copy link
Contributor

Choose a reason for hiding this comment

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

True. You can always call clientCtx.WithKeyring prior to calling it, but that's a good point. I'm indifferent here.

client/context.go Outdated Show resolved Hide resolved
@julienrbrt @alexanderbez
spacing
10bf7ca 
Co-authored-by: Aleksandr Bezobchuk <[email protected]>
@julienrbrt julienrbrt added the A:automerge Automatically merge PR once all prerequisites pass. label Apr 11, 2022
@mergify mergify bot merged commit 4f1cc3a into master Apr 11, 2022
@mergify mergify bot deleted the 11149-dry-run-not-worked-when-use-tx-command branch April 11, 2022 15:50
@amaury1093 amaury1093 mentioned this pull request May 23, 2022
Closed
72 tasks
@zakir-code zakir-code mentioned this pull request Jul 26, 2022
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@alexanderbez alexanderbez alexanderbez approved these changes

@anilcse anilcse anilcse approved these changes

@aaronc aaronc Awaiting requested review from aaronc

Assignees

@amaury1093 amaury1093

@blushi blushi

Labels
A:automerge Automatically merge PR once all prerequisites pass. C:CLI C:x/auth C:x/bank C:x/feegrant
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

--dry-run not worked when use tx command
5 participants
@julienrbrt @anilcse @alexanderbez @amaury1093 @blushi