Merge branch 'feature/apostille_http_upgrades' of github.com:luxtagof…

…ficial/Apostille-library into feature/apostille_http_upgrades
luxtagofficial · Dec 4, 2018 · 127d36c · 127d36c
2 parents 5b20de9 + e167327
commit 127d36c
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 15 deletions.
diff --git a/src/model/apostille/ApostillePublicAccount.ts b/src/model/apostille/ApostillePublicAccount.ts
@@ -1,4 +1,4 @@
-import { Account, AggregateTransaction, Deadline, LockFundsTransaction, ModifyMultisigAccountTransaction, Mosaic, MultisigCosignatoryModification, MultisigCosignatoryModificationType, PlainMessage, PublicAccount, SignedTransaction, Transaction, TransferTransaction, UInt64, XEM } from 'nem2-sdk';
+import { Account, AggregateTransaction, Deadline, InnerTransaction, LockFundsTransaction, ModifyMultisigAccountTransaction, Mosaic, MultisigCosignatoryModification, MultisigCosignatoryModificationType, PlainMessage, PublicAccount, SignedTransaction, Transaction, TransferTransaction, UInt64, XEM } from 'nem2-sdk';
 import { HashFunction } from '../../hash/HashFunction';
 import { Errors } from '../../types/Errors';
 
@@ -140,21 +140,22 @@ export class ApostillePublicAccount {
    * @returns
    * @memberof ApostillePublicAccount
    */
+
   public signAggregate(transaction: Transaction, signers: Account[], isComplete: boolean): SignedTransaction {
     if (isComplete) {
        return this._signTransferTransactionAgregateComplete(transaction, signers);
     } else {
-      return this._signTransferTransactionAggregateBonded(transaction, signers);
+      return this._signAgregateBondedTransaction(innerTransactions, signers);
     }
   }
 
-  private _signTransferTransactionAgregateComplete(
-    transaction: Transaction,
+  private _signAgregateCompleteTransaction(
+    innerTransactions: InnerTransaction[],
     signers: Account[],
   ): SignedTransaction {
     const aggregateTransaction = AggregateTransaction.createComplete(
       Deadline.create(),
-      [transaction.toAggregate(this.publicAccount)],
+      innerTransactions,
       this.publicAccount.address.networkType,
       []);
 
@@ -163,13 +164,13 @@ export class ApostillePublicAccount {
     return signedAggregateTransaction;
   }
 
-  private _signTransferTransactionAggregateBonded(
-    transaction: Transaction,
+  private _signAgregateBondedTransaction(
+    innerTransactions: InnerTransaction[],
     signers: Account[],
   ): SignedTransaction {
     const aggregateTransaction = AggregateTransaction.createBonded(
       Deadline.create(),
-      [transaction.toAggregate(this.publicAccount)],
+      innerTransactions,
       this.publicAccount.address.networkType);
 
     const signedAggregateTransaction = this._signAggregate(aggregateTransaction, signers);

diff --git a/tests/unit/model/apostille/ApostillePublicAccount.spec.ts b/tests/unit/model/apostille/ApostillePublicAccount.spec.ts
@@ -107,9 +107,12 @@ describe('apostille public account transaction methods should work properly', ()
       [signer.publicAccount],
       0,
       0);
+
+    const innerTransaction = transferTransaction.toAggregate(apostillePublicAccount.publicAccount);
+
     expect(() => {
       apostillePublicAccount.signAggregate(
-      transferTransaction,
+      [innerTransaction],
       [],
       true);
     }).toThrowError(Errors[Errors.UNABLE_TO_SIGN_AGGREGATE_TRANSACTION]);
@@ -121,8 +124,10 @@ describe('apostille public account transaction methods should work properly', ()
       [signer.publicAccount],
       0,
       0);
+
+    const innerTransaction = transferTransaction.toAggregate(apostillePublicAccount.publicAccount);
     const signedTransferTransaction = apostillePublicAccount.signAggregate(
-      transferTransaction,
+      [innerTransaction],
       [signer],
       true);
     expect(signedTransferTransaction.signer).toMatch(signer.publicAccount.publicKey);
@@ -134,8 +139,11 @@ describe('apostille public account transaction methods should work properly', ()
       [signer.publicAccount],
       0,
       0);
+
+    const innerTransaction = transferTransaction.toAggregate(apostillePublicAccount.publicAccount);
+
     const signedTransferTransaction = apostillePublicAccount.signAggregate(
-      transferTransaction,
+      [innerTransaction],
       [signer, secondSigner],
       true);
     expect(signedTransferTransaction.signer).toMatch(signer.publicAccount.publicKey);
@@ -147,8 +155,10 @@ describe('apostille public account transaction methods should work properly', ()
       [signer.publicAccount],
       0,
       0);
+
+    const innerTransaction = aggregateBondedTransaction.toAggregate(apostillePublicAccount.publicAccount);
     const signedAggregateBondedTransaction = apostillePublicAccount.signAggregate(
-      aggregateBondedTransaction,
+      [innerTransaction],
       [signer],
       false);
     expect(signedAggregateBondedTransaction.signer).toMatch(signer.publicAccount.publicKey);
@@ -160,8 +170,10 @@ describe('apostille public account transaction methods should work properly', ()
       [signer.publicAccount],
       0,
       0);
+    const innerTransaction = aggregateBondedTransaction.toAggregate(apostillePublicAccount.publicAccount);
+
     const signedAggregateBondedTransaction = apostillePublicAccount.signAggregate(
-      aggregateBondedTransaction,
+      [innerTransaction],
       [signer, secondSigner],
       false);
     expect(signedAggregateBondedTransaction.signer).toMatch(signer.publicAccount.publicKey);
@@ -173,8 +185,11 @@ describe('apostille public account transaction methods should work properly', ()
       [signer.publicAccount],
       0,
       0);
+
+    const innerTransaction = aggregateBondedTransaction.toAggregate(apostillePublicAccount.publicAccount);
+
     const signedAggregateBondedTransaction = apostillePublicAccount.signAggregate(
-      aggregateBondedTransaction,
+      [innerTransaction],
       [signer],
       false);
     const lockFundsTransaction = apostillePublicAccount.lockFundsTransaction(
@@ -188,8 +203,11 @@ describe('apostille public account transaction methods should work properly', ()
       [signer.publicAccount],
       0,
       0);
+
+    const innerTransaction = aggregateBondedTransaction.toAggregate(apostillePublicAccount.publicAccount);
+
     const signedAggregateBondedTransaction = apostillePublicAccount.signAggregate(
-      aggregateBondedTransaction,
+      [innerTransaction],
       [signer],
       false);
     const lockFundsTransaction = apostillePublicAccount.lockFundsTransaction(