Finschia / finschia-sdk

A framework for building blockchains based Finschia Mainnet that is forked from cosmos-sdk
Apache License 2.0
63 stars 30 forks source link

fix: correctly coalesce coins even with repeated denominations(backport cosmos/cosmos-sdk#13265) #1313

Closed jaeseung-bae closed 4 months ago

jaeseung-bae commented 4 months ago

Description

Motivation and context

How has this been tested?

Screenshots (if appropriate):

Checklist:

CLAassistant commented 4 months ago

CLA assistant check
All committers have signed the CLA.

codecov[bot] commented 4 months ago

Codecov Report

All modified and coverable lines are covered by tests :white_check_mark:

Project coverage is 70.41%. Comparing base (9105ff4) to head (1c7ae0d).

Additional details and impacted files [![Impacted file tree graph](https://app.codecov.io/gh/Finschia/finschia-sdk/pull/1313/graphs/tree.svg?width=650&height=150&src=pr&token=m16qfzIPO7&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=Finschia)](https://app.codecov.io/gh/Finschia/finschia-sdk/pull/1313?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=Finschia) ```diff @@ Coverage Diff @@ ## main #1313 +/- ## ========================================== - Coverage 70.42% 70.41% -0.01% ========================================== Files 643 643 Lines 54761 54746 -15 ========================================== - Hits 38563 38552 -11 + Misses 14024 14020 -4 Partials 2174 2174 ``` | [Files](https://app.codecov.io/gh/Finschia/finschia-sdk/pull/1313?dropdown=coverage&src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=Finschia) | Coverage Δ | | |---|---|---| | [types/coin.go](https://app.codecov.io/gh/Finschia/finschia-sdk/pull/1313?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=Finschia#diff-dHlwZXMvY29pbi5nbw==) | `95.62% <100.00%> (+0.93%)` | :arrow_up: | | [x/auth/vesting/types/vesting\_account.go](https://app.codecov.io/gh/Finschia/finschia-sdk/pull/1313?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=Finschia#diff-eC9hdXRoL3Zlc3RpbmcvdHlwZXMvdmVzdGluZ19hY2NvdW50Lmdv) | `86.82% <ø> (ø)` | | | [x/gov/types/params.go](https://app.codecov.io/gh/Finschia/finschia-sdk/pull/1313?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=Finschia#diff-eC9nb3YvdHlwZXMvcGFyYW1zLmdv) | `7.05% <ø> (ø)` | |
Mdaiki0730 commented 4 months ago

Please resolve the conflict.

Mdaiki0730 commented 4 months ago

It looks like the cla signature is missing. Could you please sign it?

jaeseung-bae commented 4 months ago

It looks like the cla signature is missing. Could you please sign it?

I've signed CLA. I think it's because of cherry-pick from upstream. Please ignore it.

Mdaiki0730 commented 4 months ago

I've signed CLA. I think it's because of cherry-pick from upstream. Please ignore it.

Won't ignoring it block the merge? Since cherry-pick has made it co-author, how about making only @jaeseung-bae 's commit?

jaeseung-bae commented 4 months ago

I've signed CLA. I think it's because of cherry-pick from upstream. Please ignore it.

Won't ignoring it block the merge? Since cherry-pick has made it co-author, how about making only @jaeseung-bae 's commit?

I was able to merge without sign from co-author. I'll try to leave my commit only.