Skip to content

Commit

Permalink
Update pisp/master (mojaloop#755)
Browse files Browse the repository at this point in the history
* fix for python error in CI (mojaloop#733)

Co-authored-by: Shashi <shashikant.hirugade@modusbox.com>

* Ensure 'timeout-reserved' notification action passes through and not converted to 'abort' action (mojaloop#736)

* Update CS shared (mojaloop#737)

* Feature/1332 enable on-us transfers (mojaloop#738)

* Added ENABLE_ON_US_TRANSFERS

* Bumped up the version

* Feature/otc 525 implement get transaction object by transfer (mojaloop#735)

* OTC-525 Implement GET transaction Object by transferId
Changes:

Updated swagger def to include new endpoints for:
- Get transaction by transfer id
- Post ledger entry

Added new method for:
- Get transaction by transfer id

Added unit tests for Get transaction by transfer id

* OTC-525 Implement GET transaction Object by transferId
Bumput up versions

* OTC-525 Implement GET transaction Object by transferId
Resolved dependency updates

* OTC-525 Implement GET transaction Object by transferId

* OTC-525 Implement GET transaction Object by transferId

Changes:

Updated swagger def to include new endpoints for:
- Get transaction by transfer id

Added new method for:
- Get transaction by transfer id

Added unit tests for Get transaction by transfer id

* changed docker dependency in circle CI image scan from python-dev to python3-dev (mojaloop#741)

* Updated python in some other places in circle CI (mojaloop#742)

* Fix the image scan step in circle CI

* Resolved audit checks

* Feature/#1335 aborted on put (mojaloop#740)

* added error log if action REJECT comes into fulfil handler

Co-authored-by: Valentin <valentin.genev@modusbox.com>

* Bugfix/deadlock on adjust limits (mojaloop#745)

* added unique index on participantLimit and logging

* added unique index on participantLimit and logging

* resolve audit issues

* fixed coverage tests

Co-authored-by: Shashi <shashikant.hirugade@modusbox.com>

* Updated dependencies and product version for issue: mojaloop/project#1378 (mojaloop#747)

* Update error message  (mojaloop#749)

* Update error message when Payer FSP and Payee FSP are the same and on-us is not enabled.. (Added text "FSP" to specify)

* Updated unit test

* #1423: Bulk transfers error processing in Central Ledger (mojaloop#743)

* Updates for bulk error processing

* Bump version

* Updates for bulk transfer error processing

* Updates for bulk transfer error processing

* More updates for bulk error processing

* changes to cater for bulk_abort

* updated central-services-shared

* Updates for bulk error processing

* Add unit test for BULK_ABORT branch in transfer fulfil handler

* Add unit test for BULK_ABORT branch in transfer facade

* Small fix for position handler test for BULK_ABORT branch

Co-authored-by: Rajiv Mothilal <rajivmothilal@gmail.com>

* Bump version for release (mojaloop#750)

* Feature/#1334 patch request notif (mojaloop#751)

* added handling of request for notification by payee functionality
* improved coverage and added missing action letter

Co-authored-by: Valentin <valentin.genev@modusbox.com>

* chore(package): update contributors list & deps

* chore: audit & deps update

Co-authored-by: shashi165 <33355509+shashi165@users.noreply.github.com>
Co-authored-by: Shashi <shashikant.hirugade@modusbox.com>
Co-authored-by: Steven Oderayi <oderayi@gmail.com>
Co-authored-by: vijayg10 <33152110+vijayg10@users.noreply.github.com>
Co-authored-by: lazolalucas <lazolalucas@users.noreply.github.com>
Co-authored-by: Valentin Genev <vgenev@gmail.com>
Co-authored-by: Valentin <valentin.genev@modusbox.com>
Co-authored-by: Adrian Enns <ennsak@gmail.com>
Co-authored-by: Sam <10507686+elnyry-sam-k@users.noreply.github.com>
Co-authored-by: Rajiv Mothilal <rajivmothilal@gmail.com>
  • Loading branch information
11 people authored and kleyow committed Dec 20, 2020
1 parent 19a9b6d commit 7454984
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 2 deletions.
11 changes: 10 additions & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ executors:
default-machine:
machine:
image: ubuntu-1604:201903-01

##
# Jobs
#
Expand Down Expand Up @@ -253,6 +252,16 @@ jobs:
apk add --no-cache -t build-dependencies make gcc g++ python3 libtool autoconf automake
npm config set unsafe-perm true
npm install -g node-gyp
- run:
name: Install general dependencies
command: |
apk --no-cache add git
apk --no-cache add ca-certificates
apk --no-cache add curl
apk --no-cache add openssh-client
apk add --no-cache -t build-dependencies make gcc g++ python3 libtool autoconf automake
npm config set unsafe-perm true
npm install -g node-gyp
- run:
name: Install AWS CLI dependencies
command: *defaults_awsCliDependencies
Expand Down
4 changes: 3 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@
"Sam Kummary <sam@modusbox.com>",
"Steven Oderayi <steven.oderayi@modusbox.com>",
"Valentin Genev <valentin.genev@modusbox.com>",
"Shashikant Hirugade <shashikant.hirugade@modusbox.com>"
"Shashikant Hirugade <shashikant.hirugade@modusbox.com>",
"Paweł Marzec <pawel.marzec@modusbox.com>",
"Kevin Leylow <kevin.leyow@modusbox.com>"
],
"repository": {
"type": "git",
Expand Down

0 comments on commit 7454984

Please sign in to comment.