Skip to content
This repository was archived by the owner on Jan 22, 2025. It is now read-only.

validator/ cleanup (bp #12340)#12352

Merged
mergify[bot] merged 3 commits intov1.3from
mergify/bp/v1.3/pr-12340
Sep 19, 2020
Merged

validator/ cleanup (bp #12340)#12352
mergify[bot] merged 3 commits intov1.3from
mergify/bp/v1.3/pr-12340

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented Sep 19, 2020

This is an automated backport of pull request #12340 done by Mergify

Cherry-pick of 1a03afc has failed:

On branch mergify/bp/v1.3/pr-12340
Your branch is up to date with 'origin/v1.3'.

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

Changes to be committed:

	modified:   local-cluster/src/local_cluster.rs
	modified:   validator/Cargo.toml
	modified:   validator/src/main.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)

	both modified:   core/src/validator.rs

Cherry-pick of 208dd1d has failed:

On branch mergify/bp/v1.3/pr-12340
Your branch is ahead of 'origin/v1.3' by 1 commit.
  (use "git push" to publish your local commits)

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

Changes to be committed:

	modified:   cli/tests/deploy.rs
	modified:   cli/tests/nonce.rs
	modified:   cli/tests/request_airdrop.rs
	modified:   cli/tests/stake.rs
	modified:   cli/tests/transfer.rs
	modified:   cli/tests/vote.rs
	modified:   core/src/lib.rs
	new file:   core/src/test_validator.rs
	modified:   core/tests/client.rs
	modified:   core/tests/rpc.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)

	both modified:   core/src/validator.rs
	both modified:   tokens/tests/commands.rs

To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/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 simulator.

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

(cherry picked from commit 1a03afc)

# Conflicts:
#	core/src/validator.rs
(cherry picked from commit 208dd1d)

# Conflicts:
#	core/src/validator.rs
#	tokens/tests/commands.rs
@mergify mergify Bot added conflicts automerge Merge this Pull Request automatically once CI passes labels Sep 19, 2020
@mvines mvines removed the conflicts label Sep 19, 2020
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Sep 19, 2020

automerge label removed due to a CI failure

@mergify mergify Bot removed the automerge Merge this Pull Request automatically once CI passes label Sep 19, 2020
@mvines mvines force-pushed the mergify/bp/v1.3/pr-12340 branch from 8fabf65 to a9d2f91 Compare September 19, 2020 19:11
@mergify mergify Bot added the automerge Merge this Pull Request automatically once CI passes label Sep 19, 2020
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Sep 19, 2020

automerge label removed due to a CI failure

@mergify mergify Bot removed the automerge Merge this Pull Request automatically once CI passes label Sep 19, 2020
@mvines mvines force-pushed the mergify/bp/v1.3/pr-12340 branch from a9d2f91 to 11c1195 Compare September 19, 2020 21:40
@mergify mergify Bot added the automerge Merge this Pull Request automatically once CI passes label Sep 19, 2020
@codecov
Copy link
Copy Markdown

codecov Bot commented Sep 19, 2020

Codecov Report

Merging #12352 into v1.3 will increase coverage by 0.0%.
The diff coverage is 15.0%.

@@          Coverage Diff           @@
##            v1.3   #12352   +/-   ##
======================================
  Coverage   82.1%    82.2%           
======================================
  Files        338      339    +1     
  Lines      80183    80191    +8     
======================================
+ Hits       65901    65917   +16     
+ Misses     14282    14274    -8     

@mergify mergify Bot merged commit a26e1f6 into v1.3 Sep 19, 2020
@mergify mergify Bot deleted the mergify/bp/v1.3/pr-12340 branch September 19, 2020 22:45
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

automerge Merge this Pull Request automatically once CI passes

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant