Skip to content

Commit

Permalink
Merge branch 'feat/#2880-Simplify-liquidity-cover-check-and-fix-issue…
Browse files Browse the repository at this point in the history 
…-with-validation' of github.com:mojaloop/testing-toolkit-test-cases into feat/#2880-Simplify-liquidity-cover-check-and-fix-issue-with-validation-master
  • Loading branch information
@mdebarros
mdebarros committed Sep 8, 2022
2 parents 9cf6eb8 + d19ae0d commit a99adbf
Show file tree
Hide file tree
Showing 2 changed files with 146 additions and 40 deletions.
8 changes: 4 additions & 4 deletions .../hub/golden_path/feature_tests/p2p_money_transfer/p2p_happy_path_with_balance_checks.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -713,8 +713,8 @@
"postRequest": {
"exec": [
"// lets get retry configs",
"var maxRetryCount = Number.parseFloat(environment.RETRY_MAX_ATTEMPTS) || 10;",
"var maxRetryWait = Number.parseFloat(environment.RETRY_MAX_WAIT_IN_MS) || 200;",
"var maxRetryCount = Number.parseFloat(environment.RETRY_MAX_ATTEMPTS) || 20;",
"var maxRetryWait = Number.parseFloat(environment.RETRY_MAX_WAIT_IN_MS) || 250;",
"// var maxRetryWait = 1;",
"",
"const envSettlementRuleInterchangeFee = Number.parseFloat(environment.SETTLEMENT_RULE_INTERCHANGE_FEE) || 0.006;",
Expand Down Expand Up @@ -873,8 +873,8 @@
"postRequest": {
"exec": [
"// lets get retry configs",
"var maxRetryCount = Number.parseFloat(environment.RETRY_MAX_ATTEMPTS) || 10;",
"var maxRetryWait = Number.parseFloat(environment.RETRY_MAX_WAIT_IN_MS) || 200;",
"var maxRetryCount = Number.parseFloat(environment.RETRY_MAX_ATTEMPTS) || 20;",
"var maxRetryWait = Number.parseFloat(environment.RETRY_MAX_WAIT_IN_MS) || 250;",
"// var maxRetryWait = 1;",
"",
"const envSettlementRuleInterchangeFee = Number.parseFloat(environment.SETTLEMENT_RULE_INTERCHANGE_FEE) || 0.006;",
Expand Down
178 changes: 142 additions & 36 deletions collections/hub/golden_path/settlement_cgs/newsetcgs.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1249,8 +1249,8 @@
"postRequest": {
"exec": [
"// lets get retry configs",
"const maxRetryCount = Number.parseFloat(environment.RETRY_MAX_ATTEMPTS) || 10;",
"const maxRetryWait = Number.parseFloat(environment.RETRY_MAX_WAIT_IN_MS) || 200;",
"const maxRetryCount = Number.parseFloat(environment.RETRY_MAX_ATTEMPTS) || 20;",
"const maxRetryWait = Number.parseFloat(environment.RETRY_MAX_WAIT_IN_MS) || 250;",
"",
"const envSettlementRuleInterchangeFee = Number.parseFloat(environment.SETTLEMENT_RULE_INTERCHANGE_FEE) || 0.006;",
"",
Expand Down Expand Up @@ -1411,8 +1411,8 @@
"postRequest": {
"exec": [
"// lets get retry configs",
"const maxRetryCount = Number.parseFloat(environment.RETRY_MAX_ATTEMPTS) || 10;",
"const maxRetryWait = Number.parseFloat(environment.RETRY_MAX_WAIT_IN_MS) || 200;",
"const maxRetryCount = Number.parseFloat(environment.RETRY_MAX_ATTEMPTS) || 20;",
"const maxRetryWait = Number.parseFloat(environment.RETRY_MAX_WAIT_IN_MS) || 250;",
"",
"requestVariables.payerfspfundsInPrepareAmount = Number(environment.SETTLEMENT_CGS_FUNDSIN_TESTFSP2);",
"",
Expand Down Expand Up @@ -1573,8 +1573,8 @@
"postRequest": {
"exec": [
"// lets get retry configs",
"const maxRetryCount = Number.parseFloat(environment.RETRY_MAX_ATTEMPTS) || 10;",
"const maxRetryWait = Number.parseFloat(environment.RETRY_MAX_WAIT_IN_MS) || 200;",
"const maxRetryCount = Number.parseFloat(environment.RETRY_MAX_ATTEMPTS) || 20;",
"const maxRetryWait = Number.parseFloat(environment.RETRY_MAX_WAIT_IN_MS) || 250;",
"",
"requestVariables.payerfspfundsInPrepareAmount = Number(environment.SETTLEMENT_CGS_FUNDSIN_TESTFSP3);",
"",
Expand Down Expand Up @@ -1735,8 +1735,8 @@
"postRequest": {
"exec": [
"// lets get retry configs",
"const maxRetryCount = Number.parseFloat(environment.RETRY_MAX_ATTEMPTS) || 10;",
"const maxRetryWait = Number.parseFloat(environment.RETRY_MAX_WAIT_IN_MS) || 200;",
"const maxRetryCount = Number.parseFloat(environment.RETRY_MAX_ATTEMPTS) || 20;",
"const maxRetryWait = Number.parseFloat(environment.RETRY_MAX_WAIT_IN_MS) || 250;",
"",
"requestVariables.payerfspfundsInPrepareAmount = Number(environment.SETTLEMENT_CGS_FUNDSIN_TESTFSP4);",
"",
Expand Down Expand Up @@ -2453,8 +2453,8 @@
"postRequest": {
"exec": [
"// lets get retry configs",
"const maxRetryCount = Number.parseFloat(environment.RETRY_MAX_ATTEMPTS) || 10;",
"const maxRetryWait = Number.parseFloat(environment.RETRY_MAX_WAIT_IN_MS) || 200;",
"const maxRetryCount = Number.parseFloat(environment.RETRY_MAX_ATTEMPTS) || 20;",
"const maxRetryWait = Number.parseFloat(environment.RETRY_MAX_WAIT_IN_MS) || 250;",
"",
"const envSettlementRuleInterchangeFee = Number.parseFloat(environment.SETTLEMENT_RULE_INTERCHANGE_FEE) || 0.006;",
"",
Expand Down Expand Up @@ -2618,8 +2618,8 @@
"postRequest": {
"exec": [
"// lets get retry configs",
"var maxRetryCount = Number.parseFloat(environment.RETRY_MAX_ATTEMPTS) || 10;",
"var maxRetryWait = Number.parseFloat(environment.RETRY_MAX_WAIT_IN_MS) || 200;",
"var maxRetryCount = Number.parseFloat(environment.RETRY_MAX_ATTEMPTS) || 20;",
"var maxRetryWait = Number.parseFloat(environment.RETRY_MAX_WAIT_IN_MS) || 250;",
"// var maxRetryWait = 1;",
"",
"const envSettlementRuleInterchangeFee = Number.parseFloat(environment.SETTLEMENT_RULE_INTERCHANGE_FEE) || 0.006;",
Expand Down Expand Up @@ -2859,8 +2859,8 @@
"postRequest": {
"exec": [
"// lets get retry configs",
"var maxRetryCount = Number.parseFloat(environment.RETRY_MAX_ATTEMPTS) || 10;",
"var maxRetryWait = Number.parseFloat(environment.RETRY_MAX_WAIT_IN_MS) || 200;",
"var maxRetryCount = Number.parseFloat(environment.RETRY_MAX_ATTEMPTS) || 20;",
"var maxRetryWait = Number.parseFloat(environment.RETRY_MAX_WAIT_IN_MS) || 250;",
"// var maxRetryWait = 1;",
"",
"var res = response.body;",
Expand Down Expand Up @@ -2959,8 +2959,8 @@
"postRequest": {
"exec": [
"// lets get retry configs",
"var maxRetryCount = Number.parseFloat(environment.RETRY_MAX_ATTEMPTS) || 10;",
"var maxRetryWait = Number.parseFloat(environment.RETRY_MAX_WAIT_IN_MS) || 200;",
"var maxRetryCount = Number.parseFloat(environment.RETRY_MAX_ATTEMPTS) || 20;",
"var maxRetryWait = Number.parseFloat(environment.RETRY_MAX_WAIT_IN_MS) || 250;",
"// var maxRetryWait = 1;",
"",
"var res = response.body;",
Expand Down Expand Up @@ -3167,8 +3167,8 @@
"postRequest": {
"exec": [
"// lets get retry configs",
"var maxRetryCount = Number.parseFloat(environment.RETRY_MAX_ATTEMPTS) || 10;",
"var maxRetryWait = Number.parseFloat(environment.RETRY_MAX_WAIT_IN_MS) || 200;",
"var maxRetryCount = Number.parseFloat(environment.RETRY_MAX_ATTEMPTS) || 20;",
"var maxRetryWait = Number.parseFloat(environment.RETRY_MAX_WAIT_IN_MS) || 250;",
"",
"const envSettlementRuleInterchangeFee = Number.parseFloat(environment.SETTLEMENT_RULE_INTERCHANGE_FEE) || 0.006;",
"const envSettlementCgsTxAmount3 = Number.parseFloat(environment.SETTLEMENT_CGS_TX_AMOUNT_3)",
Expand Down Expand Up @@ -3694,8 +3694,8 @@
"postRequest": {
"exec": [
"// lets get retry configs",
"var maxRetryCount = Number.parseFloat(environment.RETRY_MAX_ATTEMPTS) || 10;",
"var maxRetryWait = Number.parseFloat(environment.RETRY_MAX_WAIT_IN_MS) || 200;",
"var maxRetryCount = Number.parseFloat(environment.RETRY_MAX_ATTEMPTS) || 20;",
"var maxRetryWait = Number.parseFloat(environment.RETRY_MAX_WAIT_IN_MS) || 250;",
"// var maxRetryWait = 1;",
"",
"const envSettlementRuleInterchangeFee = Number.parseFloat(environment.SETTLEMENT_RULE_INTERCHANGE_FEE) || 0.006;",
Expand Down Expand Up @@ -3839,8 +3839,8 @@
"postRequest": {
"exec": [
"// lets get retry configs",
"var maxRetryCount = Number.parseFloat(environment.RETRY_MAX_ATTEMPTS) || 10;",
"var maxRetryWait = Number.parseFloat(environment.RETRY_MAX_WAIT_IN_MS) || 200;",
"var maxRetryCount = Number.parseFloat(environment.RETRY_MAX_ATTEMPTS) || 20;",
"var maxRetryWait = Number.parseFloat(environment.RETRY_MAX_WAIT_IN_MS) || 250;",
"// var maxRetryWait = 1;",
"",
"const envSettlementRuleInterchangeFee = Number.parseFloat(environment.SETTLEMENT_RULE_INTERCHANGE_FEE) || 0.006;",
Expand Down Expand Up @@ -3985,8 +3985,8 @@
"postRequest": {
"exec": [
"// lets get retry configs",
"var maxRetryCount = Number.parseFloat(environment.RETRY_MAX_ATTEMPTS) || 10;",
"var maxRetryWait = Number.parseFloat(environment.RETRY_MAX_WAIT_IN_MS) || 200;",
"var maxRetryCount = Number.parseFloat(environment.RETRY_MAX_ATTEMPTS) || 20;",
"var maxRetryWait = Number.parseFloat(environment.RETRY_MAX_WAIT_IN_MS) || 250;",
"// var maxRetryWait = 1;",
"",
"const envSettlementRuleInterchangeFee = Number.parseFloat(environment.SETTLEMENT_RULE_INTERCHANGE_FEE) || 0.006;",
Expand Down Expand Up @@ -4096,8 +4096,8 @@
"postRequest": {
"exec": [
"// lets get retry configs",
"var maxRetryCount = Number.parseFloat(environment.RETRY_MAX_ATTEMPTS) || 10;",
"var maxRetryWait = Number.parseFloat(environment.RETRY_MAX_WAIT_IN_MS) || 200;",
"var maxRetryCount = Number.parseFloat(environment.RETRY_MAX_ATTEMPTS) || 20;",
"var maxRetryWait = Number.parseFloat(environment.RETRY_MAX_WAIT_IN_MS) || 250;",
"// var maxRetryWait = 1;",
"",
"const envSettlementRuleInterchangeFee = Number.parseFloat(environment.SETTLEMENT_RULE_INTERCHANGE_FEE) || 0.006;",
Expand Down Expand Up @@ -4213,14 +4213,14 @@
"id": 1,
"description": "Response code is 200",
"exec": [
"expect(response.status).to.equal(200)"
"expect(requestVariables.responseCode).to.equal(200)"
]
},
{
"id": 2,
"description": "Settlement State should be PENDING_SETTLEMENT",
"exec": [
"expect(response.body.state).to.eql('PENDING_SETTLEMENT')"
"expect(requestVariables.response.state).to.eql('PENDING_SETTLEMENT')"
]
}
]
Expand All @@ -4230,9 +4230,53 @@
"scripts": {
"postRequest": {
"exec": [
"environment.settlementId= response.body.id",
"var res = response.body;",
"",
"// lets get retry configs",
"const maxRetryCount = Number.parseFloat(environment.RETRY_MAX_ATTEMPTS) || 20;",
"const maxRetryWait = Number.parseFloat(environment.RETRY_MAX_WAIT_IN_MS) || 250;",
"",
"console.log(environment.settlementId);"
"var responseCode = response.code || response.status",
"var responseState = null",
"for (let retryCount = 0 ; retryCount < maxRetryCount; retryCount++) {",
" console.log(`retry-count=${retryCount+1}, max-count=${maxRetryCount}, max-wait=${maxRetryWait}`)",
" console.log(res)",
" responseState = res.state",
" if (responseCode === 200) {",
" console.log('Everything is ok, lets continue')",
" break; // lets break out of while loop",
" } else {",
" console.log(`Everything is NOT OK, lets wait for ${maxRetryWait}ms, and try again...`)",
" await custom.sleep(maxRetryWait);",
" try {",
" const axioResponse = await axios.post(",
" `${environment.HOST_CENTRAL_SETTLEMENT}/settlements`,",
" {",
" \"settlementModel\":\"InterchangeFee\",",
" \"reason\":\"TESTING\",",
" \"settlementWindows\":",
" [",
" {",
" \"id\": `${environment.openWindowID}`",
" }",
" ]",
" }",
" )",
" res = axioResponse.data;",
" responseCode = axioResponse.code || axioResponse.status",
" } catch (err) {",
" console.log(err)",
" }",
" }",
"}",
"",
"environment.settlementId = res.id",
"console.log(`environment.settlementId=${environment.settlementId}`);",
"requestVariables.response = res",
"console.log(`requestVariables.response=${JSON.stringify(requestVariables.response)}`);",
"requestVariables.responseCode = responseCode",
"console.log(`requestVariables.responseCode=${requestVariables.responseCode}`);",
""
]
}
}
Expand Down Expand Up @@ -8083,45 +8127,107 @@
"id": 1,
"description": "Response code is 200",
"exec": [
"expect(response.status).to.equal(200)"
"expect(requestVariables.responseCode).to.equal(200)"
]
},
{
"id": 2,
"description": "Settlement State should be PENDING_SETTLEMENT",
"exec": [
" expect(response.body.state).to.eql('PENDING_SETTLEMENT');"
" expect(requestVariables.response.state).to.eql('PENDING_SETTLEMENT');"
]
},
{
"id": 3,
"description": "first participant netSettlementAmount == -5.37 TZS",
"exec": [
"expect(response.body.participants[0].accounts[0].netSettlementAmount.amount).to.eql(-5.37);"
"expect(requestVariables.response.participants[0].accounts[0].netSettlementAmount.amount).to.eql(-5.37);"
]
},
{
"id": 4,
"description": "second participant netSettlementAmount == -2.26 TZS",
"exec": [
"expect(response.body.participants[1].accounts[0].netSettlementAmount.amount).to.eql(-2.26);"
"expect(requestVariables.response.participants[1].accounts[0].netSettlementAmount.amount).to.eql(-2.26);"
]
},
{
"id": 5,
"description": "third participant netSettlementAmount == 7.10 TZS",
"exec": [
"expect(response.body.participants[2].accounts[0].netSettlementAmount.amount).to.eql(7.10);"
"expect(requestVariables.response.participants[2].accounts[0].netSettlementAmount.amount).to.eql(7.10);"
]
},
{
"id": 6,
"description": "fourth participant netSettlementAmount == 0.53 TZS",
"exec": [
"expect(response.body.participants[3].accounts[0].netSettlementAmount.amount).to.eql(0.53);"
"expect(requestVariables.response.participants[3].accounts[0].netSettlementAmount.amount).to.eql(0.53);"
]
}
]
},
"scriptingEngine": "javascript",
"scripts": {
"postRequest": {
"exec": [
"var res = response.body;",
"",
"// lets get retry configs",
"const maxRetryCount = Number.parseFloat(environment.RETRY_MAX_ATTEMPTS) || 20;",
"const maxRetryWait = Number.parseFloat(environment.RETRY_MAX_WAIT_IN_MS) || 250;",
"",
"var responseCode = response.code || response.status",
"var responseState = null",
"for (let retryCount = 0 ; retryCount < maxRetryCount; retryCount++) {",
" console.log(`retry-count=${retryCount+1}, max-count=${maxRetryCount}, max-wait=${maxRetryWait}`)",
" console.log(res)",
" if (res.state === 'PENDING_SETTLEMENT') {",
" console.log('Everything is ok, lets continue')",
" break; // lets break out of while loop",
" } else {",
" console.log(`Everything is NOT OK, lets wait for ${maxRetryWait}ms, and try again...`)",
" await custom.sleep(maxRetryWait);",
" try {",
" const axioResponse = await axios.post(",
" `${environment.HOST_CENTRAL_SETTLEMENT}/settlements`,",
" {",
" \"settlementModel\": \"InterchangeFee\",",
" \"reason\": \"TESTING\",",
" \"settlementWindows\": [",
" {",
" \"id\": `${environment.closed_win_prev_prev_prev_prev_prev}`",
" },",
" {",
" \"id\": `${environment.closed_win_prev_prev_prev_prev}`",
" },",
" {",
" \"id\": `${environment.closed_win_prev_prev_prev}`",
" },",
" {",
" \"id\": `${environment.closed_win_prev_prev}`",
" },",
" {",
" \"id\": `${environment.closed_win_prev}`",
" }",
" ]",
" }",
" )",
" res = axioResponse.data;",
" responseCode = axioResponse.code || axioResponse.status",
" } catch (err) {",
" console.log(err)",
" }",
" }",
"}",
"",
"requestVariables.response = res",
"console.log(`requestVariables.response=${JSON.stringify(requestVariables.response)}`);",
"requestVariables.responseCode = responseCode",
"console.log(`requestVariables.responseCode=${requestVariables.responseCode}`);",
""
]
}
}
}
]
Expand Down

0 comments on commit a99adbf

Please sign in to comment.