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

Fix serialization of parameters in RpcClient::get_block_production_with_config (backport #18998) #19000

Merged
merged 2 commits into from
Jul 31, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 30, 2021

This is an automatic backport of pull request #18998 done by Mergify.
Cherry-pick of 58f3952 has failed:

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

You are currently cherry-picking commit 58f395257.
  (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:   client/src/rpc_client.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   client/src/mock_sender.rs

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.io/

…th_config (#18998)

Params must be an array or null.

(cherry picked from commit 58f3952)

# Conflicts:
#	client/src/mock_sender.rs
@mergify mergify bot added conflicts automerge Merge this Pull Request automatically once CI passes labels Jul 30, 2021
@solana-grimes solana-grimes removed the automerge Merge this Pull Request automatically once CI passes label Jul 30, 2021
@solana-grimes
Copy link
Contributor

😱 New commits were pushed while the automerge label was present.

@CriesofCarrots CriesofCarrots added the automerge Merge this Pull Request automatically once CI passes label Jul 30, 2021
@mergify mergify bot removed the automerge Merge this Pull Request automatically once CI passes label Jul 30, 2021
@mergify
Copy link
Contributor Author

mergify bot commented Jul 30, 2021

automerge label removed due to a CI failure

@mergify mergify bot added automerge Merge this Pull Request automatically once CI passes and removed automerge Merge this Pull Request automatically once CI passes labels Jul 30, 2021
@mergify
Copy link
Contributor Author

mergify bot commented Jul 30, 2021

automerge label removed due to a CI failure

@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Jul 31, 2021
@mergify
Copy link
Contributor Author

mergify bot commented Jul 31, 2021

automerge label removed due to a CI failure

@mergify mergify bot added automerge Merge this Pull Request automatically once CI passes and removed automerge Merge this Pull Request automatically once CI passes labels Jul 31, 2021
@mergify
Copy link
Contributor Author

mergify bot commented Jul 31, 2021

automerge label removed due to a CI failure

@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Jul 31, 2021
@codecov
Copy link

codecov bot commented Jul 31, 2021

Codecov Report

Merging #19000 (6a0363e) into v1.7 (8934a39) will increase coverage by 0.0%.
The diff coverage is 100.0%.

@@           Coverage Diff           @@
##             v1.7   #19000   +/-   ##
=======================================
  Coverage    82.3%    82.3%           
=======================================
  Files         436      436           
  Lines      123156   123178   +22     
=======================================
+ Hits       101360   101390   +30     
+ Misses      21796    21788    -8     

@mergify mergify bot merged commit 0707290 into v1.7 Jul 31, 2021
@mergify mergify bot deleted the mergify/bp/v1.7/pr-18998 branch July 31, 2021 02:00
@t-nelson
Copy link
Contributor

🎉

@CriesofCarrots
Copy link
Contributor

Phew, finally! Thanks for giving the one a kick, @t-nelson

@brooksprumo brooksprumo mentioned this pull request Aug 23, 2021
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 conflicts
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants