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

Adapt RpcClient to recent token method changes (bp #11519) #11547

Merged
merged 2 commits into from
Aug 11, 2020

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 11, 2020

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

Cherry-pick of 17645ee has failed:

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

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

Changes to be committed:

	modified:   account-decoder/src/parse_token.rs

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

	both modified:   client/src/rpc_client.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/

* Avoid skip_serializing_if since that breaks deserialization

* Adapt RpcClient to recent token method changes

(cherry picked from commit 17645ee)

# Conflicts:
#	client/src/rpc_client.rs
@mergify mergify bot added conflicts automerge Merge this Pull Request automatically once CI passes labels Aug 11, 2020
@mergify
Copy link
Contributor Author

mergify bot commented Aug 11, 2020

automerge label removed due to a CI failure

@mergify mergify bot removed the automerge Merge this Pull Request automatically once CI passes label Aug 11, 2020
@CriesofCarrots CriesofCarrots force-pushed the mergify/bp/v1.2/pr-11519 branch from 7314d5f to 1c1513b Compare August 11, 2020 16:35
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Aug 11, 2020
@codecov
Copy link

codecov bot commented Aug 11, 2020

Codecov Report

Merging #11547 into v1.2 will increase coverage by 0.1%.
The diff coverage is 31.5%.

@@           Coverage Diff            @@
##            v1.2   #11547     +/-   ##
========================================
+ Coverage   81.8%    81.9%   +0.1%     
========================================
  Files        319      319             
  Lines      76120    76032     -88     
========================================
+ Hits       62312    62320      +8     
+ Misses     13808    13712     -96     

@mergify mergify bot merged commit 60c91d3 into v1.2 Aug 11, 2020
@mergify mergify bot deleted the mergify/bp/v1.2/pr-11519 branch August 11, 2020 18:00
@mvines
Copy link
Member

mvines commented Aug 14, 2020

@CriesofCarrots - thanks for helping this PR through

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
automerge Merge this Pull Request automatically once CI passes conflicts
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant