minor imporovemnts

Author: Aleix Morgadas

e2e/infrastructure/Listener.spec.ts

@@ -13,15 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {AccountHttp} from '../../src/infrastructure/AccountHttp';
-import {Listener} from '../../src/infrastructure/Listener';
-import {Address} from '../../src/model/account/Address';
+import { AccountHttp } from '../../src/infrastructure/AccountHttp';
+import { Listener } from '../../src/infrastructure/Listener';
+import { Address } from '../../src/model/account/Address';
 import * as conf from '../conf/conf.spec';
 import {
     APIUrl, Cosignatory2Account, Cosignatory3Account, CosignatoryAccount, MultisigAccount,
     TestingAccount,
 } from '../conf/conf.spec';
-import {TransactionUtils} from './TransactionUtils';
+import { TransactionUtils } from './TransactionUtils';
 
 describe('Listener', () => {
     let account;
@@ -40,64 +40,78 @@ describe('Listener', () => {
     });
 
     it('newBlock', (done) => {
-        listener.newBlock().subscribe((res) => {
-            done();
-        });
+        listener.newBlock()
+            .toPromise()
+            .then((res) => {
+                done();
+            });
 
         TransactionUtils.createAndAnnounce();
     });
 
     it('confirmedTransactionsGiven address signer', (done) => {
-        listener.confirmed(account.address).subscribe((res) => {
-            done();
-        });
+        listener.confirmed(account.address)
+            .toPromise()
+            .then((res) => {
+                done();
+            });
 
         TransactionUtils.createAndAnnounce();
     });
 
     it('confirmedTransactionsGiven address recipient', (done) => {
         const recipientAddress = Address.createFromRawAddress('SBILTA367K2LX2FEXG5TFWAS7GEFYAGY7QLFBYKC');
-        listener.confirmed(recipientAddress).subscribe((res) => {
-            done();
-        });
+        listener.confirmed(recipientAddress)
+            .toPromise()
+            .then((res) => {
+                done();
+            });
 
         TransactionUtils.createAndAnnounce();
     });
 
     it('unconfirmedTransactionsAdded', (done) => {
-        listener.unconfirmedAdded(account.address).subscribe((res) => {
-            done();
-        });
+        listener.unconfirmedAdded(account.address)
+            .toPromise()
+            .then((res) => {
+                done();
+            });
 
         setTimeout(() => {
             TransactionUtils.createAndAnnounce();
         }, 1000);
     });
 
     it('unconfirmedTransactionsRemoved', (done) => {
-        listener.unconfirmedRemoved(account.address).subscribe((res) => {
-            done();
-        });
+        listener.unconfirmedRemoved(account.address)
+            .toPromise()
+            .then((res) => {
+                done();
+            });
 
         setTimeout(() => {
             TransactionUtils.createAndAnnounce();
         }, 1000);
     });
 
     it('aggregateBondedTransactionsAdded', (done) => {
-        listener.aggregateBondedAdded(multisigAccount.address).subscribe((res) => {
-            done();
-        });
+        listener.aggregateBondedAdded(multisigAccount.address)
+            .toPromise()
+            .then((res) => {
+                done();
+            });
 
         setTimeout(() => {
             TransactionUtils.createAggregateBoundedTransactionAndAnnounce();
         }, 1000);
     });
 
     it('aggregateBondedTransactionsRemoved', (done) => {
-        listener.aggregateBondedRemoved(multisigAccount.address).subscribe((res) => {
-            done();
-        });
+        listener.aggregateBondedRemoved(multisigAccount.address)
+            .toPromise()
+            .then((res) => {
+                done();
+            });
 
         setTimeout(() => {
             TransactionUtils.createAggregateBoundedTransactionAndAnnounce();
@@ -112,9 +126,11 @@ describe('Listener', () => {
     });
 
     it('cosignatureAdded', (done) => {
-        listener.cosignatureAdded(multisigAccount.address).subscribe((res) => {
-            done();
-        });
+        listener.cosignatureAdded(multisigAccount.address)
+            .toPromise()
+            .then((res) => {
+                done();
+            });
 
         setTimeout(() => {
             TransactionUtils.createAggregateBoundedTransactionAndAnnounce();
@@ -128,9 +144,11 @@ describe('Listener', () => {
     });
 
     it('transactionStatusGiven', (done) => {
-        listener.status(account.address).subscribe((res) => {
-            done();
-        });
+        listener.status(account.address)
+            .toPromise()
+            .then((res) => {
+                done();
+            });
 
         setTimeout(() => {
             TransactionUtils.createAndAnnounceWithInsufficientBalance();

e2e/infrastructure/TransactionUtils.ts

@@ -64,7 +64,7 @@ export class TransactionUtils {
             NetworkType.MIJIN_TEST,
         );
 
-        const aggregateTransaction = AggregateTransaction.createComplete(
+        const aggregateTransaction = AggregateTransaction.createBonded(
             Deadline.create(2, ChronoUnit.MINUTES),
             [transferTransaction.toAggregate(MultisigAccount.publicAccount)],
             NetworkType.MIJIN_TEST,