Merge pull request #136 from jimni1222/callback

Added callback parameter for combineSignatures

packages/caver-klay/caver-klay-accounts/src/index.js

@@ -900,15 +900,24 @@ Accounts.prototype.getRawTransactionWithSignatures = function getRawTransactionW
  * 
  * @method combineSignatures
  * @param {Array} rawTransactions The array of raw transaction string to combine.
+ * @param {Function} callback The callback function to call.
  * @return {Object}
  */
-Accounts.prototype.combineSignatures = function combineSignatures(rawTransactions) {
+Accounts.prototype.combineSignatures = function combineSignatures(rawTransactions, callback) {
   let decodedTx
   let senders = []
   let feePayers = []
   let feePayer
 
-  if (!_.isArray(rawTransactions)) throw new Error(`The parameter of the combineSignatures function must be an array of RLP encoded transaction strings.`)
+  callback = callback || function () {}
+
+  let handleError = (e) => {
+    e = e instanceof Error? e : new Error(e)
+    if (callback) callback(e)
+    return Promise.reject(e)
+  }
+
+  if (!_.isArray(rawTransactions)) return handleError(`The parameter of the combineSignatures function must be an array of RLP encoded transaction strings.`)
 
   for (const raw of rawTransactions) {
     const { senderSignatures, feePayerSignatures, decodedTransaction } = extractSignatures(raw)
@@ -944,7 +953,7 @@ Accounts.prototype.combineSignatures = function combineSignatures(rawTransaction
           break
         }
       }
-      if (!isSame) throw new Error(`Failed to combineSignatures: Signatures that sign to different transaction cannot be combined.`)
+      if (!isSame) return handleError(`Failed to combineSignatures: Signatures that sign to different transaction cannot be combined.`)
     } else {
       decodedTx = decodedTransaction
     }
@@ -960,7 +969,7 @@ Accounts.prototype.combineSignatures = function combineSignatures(rawTransaction
       parsedTxObject.feePayerSignatures = feePayers
     }
   }
-  return this.getRawTransactionWithSignatures(parsedTxObject)
+  return this.getRawTransactionWithSignatures(parsedTxObject, callback)
 }
 
 /**

test/packages/caver.klay.accounts.js

@@ -1752,6 +1752,32 @@ describe('caver.klay.accounts.combineSignatures', () => {
       expect(decoded.signatures.length).to.equals(3)
     }).timeout(200000)
   })
+
+  context('CAVERJS-UNIT-WALLET-387: input: not array', () => {
+    it('should throw error when parameter is not array', async () => {
+      let signResult = await caver.klay.accounts.signTransaction(feeDelegatedTx)
+
+      const expectedError = 'The parameter of the combineSignatures function must be an array of RLP encoded transaction strings.'
+      await expect(caver.klay.accounts.combineSignatures(signResult.rawTransaction, (error, result) => {
+        expect(error).not.to.be.undefined
+        expect(result).to.be.undefined
+      })).to.be.rejectedWith(expectedError)
+    }).timeout(200000)
+  })
+
+  context('CAVERJS-UNIT-WALLET-388: input: different RLP encoded transaction', () => {
+    it('should throw error when contents of transaction is not same', async () => {
+      let signResult = await caver.klay.accounts.signTransaction(feeDelegatedTx, sender.transactionKey[0])
+      feeDelegatedTx.value = 2
+      let signResult2 = await caver.klay.accounts.signTransaction(feeDelegatedTx, sender.transactionKey[2])
+
+      const expectedError = 'Failed to combineSignatures: Signatures that sign to different transaction cannot be combined.'
+      await expect(caver.klay.accounts.combineSignatures([signResult.rawTransaction, signResult2.rawTransaction], (error, result) => {
+        expect(error).not.to.be.undefined
+        expect(result).to.be.undefined
+      })).to.be.rejectedWith(expectedError)
+    }).timeout(200000)
+  })
 })
 
 describe('caver.klay.accounts.recoverTransaction', () => {