feat(mojaloop/#3533): v15.2.0 release fixes (#129)

feat(mojaloop/#3533): v15.2.0 release fixes - mojaloop/project#3533 - Added retry logic to funds-in account balance request to fix timing issues - Replaced hard-coded delay time in CGS provisioning with `DELAY_FUNDS_IN` environment variable - Added delays to some tests to fix timing issues - Switched some post-request requests to HTTP temporarily to bypass websocket failures in TTK backend
mojaloop · Oct 31, 2023 · 0e62e1a · 0e62e1a
1 parent 4a8aaca
commit 0e62e1a
Show file tree

Hide file tree

Showing 114 changed files with 2,470 additions and 794 deletions.
diff --git a/collections/hub/cleanup/position_cleanup.json b/collections/hub/cleanup/position_cleanup.json
@@ -8,7 +8,7 @@
         "info": "Close current open window and store data for all closed windows"
       },
       "fileInfo": {
-        "path": "run-settlements.json"
+        "path": "hub/cleanup/position_cleanup.json"
       },
       "requests": [
         {
@@ -279,7 +279,7 @@
         "info": "Run deferred currency settlement model for all the closed windows"
       },
       "fileInfo": {
-        "path": "run-settlements.json"
+        "path": "hub/cleanup/position_cleanup.json"
       },
       "requests": [
         {
@@ -887,7 +887,7 @@
         "info": "Run default deferred settlement model for all the closed windows"
       },
       "fileInfo": {
-        "path": "run-settlements.json"
+        "path": "hub/cleanup/position_cleanup.json"
       },
       "requests": [
         {
@@ -1533,7 +1533,7 @@
         "info": "Run Interchange fee settlement model for all the closed windows"
       },
       "fileInfo": {
-        "path": "run-settlements.json"
+        "path": "hub/cleanup/position_cleanup.json"
       },
       "requests": [
         {

diff --git a/collections/hub/golden_path/api-tests/Quotes/quotes-negative-scenarios.json b/collections/hub/golden_path/api-tests/Quotes/quotes-negative-scenarios.json
@@ -1204,7 +1204,10 @@
             }
           }
         }
-      ]
+      ],
+      "fileInfo": {
+        "path": "hub/golden_path/api-tests/Quotes/quotes-negative-scenarios.json"
+      }
     },
     {
       "id": 2,
@@ -2139,7 +2142,10 @@
             }
           }
         }
-      ]
+      ],
+      "fileInfo": {
+        "path": "hub/golden_path/api-tests/Quotes/quotes-negative-scenarios.json"
+      }
     }
   ]
 }
diff --git a/collections/hub/golden_path/api-tests/SettlementWindows/settlementadmin.json b/collections/hub/golden_path/api-tests/SettlementWindows/settlementadmin.json
@@ -185,7 +185,10 @@
             }
           }
         }
-      ]
+      ],
+      "fileInfo": {
+        "path": "hub/golden_path/api-tests/SettlementWindows/settlementadmin.json"
+      }
     }
   ]
 }
diff --git a/collections/hub/golden_path/api-tests/admin-api-tests/Admintests-20201221.json b/collections/hub/golden_path/api-tests/admin-api-tests/Admintests-20201221.json
@@ -216,7 +216,10 @@
             ]
           }
         }
-      ]
+      ],
+      "fileInfo": {
+        "path": "hub/golden_path/api-tests/admin-api-tests/Admintests-20201221.json"
+      }
     }
   ]
 }
diff --git a/collections/hub/golden_path/bug fixes/Test for 4 decimal points #949.json b/collections/hub/golden_path/bug fixes/Test for 4 decimal points #949.json
@@ -272,7 +272,10 @@
           },
           "url": "{$inputs.HOST_ML_API_ADAPTER}"
         }
-      ]
+      ],
+      "fileInfo": {
+        "path": "hub/golden_path/bug fixes/Test for 4 decimal points #949.json"
+      }
     }
   ]
 }
diff --git a/collections/hub/golden_path/bug fixes/Test for Bugfix #1378 - extension list missing.json b/collections/hub/golden_path/bug fixes/Test for Bugfix #1378 - extension list missing.json
@@ -216,7 +216,10 @@
             }
           }
         }
-      ]
+      ],
+      "fileInfo": {
+        "path": "hub/golden_path/bug fixes/Test for Bugfix #1378 - extension list missing.json"
+      }
     }
   ]
 }
