Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(mojaloop/2891): fix outbound fspiop headers #436

Merged
merged 3 commits into from
Feb 14, 2023
Merged

fix(mojaloop/2891): fix outbound fspiop headers #436

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
23ba2a4
fix: fixed fspiop-destination header in bulkoutbound
Feb 13, 2023
50cd0dc
chore: dep updates
Feb 13, 2023
1a29f9e
fix: removed missing test case execution
Feb 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion audit-ci.jsonc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@
"GHSA-27h2-hvpr-p74q",
"GHSA-hjrf-2m68-5959",
"GHSA-qwph-4952-7xr6",
"GHSA-9c47-m6qq-7p4h"
"GHSA-9c47-m6qq-7p4h",
"GHSA-h452-7996-h45h",
"GHSA-rc47-6667-2j5j",
"GHSA-8x6c-cv3v-vp6g"
]
}
16 changes: 8 additions & 8 deletions modules/api-svc/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
"@mojaloop/sdk-scheme-adapter-private-shared-lib": "workspace:^",
"@mojaloop/sdk-standard-components": "^17.1.1",
"ajv": "8.12.0",
"axios": "^1.2.3",
"axios": "^1.3.3",
"co-body": "^6.1.0",
"dotenv": "^16.0.3",
"env-var": "^7.3.0",
Expand All @@ -88,24 +88,24 @@
"prom-client": "^14.1.1",
"promise-timeout": "^1.3.0",
"random-word-slugs": "^0.1.6",
"redis": "^4.5.1",
"redis": "^4.6.4",
"uuidv4": "^6.2.13",
"ws": "^8.12.0"
"ws": "^8.12.1"
},
"devDependencies": {
"@babel/core": "^7.20.12",
"@babel/preset-env": "^7.20.2",
"@redocly/openapi-cli": "^1.0.0-beta.94",
"@types/jest": "^29.2.5",
"babel-jest": "^29.3.1",
"eslint": "^8.32.0",
"@types/jest": "^29.4.0",
"babel-jest": "^29.4.2",
"eslint": "^8.34.0",
"eslint-config-airbnb-base": "^15.0.0",
"eslint-plugin-import": "^2.27.5",
"eslint-plugin-jest": "^27.2.1",
"jest": "^29.3.1",
"jest": "^29.4.2",
"jest-junit": "^15.0.0",
"nock": "^13.3.0",
"npm-check-updates": "^16.6.2",
"npm-check-updates": "^16.7.4",
"openapi-response-validator": "^12.1.0",
"openapi-typescript": "^6.1.0",
"redis-mock": "^0.56.3",
Expand Down
2 changes: 1 addition & 1 deletion modules/api-svc/src/lib/model/OutboundBulkTransfersModel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ class OutboundBulkTransfersModel {
// now we have a timeout handler and a cache subscriber hooked up we can fire off
// a POST /bulkTransfers request to the switch
try {
const res = await this._requests.postBulkTransfers(bulkTransferPrepare, this.data.from.fspId);
const res = await this._requests.postBulkTransfers(bulkTransferPrepare, bulkTransferPrepare.payeeFsp);
this._logger.push({ res }).log('Bulk transfer request sent to peer');
}
catch (err) {
Expand Down
20 changes: 10 additions & 10 deletions modules/outbound-command-event-handler/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,31 +50,31 @@
"convict": "^6.2.4",
"express": "^4.18.2",
"openapi-backend": "^5.6.2",
"redis": "^4.5.1",
"redis": "^4.6.4",
"swagger-ui-express": "^4.6.0",
"yamljs": "^0.3.0"
},
"devDependencies": {
"@types/convict": "^6.1.1",
"@types/express": "^4.17.15",
"@types/jest": "^29.2.5",
"@types/node": "^18.11.18",
"@types/express": "^4.17.17",
"@types/jest": "^29.4.0",
"@types/node": "^18.13.0",
"@types/node-cache": "^4.2.5",
"@types/supertest": "^2.0.12",
"@types/swagger-ui-express": "^4.1.3",
"@types/yamljs": "^0.2.31",
"@typescript-eslint/eslint-plugin": "^5.48.2",
"@typescript-eslint/parser": "^5.48.2",
"@typescript-eslint/eslint-plugin": "^5.52.0",
"@typescript-eslint/parser": "^5.52.0",
"copyfiles": "^2.4.1",
"eslint": "^8.32.0",
"jest": "^29.3.1",
"eslint": "^8.34.0",
"jest": "^29.4.2",
"nodemon": "^2.0.20",
"npm-check-updates": "^16.6.2",
"npm-check-updates": "^16.7.4",
"replace": "^1.2.2",
"standard-version": "^9.5.0",
"ts-jest": "^29.0.5",
"ts-node": "^10.9.1",
"typescript": "^4.9.4"
"typescript": "^4.9.5"
},
"nodemonConfig": {
"watch": [
Expand Down
4 changes: 3 additions & 1 deletion modules/outbound-command-event-handler/src/api-server/handlers/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,9 @@

import getBulkTransactionsHandlers from './bulk-transactions';
import getHealthHandlers from './health';
export default {
import { Handler } from 'openapi-backend';

export default <{ [operationId: string]: Handler }> {
...getBulkTransactionsHandlers,
...getHealthHandlers,
};
20 changes: 10 additions & 10 deletions modules/outbound-domain-event-handler/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,31 +48,31 @@
"convict": "^6.2.4",
"express": "^4.18.2",
"openapi-backend": "^5.6.2",
"redis": "^4.5.1",
"redis": "^4.6.4",
"swagger-ui-express": "^4.6.0",
"yamljs": "^0.3.0"
},
"devDependencies": {
"@types/convict": "^6.1.1",
"@types/express": "^4.17.15",
"@types/jest": "^29.2.5",
"@types/node": "^18.11.18",
"@types/express": "^4.17.17",
"@types/jest": "^29.4.0",
"@types/node": "^18.13.0",
"@types/node-cache": "^4.2.5",
"@types/supertest": "^2.0.12",
"@types/swagger-ui-express": "^4.1.3",
"@types/yamljs": "^0.2.31",
"@typescript-eslint/eslint-plugin": "^5.48.2",
"@typescript-eslint/parser": "^5.48.2",
"@typescript-eslint/eslint-plugin": "^5.52.0",
"@typescript-eslint/parser": "^5.52.0",
"copyfiles": "^2.4.1",
"eslint": "^8.32.0",
"jest": "^29.3.1",
"eslint": "^8.34.0",
"jest": "^29.4.2",
"nodemon": "^2.0.20",
"npm-check-updates": "^16.6.2",
"npm-check-updates": "^16.7.4",
"replace": "^1.2.2",
"standard-version": "^9.5.0",
"ts-jest": "^29.0.5",
"ts-node": "^10.9.1",
"typescript": "^4.9.4"
"typescript": "^4.9.5"
},
"nodemonConfig": {
"watch": [
Expand Down
4 changes: 3 additions & 1 deletion modules/outbound-domain-event-handler/src/api-server/handlers/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
******/

import getHealthHandlers from './health';
export default {
import { Handler } from 'openapi-backend';

export default <{ [operationId: string]: Handler }> {
...getHealthHandlers,
};
14 changes: 7 additions & 7 deletions modules/private-shared-lib/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,21 +30,21 @@
"@mojaloop/api-snippets": "17.0.3",
"@mojaloop/central-services-shared": "^17.5.0",
"@mojaloop/logging-bc-public-types-lib": "^0.1.14",
"@mojaloop/platform-shared-lib-messaging-types-lib": "^0.2.32",
"@mojaloop/platform-shared-lib-messaging-types-lib": "^0.2.67",
"@mojaloop/platform-shared-lib-nodejs-kafka-client-lib": "0.2.15",
"ajv": "^8.12.0",
"redis": "^4.5.1",
"redis": "^4.6.4",
"uuid": "^9.0.0"
},
"devDependencies": {
"@types/node": "^18.11.18",
"eslint": "^8.32.0",
"jest": "^29.3.1",
"npm-check-updates": "^16.6.2",
"@types/node": "^18.13.0",
"eslint": "^8.34.0",
"jest": "^29.4.2",
"npm-check-updates": "^16.7.4",
"replace": "^1.2.2",
"standard-version": "^9.5.0",
"ts-jest": "^29.0.5",
"typescript": "^4.9.4"
"typescript": "^4.9.5"
},
"standard-version": {
"scripts": {
Expand Down
22 changes: 11 additions & 11 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,28 +67,28 @@
"wait-4-docker": "node ./scripts/_wait4_all.js"
},
"dependencies": {
"nx": "15.5.1",
"tslib": "^2.4.1"
"nx": "15.7.0",
"tslib": "^2.5.0"
},
"devDependencies": {
"@types/jest": "^29.2.5",
"@types/node": "^18.11.18",
"@types/jest": "^29.4.0",
"@types/node": "^18.13.0",
"@types/node-cache": "^4.2.5",
"@typescript-eslint/eslint-plugin": "^5.48.2",
"@typescript-eslint/parser": "^5.48.2",
"audit-ci": "^6.6.0",
"eslint": "^8.32.0",
"@typescript-eslint/eslint-plugin": "^5.52.0",
"@typescript-eslint/parser": "^5.52.0",
"audit-ci": "^6.6.1",
"eslint": "^8.34.0",
"eslint-config-airbnb-typescript": "^17.0.0",
"eslint-plugin-import": "latest",
"husky": "^8.0.3",
"jest": "^29.3.1",
"jest": "^29.4.2",
"nodemon": "^2.0.20",
"npm-check-updates": "^16.6.2",
"npm-check-updates": "^16.7.4",
"replace": "^1.2.2",
"standard-version": "^9.5.0",
"ts-jest": "^29.0.5",
"ts-node": "^10.9.1",
"typescript": "^4.9.4",
"typescript": "^4.9.5",
"yarn-audit-fix": "^9.3.8"
},
"standard-version": {
Expand Down
1 change: 0 additions & 1 deletion test/func/ttk-tests-docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,3 @@ services:
rm -rf /tmp/test_cases; mkdir /tmp/test_cases &&
unzip -d /tmp/test_cases -o /tmp/downloaded-test-collections.zip &&
npm run cli -- -u http://ttk-ttksim1:5050 -l 2 -i /tmp/test_cases/testing-toolkit-test-cases-master/collections/hub/sdk-bulk/basic -e environments/hub_local_environment.json --report-format html --report-target file://reports/ttk-func-tests-report.html
npm run cli -- -u http://ttk-ttksim1:5050 -l 2 -i /tmp/test_cases/testing-toolkit-test-cases-master/collections/hub/other_tests/sdk_tests -e environments/hub_local_environment.json --report-format html --report-target file://reports/ttk-func-tests-report.html
Loading