feat: implement draw_credit limit checks and utilized amount update#85
Open
Tola-byte wants to merge 8 commits intoCreditra:mainfrom
Open
feat: implement draw_credit limit checks and utilized amount update#85Tola-byte wants to merge 8 commits intoCreditra:mainfrom
Tola-byte wants to merge 8 commits intoCreditra:mainfrom
Conversation
Contributor
|
resolve the conflicts |
Contributor
|
resolve the conflict |
Contributor
Author
|
on it |
Author
|
@greatest0fallt1me please merge in. |
Author
Author
|
@greatest0fallt1me please merge this in, thanks. |
Contributor
|
@Tola-byte please resolve the conflicts |
Author
|
okay, you need to let contributors know they don't need to push test_snapshots, it causes unnecessary merge conflicts. |
Author
|
@greatest0fallt1me PLEASE MERGE THIS IN FIRST BEFORE ANYONE PUSHES IN SNAPSHOTS AND AFFECT EVERYONE, THANK YOU. |
Contributor
|
please resolve the conflicts |
Author
|
@greatest0fallt1me bro what is the problem man, I said it explicitly, merge mine in first so the test snapshots gets fixed and dont affect others, you went ahead to merge others in without doing mine, and mine contains the fix so it gets easier for everyone, we've been doing this for close 3 days now, come on man. this isn't fair at all |
Author
|
I'd fix countless times, you'd ignore, then merge others in before mine, and keep telling me to fix conflicts always. not fair. |
# Conflicts: # contracts/credit/src/lib.rs # contracts/credit/test_snapshots/test/test_close_credit_line_admin_force_close_with_utilization.1.json # contracts/credit/test_snapshots/test/test_close_credit_line_borrower_rejected_when_utilized_nonzero.1.json # contracts/credit/test_snapshots/test/test_default_credit_line.1.json # contracts/credit/test_snapshots/test/test_default_credit_line_unauthorized.1.json # contracts/credit/test_snapshots/test/test_draw_credit.1.json # contracts/credit/test_snapshots/test/test_draw_credit_at_full_utilization.1.json # contracts/credit/test_snapshots/test/test_draw_credit_exceeds_limit.1.json # contracts/credit/test_snapshots/test/test_draw_credit_negative_amount.1.json # contracts/credit/test_snapshots/test/test_draw_credit_updates_utilized.1.json # contracts/credit/test_snapshots/test/test_draw_credit_zero_amount.1.json # contracts/credit/test_snapshots/test/test_full_lifecycle.1.json # contracts/credit/test_snapshots/test/test_lifecycle_transitions.1.json # contracts/credit/test_snapshots/test/test_multiple_borrowers.1.json # contracts/credit/test_snapshots/test/test_reentrancy_guard_cleared_after_draw.1.json # contracts/credit/test_snapshots/test/test_reentrancy_guard_cleared_after_repay.1.json # contracts/credit/test_snapshots/test/test_repay_credit_full.1.json # contracts/credit/test_snapshots/test/test_repay_credit_invalid_amount_negative.1.json # contracts/credit/test_snapshots/test/test_repay_credit_invalid_amount_zero.1.json # contracts/credit/test_snapshots/test/test_repay_credit_nonexistent_line.1.json # contracts/credit/test_snapshots/test/test_repay_credit_overpayment.1.json # contracts/credit/test_snapshots/test/test_repay_credit_partial.1.json # contracts/credit/test_snapshots/test/test_repay_credit_reduces_utilized_and_emits_event.1.json # contracts/credit/test_snapshots/test/test_repay_credit_rejects_non_positive_amount.1.json # contracts/credit/test_snapshots/test/test_repay_credit_saturates_at_zero.1.json # contracts/credit/test_snapshots/test/test_repay_credit_suspended_status.1.json # contracts/credit/test_snapshots/test/test_repay_credit_zero_utilization.1.json # contracts/credit/test_snapshots/test/test_suspend_credit_line.1.json # contracts/credit/test_snapshots/test/test_suspend_credit_line_unauthorized.1.json # contracts/credit/test_snapshots/test/test_update_risk_parameters_at_boundaries.1.json # contracts/credit/test_snapshots/test/test_update_risk_parameters_credit_limit_below_utilized.1.json # contracts/credit/test_snapshots/test/test_update_risk_parameters_interest_rate_exceeds_max.1.json # contracts/credit/test_snapshots/test/test_update_risk_parameters_negative_credit_limit.1.json # contracts/credit/test_snapshots/test/test_update_risk_parameters_nonexistent_line.1.json # contracts/credit/test_snapshots/test/test_update_risk_parameters_risk_score_exceeds_max.1.json # contracts/credit/test_snapshots/test/test_update_risk_parameters_success.1.json # contracts/credit/test_snapshots/test/test_update_risk_parameters_unauthorized_caller.1.json # contracts/credit/test_snapshots/test_close_utilized/test_close_utilized_third_party_rejected_with_zero_utilization.1.json
Author
|
@greatest0fallt1me PLEASE MERGE IN, THANKS |
Author
|
@greatest0fallt1me please merge in so my points can reflect, if others were this slow in merging in prs, you wouldn't have gotten the number of points you had, its taking way too long please. |
Contributor
|
@Tola-byte Can you resolve the conflicts? |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
closes #4