diff --git a/...date requests with an incorrect-non-existent FSP-ID in the FSPIOP-Destination header.json b/...date requests with an incorrect-non-existent FSP-ID in the FSPIOP-Destination header.json
@@ -8,7 +8,7 @@
         "info": "p2p_money_transfer - payee_request_for_notification_v.1.1"
       },
       "fileInfo": {
-        "path": "golden_path/bug fixes/Test for Bugfix #2697 - Central-Ledger Fulfil Handler does not correctly invalidate requests with an incorrect-non-existent FSP-ID in the FSPIOP-Destination header.json"
+        "path": "hub/golden_path/bug fixes/Test for Bugfix #2697 - Central-Ledger Fulfil Handler does not correctly invalidate requests with an incorrect-non-existent FSP-ID in the FSPIOP-Destination header.json"
       },
       "requests": [
         {
@@ -374,7 +374,7 @@
         "info": "p2p_money_transfer - payee_request_for_notification_v.1.1"
       },
       "fileInfo": {
-        "path": "golden_path/bug fixes/Test for Bugfix #2697 - Central-Ledger Fulfil Handler does not correctly invalidate requests with an incorrect-non-existent FSP-ID in the FSPIOP-Destination header.json"
+        "path": "hub/golden_path/bug fixes/Test for Bugfix #2697 - Central-Ledger Fulfil Handler does not correctly invalidate requests with an incorrect-non-existent FSP-ID in the FSPIOP-Destination header.json"
       },
       "requests": [
         {

diff --git a/collections/hub/golden_path/bug fixes/Test for Bugfix #742 - Error code check.json b/collections/hub/golden_path/bug fixes/Test for Bugfix #742 - Error code check.json
@@ -195,7 +195,10 @@
             }
           }
         }
-      ]
+      ],
+      "fileInfo": {
+        "path": "hub/golden_path/bug fixes/Test for Bugfix #742 - Error code check.json"
+      }
     }
   ]
 }
diff --git a/...hub/golden_path/bug fixes/Test for Bugfix #849 - missing ID for transfers and quotes.json b/...hub/golden_path/bug fixes/Test for Bugfix #849 - missing ID for transfers and quotes.json
@@ -140,7 +140,10 @@
             }
           }
         }
-      ]
+      ],
+      "fileInfo": {
+        "path": "hub/golden_path/bug fixes/Test for Bugfix #849 - missing ID for transfers and quotes.json"
+      }
     }
   ]
 }
diff --git a/...ts for Bugfix #1009 - ML Adapter and ALS service health should include broker status.json b/...ts for Bugfix #1009 - ML Adapter and ALS service health should include broker status.json
@@ -268,7 +268,10 @@
             }
           }
         }
-      ]
+      ],
+      "fileInfo": {
+        "path": "hub/golden_path/bug fixes/Tests for Bugfix #1009 - ML Adapter and ALS service health should include broker status.json"
+      }
     }
   ]
 }
diff --git a/...s/hub/golden_path/bug fixes/Tests for Bugfix #981 - Fix 500 http code instead of 400.json b/...s/hub/golden_path/bug fixes/Tests for Bugfix #981 - Fix 500 http code instead of 400.json
@@ -164,7 +164,10 @@
             "name": ""
           }
         }
-      ]
+      ],
+      "fileInfo": {
+        "path": "hub/golden_path/bug fixes/Tests for Bugfix #981 - Fix 500 http code instead of 400.json"
+      }
     }
   ]
 }
diff --git a/collections/hub/golden_path/bug fixes/Tests for Bugfix #990 and #1016 - Quotes.json b/collections/hub/golden_path/bug fixes/Tests for Bugfix #990 and #1016 - Quotes.json
@@ -392,7 +392,13 @@
             }
           }
         }
-      ]
+      ],
+      "fileInfo": {
+        "path": "hub/golden_path/bug fixes/Tests for Bugfix #990 and #1016 - Quotes.json",
+        "labels": [
+          "quotes"
+        ]
+      }
     },
     {
       "id": 2,
@@ -1176,7 +1182,13 @@
             ]
           }
         }
-      ]
+      ],
+      "fileInfo": {
+        "path": "hub/golden_path/bug fixes/Tests for Bugfix #990 and #1016 - Quotes.json",
+        "labels": [
+          "quotes"
+        ]
+      }
     }
   ]
 }
diff --git a/...ath/bug fixes/Tests for Bugfix #998 - Quoting service not using most recent endpoint.json b/...ath/bug fixes/Tests for Bugfix #998 - Quoting service not using most recent endpoint.json
@@ -301,7 +301,13 @@
             }
           }
         }
-      ]
+      ],
+      "fileInfo": {
+        "path": "hub/golden_path/bug fixes/Tests for Bugfix #998 - Quoting service not using most recent endpoint.json",
+        "labels": [
+          "quotes"
+        ]
+      }
     }
   ]
 }
diff --git a/collections/hub/golden_path/bug fixes/master.json b/collections/hub/golden_path/bug fixes/master.json
@@ -47,4 +47,4 @@
       "type": "file"
     }
   ]
-}
+}
diff --git a/collections/hub/golden_path/bug fixes/other-bug-fixes.json b/collections/hub/golden_path/bug fixes/other-bug-fixes.json
@@ -224,7 +224,10 @@
             }
           }
         }
-      ]
+      ],
+      "fileInfo": {
+        "path": "hub/golden_path/bug fixes/other-bug-fixes.json"
+      }
     }
   ]
 }
