fix: append account to forwardedBy array

interledgerjs · Dec 5, 2017 · 552152c · 552152c
1 parent 30bf014
commit 552152c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/models/payments.js b/src/models/payments.js
@@ -91,14 +91,16 @@ async function rejectSourceTransfer (destinationTransfer, rejectionMessage, ledg
   const noteToSelf = destinationTransfer.noteToSelf || {}
   const sourceTransferLedger = noteToSelf.source_transfer_ledger
   const sourceTransferId = noteToSelf.source_transfer_id
+  const connectorAccount = ledgers.getPlugin(sourceTransferLedger).getAccount()
   validator.validate('IlpAddress', sourceTransferLedger)
   validator.validate('Uuid', sourceTransferId)
 
   await ledgers.getPlugin(sourceTransferLedger)
     .rejectIncomingTransfer(sourceTransferId, Object.assign(rejectionMessage, {
-      forwarded_by: ledgers.getPlugin(sourceTransferLedger).getAccount()
+      forwarded_by: (rejectionMessage.forwarded_by || []).concat(connectorAccount)
     }))
-    .catch(() => {
+    .catch((err) => {
+      log.debug('Error rejecting source transfer:', err)
       log.warn('Attempted to reject source transfer but it was unsucessful')
     })
 }

diff --git a/test/paymentsSpec.js b/test/paymentsSpec.js
@@ -545,7 +545,7 @@ describe('Payments', function () {
         name: 'Error 1',
         message: 'error 1',
         triggered_by: 'foo',
-        forwarded_by: 'mock.test2.bob',
+        forwarded_by: ['mock.test2.bob'],
         additional_info: {}
       })
     })
@@ -566,6 +566,7 @@ describe('Payments', function () {
         name: 'Error 1',
         message: 'error 1',
         triggered_by: 'foo',
+        forwarded_by: ['mock.someone.else'],
         additional_info: {}
       })
       sinon.assert.calledOnce(rejectSpy)
@@ -574,7 +575,7 @@ describe('Payments', function () {
         name: 'Error 1',
         message: 'error 1',
         triggered_by: 'foo',
-        forwarded_by: 'mock.test2.bob',
+        forwarded_by: ['mock.someone.else', 'mock.test2.bob'],
         additional_info: {}
       })
     })