feat(mojaloop/#2880): simplify liquidity cover check and fix issue with validation (master) #85
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
…th validation feat(mojaloop/#2880): simplify liquidity cover check and fix issue with validation - mojaloop/project#2880 - fixes to collections/hub/golden_path/feature_tests/block_transfers - aligned liquidity and position calculations with central-ledger logic - cleaned up unecessary requests (i.e. why have two requests to fetch settlement and position accounts when it can be done in one?)
- cleaned up test-scripts, and aligned them to central-ledger changes - added new env var environment.SETTLEMENT_RULE_INTERCHANGE_FEE which defaults to '0.006' (ref: https://github.com/mojaloop/central-settlement/blob/master/scripts/transferSettlementTemp/interchangeFeeCalculation.js#L47) - updated script logic to correctly calculate interchange-fees based on the provided environment.SETTLEMENT_RULE_INTERCHANGE_FEE
- re-factored `[new sims] transfers, positions CGS Window1 tests (OTC-649, OTC-645)`
- standardised naming convention
- re-aligned position, settlement and interchange checks, and expanded on checks dynamically based on the transfer amounts (Tx1, Tx2, Tx3, Tx4, Tx5, Tx6) instead of using "hard-coded" values
- added new OPTIONAL env vars for:
1. SETTLEMENT_CGS_TX_AMOUNT_1 (defaults: 15), SETTLEMENT_CGS_TX_AMOUNT_2 (defaults: 87.88), SETTLEMENT_CGS_TX_AMOUNT_3 (defaults: 158.36), SETTLEMENT_CGS_TX_AMOUNT_4 (defaults: 211.11), SETTLEMENT_CGS_TX_AMOUNT_5 (defaults: 14.05), SETTLEMENT_CGS_TX_AMOUNT_6 (defaults: 150) representing the transfer amounts for each Transaction. These correlate to Tx1...Tx6
2. SETTLEMENT_RULE_INTERCHANGE_FEE (defaults: 0.006) which is the Interchange Fee % used to calculate the aggregate Fee
…hecks) and fixed test-case naming/meta-data
- removed duplicate test-cases - fixed names for consistency
…es into feat/#2880-Simplify-liquidity-cover-check-and-fix-issue-with-validation
mdebarros
changed the title
This was referenced Aug 25, 2022
- added p2p happy path with balance checks (position, settlement, and reserved balances) - fixed issue in block transfers to ensure that the amount removes trailing spaces by converting a number converted to a fixed string back into a number to drop any trailing zeros: Number(Number.toFixed(2)) - updated some descriptions/meta for newsetcgs test-cases
…case - added funds-in for testfsp's 1,2,3 and 4 - added new optional environment parameters for each testfsp: SETTLEMENT_CGS_FUNDSIN_TESTFSP1, SETTLEMENT_CGS_FUNDSIN_TESTFSP2, SETTLEMENT_CGS_FUNDSIN_TESTFSP3, SETTLEMENT_CGS_FUNDSIN_TESTFSP4 - with defaults of 2000
- check to see settlement-balance has increased by the funds-in amount for testfsp 1, 2, 3 & 4
- disabled duplicate Get Balance requests for CGS tests, and added comment indicating that they are disabled by default but useful for debugging issues.
- removed duplicate tests (possible bug in TTK)
This reverts commit 9304fa9.
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.
feat(mojaloop/#2880): simplify liquidity cover check and fix issue with validation - mojaloop/project#2880
[new sims] transfers, positions CGS Window1 tests (OTC-649, OTC-645)@ collections/hub/golden_path/settlement_cgs/newsetcgsTx1,Tx2,Tx3,Tx4,Tx5,Tx6) instead of using "hard-coded" valuesGET /accounttest-case for settlement, and positions into a single test-case (i.e. only need one call to admin API to retrieve balances and do validation checks)SETTLEMENT_CGS_TX_AMOUNT_1(defaults: 15),SETTLEMENT_CGS_TX_AMOUNT_2(defaults: 87.88),SETTLEMENT_CGS_TX_AMOUNT_3(defaults: 158.36),SETTLEMENT_CGS_TX_AMOUNT_4(defaults: 211.11),SETTLEMENT_CGS_TX_AMOUNT_5(defaults: 14.05),SETTLEMENT_CGS_TX_AMOUNT_6(defaults: 150) representing the transfer amounts for each Transaction. These correlate toTx1...Tx6SETTLEMENT_RULE_INTERCHANGE_FEE(defaults: 0.006) which is the Interchange Fee % used to calculate the aggregate Fee