diff --git a/...lden_path/feature_tests/Active_Inactive_participants/active_and_inactive_participant.json b/...lden_path/feature_tests/Active_Inactive_participants/active_and_inactive_participant.json
@@ -42,7 +42,8 @@
           "headers": {
             "Authorization": "{$inputs.TTK_BEARER_TOKEN}",
             "FSPIOP-Source": "{$inputs.fromFspId}"
-          }
+          },
+          "disabled": false
         },
         {
           "id": 2,
@@ -242,7 +243,8 @@
                 ]
               }
             ]
-          }
+          },
+          "disabled": false
         },
         {
           "id": 3,
@@ -420,7 +422,8 @@
                 ]
               }
             ]
-          }
+          },
+          "disabled": false
         },
         {
           "id": 4,
@@ -457,7 +460,8 @@
           "headers": {
             "Authorization": "{$inputs.TTK_BEARER_TOKEN}",
             "FSPIOP-Source": "{$inputs.fromFspId}"
-          }
+          },
+          "disabled": false
         },
         {
           "id": 5,
@@ -521,6 +525,7 @@
           },
           "ignoreCallbacks": true,
           "scriptingEngine": "javascript",
+          "delay": "{$inputs.DELAY_CL}",
           "scripts": {
             "preRequest": {
               "exec": [
@@ -538,7 +543,11 @@
               "exec": [
                 "if (environment.ENABLE_WS_ASSERTIONS===true) {",
                 "  requestVariables.sim1Callback = await websocket.getMessage('sim1Callback', environment.WS_ASSERTION_TIMEOUT)",
+                "  ",
                 "  requestVariables.sim2Request = await websocket.getMessage('sim2Request', environment.WS_ASSERTION_TIMEOUT)",
+                "  ",
+                "  requestVariables.sim2Request = (await axios.get(environment.TESTFSP2_SDK_TESTAPI_URL + '/requests/{$request.body.quoteId}')).data;",
+                "  ",
                 "  environment.sim1IlpPacket =  requestVariables.sim1Callback.data.ilpPacket",
                 "  environment.sim1Condition =  requestVariables.sim1Callback.data.condition",
                 "  // JWS Validation",
@@ -723,7 +732,8 @@
                 ]
               }
             ]
-          }
+          },
+          "disabled": false
         },
         {
           "id": 6,
@@ -774,15 +784,21 @@
                 "",
                 "if (environment.ENABLE_WS_ASSERTIONS===true) {",
                 "  await websocket.connect(environment.TESTFSP1_SDK_TESTAPI_WS_URL + '/callbacks/{$request.body.transferId}', 'sim1Callback')",
-                "  await websocket.connect(environment.TESTFSP2_SDK_TESTAPI_WS_URL + '/requests/{$request.body.transferId}', 'sim2Request')",
+                "  // NOTE: This has been commented out due to the WS issue https://github.com/mojaloop/project/issues/3164, with a work-around to call the HTTP equivalent API on the postRequest instead until it can be resolved.",
+                "  // await websocket.connect(environment.TESTFSP2_SDK_TESTAPI_WS_URL + '/requests/{$request.body.transferId}', 'sim2Request')",
                 "}"
               ]
             },
             "postRequest": {
               "exec": [
                 "if (environment.ENABLE_WS_ASSERTIONS===true) {",
                 "  requestVariables.sim1Callback = await websocket.getMessage('sim1Callback', environment.WS_ASSERTION_TIMEOUT)",
-                "  requestVariables.sim2Request = await websocket.getMessage('sim2Request', environment.WS_ASSERTION_TIMEOUT)",
+                "  // NOTE: This has been commented out due to the WS issue https://github.com/mojaloop/project/issues/3164, with a work-around to call the HTTP equivalent API on the postRequest instead until it can be resolved.",
+                "  //requestVariables.sim2Request = await websocket.getMessage('sim2Request', environment.WS_ASSERTION_TIMEOUT)",
+                "  requestVariables.sim2Request = (await axios.get(environment.TESTFSP2_SDK_TESTAPI_URL + '/requests/{$request.body.transferId}')).data;",
+                "  ",
+                "  console.log('sim2Request: ', requestVariables.sim2Request)",
+                "  ",
                 "  // JWS Validation",
                 "  if(environment.ENABLE_JWS_VALIDATION) {",
                 "    requestVariables.jwsValidationStatus =  custom.jws.validateCallback(requestVariables.sim1Callback.headers, requestVariables.sim1Callback.data, environment.TESTFSP2_JWS_PUB_KEY)",
@@ -956,9 +972,13 @@
                 ]
               }
             ]
-          }
+          },
+          "disabled": false
         }
-      ]
+      ],
+      "fileInfo": {
+        "path": "hub/golden_path/feature_tests/Active_Inactive_participants/active_and_inactive_participant.json"
+      }
     }
   ]
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -185,7 +185,10 @@ @@
                 }
               }
             }
-          ]
+          ],
+          "fileInfo": {
+            "path": "hub/golden_path/api-tests/SettlementWindows/settlementadmin.json"
+          }
         }
       ]
     }