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

refactor: auto-set timeout-commit to 4s for faster block times (backport #7180) #7183

Merged
merged 2 commits into from
Dec 23, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 22, 2023

This is an automatic backport of pull request #7180 done by Mergify.


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

@mergify mergify bot assigned p0mvn Dec 22, 2023
@p0mvn p0mvn force-pushed the mergify/bp/v21.x/pr-7180 branch from e27bc5b to 53c69a3 Compare December 22, 2023 23:34
Comment on lines 306 to 312
// configure the viper instance to parse home flags
if err := serverCtx.Viper.BindPFlags(cmd.Flags()); err != nil {
return err
}
if err := serverCtx.Viper.BindPFlags(cmd.PersistentFlags()); err != nil {
return err
}
Copy link
Member

Choose a reason for hiding this comment

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

This seems to be the cause of failures but it is needed to support custom home

Copy link
Member

@czarcas7ic czarcas7ic left a comment

Choose a reason for hiding this comment

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

For manual testing, did we ensure a config with a custom value not related time timeouts is not overwritten? I don't see why that would happen when looking at this code, but just to be safe.

cmd/osmosisd/cmd/root.go Outdated Show resolved Hide resolved
@p0mvn
Copy link
Member

p0mvn commented Dec 23, 2023

For manual testing, did we ensure a config with a custom value not related time timeouts is not overwritten? I don't see why that would happen when looking at this code, but just to be safe.

Tested just now. LGTM

@p0mvn p0mvn force-pushed the mergify/bp/v21.x/pr-7180 branch from be95530 to fe60fd6 Compare December 23, 2023 01:17
@p0mvn p0mvn merged commit d321508 into v21.x Dec 23, 2023
1 check passed
@p0mvn p0mvn deleted the mergify/bp/v21.x/pr-7180 branch December 23, 2023 01:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants