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

Fix token rpc-client methods (bp #11361) #11362

Merged
merged 2 commits into from
Aug 4, 2020
Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 4, 2020

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

Cherry-pick of d0144ce has failed:

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

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

Changes to be committed:

	modified:   client/src/rpc_client.rs
	modified:   docs/src/apps/jsonrpc-api.md

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

	both modified:   core/src/rpc.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/

* Convert None to error in parse_keyed_accounts

* Allow encoding configuration in getTokenAccounts methods

(cherry picked from commit d0144ce)

# Conflicts:
#	core/src/rpc.rs
@mergify mergify bot added the conflicts label Aug 4, 2020
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Aug 4, 2020
@codecov
Copy link

codecov bot commented Aug 4, 2020

Codecov Report

Merging #11362 into v1.2 will increase coverage by 0.0%.
The diff coverage is 55.5%.

@@          Coverage Diff           @@
##            v1.2   #11362   +/-   ##
======================================
  Coverage   82.3%    82.3%           
======================================
  Files        310      310           
  Lines      74445    74456   +11     
======================================
+ Hits       61288    61301   +13     
+ Misses     13157    13155    -2     

@mergify mergify bot merged commit 5871462 into v1.2 Aug 4, 2020
@mergify mergify bot deleted the mergify/bp/v1.2/pr-11361 branch August 4, 2020 18:40
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant