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

Add fine-grained control of time (backport #88) #90

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Nov 27, 2023

This is an automatic backport of pull request #88 done by Mergify.
Cherry-pick of 7edb4c1 has failed:

On branch mergify/bp/v0.38.x/pr-88
Your branch is up to date with 'origin/v0.38.x'.

You are currently cherry-picking commit 7edb4c1.
  (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:   .gitignore
	deleted:    Dockerfile-test
	new file:   Dockerfile.test
	modified:   Makefile
	modified:   README.md
	modified:   cometmock/abci_client/client.go
	new file:   cometmock/abci_client/time_handler.go
	modified:   cometmock/main.go
	modified:   cometmock/rpc_server/routes.go
	new file:   cometmock/utils/txs.go
	new file:   e2e-tests/.gitignore
	new file:   e2e-tests/local-testnet-singlechain-restart.sh
	new file:   e2e-tests/local-testnet-singlechain-setup.sh
	new file:   e2e-tests/local-testnet-singlechain-start.sh
	new file:   e2e-tests/test_utils.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   e2e-tests/local-testnet-singlechain.sh
	both modified:   e2e-tests/main_test.go

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


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

* Start implementing auto-include-tx flag

* Split testnet initialization and run

* Add script to restart testnet from beginning

* Start implementing auto-include-tx flag

* Delete backup directory before taking backup

* Uncomment killing processes with app binary

* Rewrite TxQueue

* Fix fire events method

* Implement tx filtering and rechecks

* Start implementing basic test for Tx effect

* Ensure the script is not blocking

* Rename Dockerfile-test to Dockerfile.test

* Add Contains method

* Remove initial setup from Dockerfile

* Remove sleep and add -p 1

* Use big.Int for community pool size

* Use testnet restart in tests instead of a new setup each time

* Add cometmock args to be taken by startup script

* Pull time handling into TimeHandler class

* Fix CheckTx and time

* Add test cases for AutoTx and block production

* Add time control to README

* Fix auto-tx flag

* Add test for starting timestamp

* Add test for starting time=system time

(cherry picked from commit 7edb4c1)

# Conflicts:
#	e2e-tests/local-testnet-singlechain.sh
#	e2e-tests/main_test.go
@mergify mergify bot added the conflicts label Nov 27, 2023
@mergify mergify bot deleted the mergify/bp/v0.38.x/pr-88 branch November 27, 2023 08:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant