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

Return token amounts as floats (bp #11370) #11378

Merged
merged 2 commits into from
Aug 5, 2020
Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 5, 2020

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

Cherry-pick of 86e3f96 has failed:

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

You are currently cherry-picking commit 86e3f96f1.
  (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
	modified:   client/src/rpc_client.rs
	modified:   client/src/rpc_response.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/

* Return token amounts as floats

* Floating-point equality

* Return float and raw token amounts

* Fix decimals and token rpcs for native-mint tokens

* Fixup docs and review comments

(cherry picked from commit 86e3f96)

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

mergify bot commented Aug 5, 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 5, 2020
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Aug 5, 2020
@codecov
Copy link

codecov bot commented Aug 5, 2020

Codecov Report

Merging #11378 into v1.2 will increase coverage by 0.0%.
The diff coverage is 85.3%.

@@          Coverage Diff           @@
##            v1.2   #11378   +/-   ##
======================================
  Coverage   82.2%    82.2%           
======================================
  Files        310      310           
  Lines      74514    74556   +42     
======================================
+ Hits       61288    61325   +37     
- Misses     13226    13231    +5     

@mergify mergify bot merged commit 80525ac into v1.2 Aug 5, 2020
@mergify mergify bot deleted the mergify/bp/v1.2/pr-11370 branch August 5, 2020 08:31
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