Skip to content

Commit

Permalink
refactor!: merge in mojaloop-connector differences (#314)
Browse files Browse the repository at this point in the history 
* feat: port over prom client metrics

* chore: ignore

* feat: pull in live reconfiguration logic

* chore: fix mock

* chore: ignore

* refactor: merge in mojaloop-connector differences

* chore: changes

* chore: test

* chore: update outbound api

* chore: update test data

* chore: update models and handlers

* chore: update tests

* chore: remove

* chore: int test

* chore: tests

* chore: linting

* chore: indentation and headers

* chore: spelling

* chore: rename multiple to batch

* feat: refactor accounts model

* feat: standardize cache messages

* chore: stuff

* chore: stuff

* chore: clarify
  • Loading branch information
@kleyow
kleyow authored May 10, 2022
1 parent de7471a commit e2626f9
Show file tree
Hide file tree
Showing 50 changed files with 2,301 additions and 602 deletions.
3 changes: 3 additions & 0 deletions .env.example
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,9 @@ ALS_ENDPOINT=127.0.0.1:6500
# To allow transfer without a previous quote request, set this value to true.
# The incoming transfer request should consists of an ILP packet and a matching condition in this case.
# The fulfilment will be generated from the provided ILP packet, and must hash to the provided condition.
# If using the sdk-scheme-adapter in place of the deprecated `mojaloop-connector`
# make sure this is false. Scenarios that use `mojaloop-connector`
# absolutely requires a previous quote before allowing a transfer to proceed.
ALLOW_TRANSFER_WITHOUT_QUOTE=false

# To enable request for notification on fulfiled transfer
Expand Down
4 changes: 2 additions & 2 deletions ...spec_files/api_definitions/fspiop_1.1/trigger_templates/transaction_request_followup.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
"payerFirstName": "Vijay",
"payerLastName": "Kumar",
"payerDOB": "1984-01-01",
"accept": "application/vnd.interoperability.parties+json;version=1.0",
"contentType": "application/vnd.interoperability.parties+json;version=1.0",
"accept": "application/vnd.interoperability.parties+json;version=1.1",
"contentType": "application/vnd.interoperability.parties+json;version=1.1",
"transactionId": "e8c4572c-0826-22f4-aa3e-f5bbe928afa6",
"TrsNote": "note",
"TrsCurrency": "USD",
Expand Down
14 changes: 7 additions & 7 deletions docker/ml-testing-toolkit/spec_files/rules_callback/default.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"path": "/parties/{Type}/{ID}",
"params": {
"headers": {
"Content-Type": "application/vnd.interoperability.parties+json;version=1.0",
"Content-Type": "application/vnd.interoperability.parties+json;version=1.1",
"Date": "Wed, 27 May 2020 11:13:34 GMT",
"X-Forwarded-For": "sed eiusmod sunt",
"FSPIOP-Source": "{$config.FSPID}",
Expand Down Expand Up @@ -119,7 +119,7 @@
"path": "/parties/{Type}/{ID}",
"params": {
"headers": {
"Content-Type": "application/vnd.interoperability.parties+json;version=1.0",
"Content-Type": "application/vnd.interoperability.parties+json;version=1.1",
"Date": "Wed, 27 May 2020 11:13:34 GMT",
"X-Forwarded-For": "sed eiusmod sunt",
"FSPIOP-Source": "{$config.FSPID}",
Expand Down Expand Up @@ -192,7 +192,7 @@
"path": "/quotes/{ID}",
"params": {
"headers": {
"Content-Type": "application/vnd.interoperability.quotes+json;version=1.0",
"Content-Type": "application/vnd.interoperability.quotes+json;version=1.1",
"Date": "Wed, 27 May 2020 11:13:34 GMT",
"FSPIOP-Source": "{$config.FSPID}",
"FSPIOP-Destination": "mojaloop-sdk",
Expand Down Expand Up @@ -272,7 +272,7 @@
"path": "/quotes/{ID}",
"params": {
"headers": {
"Content-Type": "application/vnd.interoperability.quotes+json;version=1.0",
"Content-Type": "application/vnd.interoperability.quotes+json;version=1.1",
"Date": "Wed, 27 May 2020 11:13:34 GMT",
"FSPIOP-Source": "{$config.FSPID}",
"FSPIOP-Destination": "mojaloop-sdk",
Expand Down Expand Up @@ -357,7 +357,7 @@
"path": "/transfers/{ID}",
"params": {
"headers": {
"Content-Type": "application/vnd.interoperability.transfers+json;version=1.0",
"Content-Type": "application/vnd.interoperability.transfers+json;version=1.1",
"Date": "Wed, 27 May 2020 11:13:34 GMT",
"FSPIOP-Source": "{$config.FSPID}",
"FSPIOP-Destination": "mojaloop-sdk",
Expand Down Expand Up @@ -405,7 +405,7 @@
"path": "/transfers/{ID}",
"params": {
"headers": {
"Content-Type": "application/vnd.interoperability.transfers+json;version=1.0",
"Content-Type": "application/vnd.interoperability.transfers+json;version=1.1",
"Date": "Wed, 27 May 2020 11:13:34 GMT",
"FSPIOP-Source": "{$config.FSPID}",
"FSPIOP-Destination": "mojaloop-sdk",
Expand All @@ -423,4 +423,4 @@
"type": "callback",
"version": 1
}
]
]
32 changes: 16 additions & 16 deletions docker/ml-testing-toolkit/spec_files/rules_response/default.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -261,8 +261,8 @@
"method: 'post',",
"header: {",
" 'FSPIOP-Source': 'dfspA',",
" 'Accept': 'application/vnd.interoperability.thirdparty+json;version=1.0',",
" 'Content-Type': 'application/vnd.interoperability.thirdparty+json;version=1.0',",
" 'Accept': 'application/vnd.interoperability.thirdparty+json;version=1.1',",
" 'Content-Type': 'application/vnd.interoperability.thirdparty+json;version=1.1',",
" 'Date': curDate",
"},",
"body: {",
Expand Down Expand Up @@ -342,8 +342,8 @@
"method: 'put',",
"header: {",
" 'FSPIOP-Source': 'auth.dfspA',",
" 'Accept': 'application/vnd.interoperability.thirdparty+json;version=1.0',",
" 'Content-Type': 'application/vnd.interoperability.thirdparty+json;version=1.0',",
" 'Accept': 'application/vnd.interoperability.thirdparty+json;version=1.1',",
" 'Content-Type': 'application/vnd.interoperability.thirdparty+json;version=1.1',",
" 'Date': curDate",
"},",
"body: {",
Expand Down Expand Up @@ -828,8 +828,8 @@
" method: 'put',",
" header: {",
" 'FSPIOP-Source': 'pispA',",
" 'Accept': 'application/vnd.interoperability.thirdparty+json;version=1.0',",
" 'Content-Type': 'application/vnd.interoperability.thirdparty+json;version=1.0',",
" 'Accept': 'application/vnd.interoperability.thirdparty+json;version=1.1',",
" 'Content-Type': 'application/vnd.interoperability.thirdparty+json;version=1.1',",
" 'Date': curDate",
" },",
" body: {",
Expand Down Expand Up @@ -909,8 +909,8 @@
" method: 'put',",
" header: {",
" 'FSPIOP-Source': 'pispA',",
" 'Accept': 'application/vnd.interoperability.thirdparty+json;version=1.0',",
" 'Content-Type': 'application/vnd.interoperability.thirdparty+json;version=1.0',",
" 'Accept': 'application/vnd.interoperability.thirdparty+json;version=1.1',",
" 'Content-Type': 'application/vnd.interoperability.thirdparty+json;version=1.1',",
" 'Date': curDate",
" },",
" body: {",
Expand Down Expand Up @@ -997,8 +997,8 @@
"method: 'put',",
"header: {",
" 'FSPIOP-Source': 'auth.dfspA',",
" 'Accept': 'application/vnd.interoperability.thirdparty+json;version=1.0',",
" 'Content-Type': 'application/vnd.interoperability.thirdparty+json;version=1.0',",
" 'Accept': 'application/vnd.interoperability.thirdparty+json;version=1.1',",
" 'Content-Type': 'application/vnd.interoperability.thirdparty+json;version=1.1',",
" 'Date': curDate",
"},",
"body: {",
Expand Down Expand Up @@ -1092,8 +1092,8 @@
"method: 'delete',",
"header: {",
" 'FSPIOP-Source': 'dfspa',",
" 'Accept': 'application/vnd.interoperability.participants+json;version=1.0',",
" 'Content-Type': 'application/vnd.interoperability.participants+json;version=1.0',",
" 'Accept': 'application/vnd.interoperability.participants+json;version=1.1',",
" 'Content-Type': 'application/vnd.interoperability.participants+json;version=1.1',",
" 'Date': curDate",
"}",
"}",
Expand Down Expand Up @@ -1153,8 +1153,8 @@
"method: 'post',",
"header: {",
" 'FSPIOP-Source': 'dfspa',",
" 'Accept': 'application/vnd.interoperability.participants+json;version=1.0',",
" 'Content-Type': 'application/vnd.interoperability.participants+json;version=1.0',",
" 'Accept': 'application/vnd.interoperability.participants+json;version=1.1',",
" 'Content-Type': 'application/vnd.interoperability.participants+json;version=1.1',",
" 'Date': curDate",
"},",
"body: {",
Expand Down Expand Up @@ -1220,8 +1220,8 @@
"method: 'delete',",
"header: {",
" 'FSPIOP-Source': 'dfspa',",
" 'Accept': 'application/vnd.interoperability.participants+json;version=1.0',",
" 'Content-Type': 'application/vnd.interoperability.participants+json;version=1.0',",
" 'Accept': 'application/vnd.interoperability.participants+json;version=1.1',",
" 'Content-Type': 'application/vnd.interoperability.participants+json;version=1.1',",
" 'Date': curDate",
"}",
"}",
Expand Down
10 changes: 5 additions & 5 deletions docker/ml-testing-toolkit/spec_files/rules_response/default_pisp_rules.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@
" method: 'POST',",
" header: {",
" 'FSPIOP-Source': 'switch',",
" 'Accept': 'application/vnd.interoperability.thirdparty+json;version=1.0',",
" 'Content-Type': 'application/vnd.interoperability.thirdparty+json;version=1.0',",
" 'Accept': 'application/vnd.interoperability.thirdparty+json;version=1.1',",
" 'Content-Type': 'application/vnd.interoperability.thirdparty+json;version=1.1',",
" 'Date': curDate",
" },",
" body: {",
Expand Down Expand Up @@ -135,8 +135,8 @@
"method: 'patch',",
"header: {",
" 'FSPIOP-Source': 'switch',",
" 'Accept': 'application/vnd.interoperability.thirdparty+json;version=1.0',",
" 'Content-Type': 'application/vnd.interoperability.thirdparty+json;version=1.0',",
" 'Accept': 'application/vnd.interoperability.thirdparty+json;version=1.1',",
" 'Content-Type': 'application/vnd.interoperability.thirdparty+json;version=1.1',",
" 'Date': curDate",
"},",
"body: {",
Expand All @@ -158,4 +158,4 @@
"type": "response",
"version": 1
}
]
]
20 changes: 10 additions & 10 deletions docker/ml-testing-toolkit/spec_files/rules_validation/default.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"path": "/parties/{Type}/{ID}/error",
"params": {
"headers": {
"Content-Type": "application/vnd.interoperability.parties+json;version=1.0",
"Content-Type": "application/vnd.interoperability.parties+json;version=1.1",
"Date": "Fri, 02 Feb 1996 03:04:05 GMT",
"FSPIOP-Source": "switch"
},
Expand Down Expand Up @@ -110,7 +110,7 @@
"path": "/parties/{Type}/{ID}/error",
"params": {
"headers": {
"Content-Type": "application/vnd.interoperability.parties+json;version=1.0",
"Content-Type": "application/vnd.interoperability.parties+json;version=1.1",
"Date": "Fri, 02 Feb 1996 03:04:05 GMT",
"FSPIOP-Source": "switch"
},
Expand Down Expand Up @@ -180,7 +180,7 @@
"path": "/parties/{Type}/{ID}/error",
"params": {
"headers": {
"Content-Type": "application/vnd.interoperability.parties+json;version=1.0",
"Content-Type": "application/vnd.interoperability.parties+json;version=1.1",
"Date": "Fri, 02 Feb 1996 03:04:05 GMT",
"FSPIOP-Source": "switch"
},
Expand Down Expand Up @@ -250,7 +250,7 @@
"path": "/parties/{Type}/{ID}/error",
"params": {
"headers": {
"Content-Type": "application/vnd.interoperability.parties+json;version=1.0",
"Content-Type": "application/vnd.interoperability.parties+json;version=1.1",
"Date": "Fri, 02 Feb 1996 03:04:05 GMT",
"FSPIOP-Source": "switch"
},
Expand Down Expand Up @@ -320,7 +320,7 @@
"path": "/parties/{Type}/{ID}/error",
"params": {
"headers": {
"Content-Type": "application/vnd.interoperability.parties+json;version=1.0",
"Content-Type": "application/vnd.interoperability.parties+json;version=1.1",
"Date": "Fri, 02 Feb 1996 03:04:05 GMT",
"FSPIOP-Source": "switch"
},
Expand Down Expand Up @@ -384,7 +384,7 @@
"path": "/thirdpartyRequests/transactions/{ID}/error",
"params": {
"headers": {
"Content-Type": "application/vnd.interoperability.thirdparty+json;version=1.0",
"Content-Type": "application/vnd.interoperability.thirdparty+json;version=1.1",
"Date": "Fri, 02 Feb 2020 03:04:05 GMT",
"FSPIOP-Source": "switch"
},
Expand Down Expand Up @@ -448,7 +448,7 @@
"path": "/thirdpartyRequests/transactions/{ID}/error",
"params": {
"headers": {
"Content-Type": "application/vnd.interoperability.thirdparty+json;version=1.0",
"Content-Type": "application/vnd.interoperability.thirdparty+json;version=1.1",
"Date": "Fri, 02 Feb 2020 03:04:05 GMT",
"FSPIOP-Source": "switch"
},
Expand Down Expand Up @@ -512,7 +512,7 @@
"path": "/thirdpartyRequests/transactions/{ID}/error",
"params": {
"headers": {
"Content-Type": "application/vnd.interoperability.thirdparty+json;version=1.0",
"Content-Type": "application/vnd.interoperability.thirdparty+json;version=1.1",
"Date": "Fri, 02 Feb 2020 03:04:05 GMT",
"FSPIOP-Source": "switch"
},
Expand Down Expand Up @@ -576,7 +576,7 @@
"path": "/thirdpartyRequests/transactions/{ID}/error",
"params": {
"headers": {
"Content-Type": "application/vnd.interoperability.thirdparty+json;version=1.0",
"Content-Type": "application/vnd.interoperability.thirdparty+json;version=1.1",
"Date": "Fri, 02 Feb 2020 03:04:05 GMT",
"FSPIOP-Source": "switch"
},
Expand Down Expand Up @@ -640,7 +640,7 @@
"path": "/thirdpartyRequests/transactions/{ID}/error",
"params": {
"headers": {
"Content-Type": "application/vnd.interoperability.thirdparty+json;version=1.0",
"Content-Type": "application/vnd.interoperability.thirdparty+json;version=1.1",
"Date": "Fri, 02 Feb 2020 03:04:05 GMT",
"FSPIOP-Source": "switch"
},
Expand Down
Loading

0 comments on commit e2626f9

Please sign in to comment.