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

feat: override timeout commit via --timeout-commit (backport #4103) #4114

Merged
merged 3 commits into from
Dec 16, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 12, 2024

Closes #4080

Testing

  1. ./scripts/single-node.sh now makes blocks faster 🎊
  2. ./scripts/arabica.sh throws an error if you try to add --timeout-commit 1s
Error: the --timeout-commit flag was used on arabica-11 but it is unsupported on public networks: arabica-11, mocha-4, celestia. The --timeout-commit flag should only be used on private testnets.

Closes #4080

## Testing

1. `./scripts/single-node.sh` now makes blocks faster 🎊
2. `./scripts/arabica.sh` throws an error if you try to add
`--timeout-commit 1s`

```
Error: the --timeout-commit flag was used on arabica-11 but it is unsupported on public networks: arabica-11, mocha-4, celestia. The --timeout-commit flag should only be used on private testnets.
```

(cherry picked from commit d20916c)

# Conflicts:
#	cmd/celestia-appd/cmd/start.go
#	scripts/single-node.sh
@mergify mergify bot added the conflicts label Dec 12, 2024
@mergify mergify bot requested a review from a team as a code owner December 12, 2024 13:58
@mergify mergify bot requested a review from cmwaters December 12, 2024 13:58
Copy link
Contributor Author

mergify bot commented Dec 12, 2024

Cherry-pick of d20916c has failed:

On branch mergify/bp/v3.x/pr-4103
Your branch is up to date with 'origin/v3.x'.

You are currently cherry-picking commit d20916c7.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   Makefile
	modified:   README.md
	modified:   app/app.go
	modified:   app/app_test.go
	modified:   app/test/upgrade_test.go
	modified:   cmd/celestia-appd/cmd/app_exporter.go
	modified:   cmd/celestia-appd/cmd/app_server.go
	modified:   cmd/celestia-appd/cmd/root.go
	modified:   pkg/appconsts/chain_ids.go
	modified:   test/tokenfilter/setup.go
	modified:   test/util/malicious/app.go
	modified:   test/util/test_app.go
	modified:   test/util/testnode/config.go
	modified:   tools/chainbuilder/integration_test.go
	modified:   tools/chainbuilder/main.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   cmd/celestia-appd/cmd/start.go
	both modified:   scripts/single-node.sh

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot requested a review from evan-forbes December 12, 2024 13:58
@github-actions github-actions bot added the bot item was created by a bot label Dec 12, 2024
@rootulp rootulp self-assigned this Dec 12, 2024
@rootulp rootulp marked this pull request as draft December 12, 2024 18:06
@rootulp rootulp marked this pull request as ready for review December 16, 2024 14:45
@rootulp rootulp requested a review from liamsi as a code owner December 16, 2024 14:45
Copy link
Collaborator

@rootulp rootulp left a comment

Choose a reason for hiding this comment

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

This is technically Go API breaking b/c app.New() has an additional parameter.

Copy link
Contributor

@cmwaters cmwaters left a comment

Choose a reason for hiding this comment

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

This is technically Go API breaking b/c app.New() has an additional parameter.

You could probably do this in a non-breaking way by utilising baseapp options, but I think we can allow this to slide - I can't imagine there are too many users of the app.New() but good to avoid this if we can in the future

@rootulp rootulp merged commit 29afcf6 into v3.x Dec 16, 2024
28 of 29 checks passed
@rootulp rootulp deleted the mergify/bp/v3.x/pr-4103 branch December 16, 2024 15:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bot item was created by a bot
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants