Call order and bitAsset related code refactory #1306
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
pmconrad
previously approved these changes
Sep 9, 2018
libraries/chain/db_market.cpp
Outdated
| modify( borrower_statistics, [&]( account_statistics_object& b ){ | ||
| if( collateral_freed.valid() && collateral_freed->amount > 0 && collateral_freed->asset_id == asset_id_type() ) | ||
| b.total_core_in_orders -= collateral_freed->amount; | ||
| modify( get_account_stats_by_owner(order.borrower), [&collateral_freed,&pays]( account_statistics_object& b ){ |
There was a problem hiding this comment.
Only call modify if pays.asset_id == asset_id_type() (this also implies collateral_freed.asset_id == core if collateral_freed is defined)
libraries/chain/db_market.cpp
Outdated
| }); | ||
|
|
||
| const account_object& borrower = order.borrower(*this); | ||
| // adjust balance and/or account statistics | ||
| if( collateral_freed.valid() || pays.asset_id == asset_id_type() ) |
There was a problem hiding this comment.
Add condition && collateral_freed.amount != 0?
There was a problem hiding this comment.
Actually the code is a bit messy here for potential better performance.
- The
ORcheck here is for only updating the object once when possible; - in most cases
collateral_freed.amountis non-zero so it doesn't make much sense to add a check;- in addition,
adjust_balance()will check if the delta is zero;
- in addition,
- actually there is a chance that we don't need to execute the
modify, since actuallypays.asset_idandcollateral_freed->asset_idare the same, that means if we don't need to updatetotal_core_in_ordersdue topays, we won't need to update it due tocollateral_freed. I will improve this. (Just saw your comment above)
and added comment in call_order_update_evaluator::do_evaluate()
|
@pmconrad please review again. Thanks a lot. |
pmconrad
approved these changes
Sep 10, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
While working on #1270, I ended up refactoring quite some code. Since the change is getting large, for easier code review in the future, I'm now creating this PR.