Merge branch 'master' into iss22

Author: Grégory Saive

.travis.yml

@@ -8,4 +8,17 @@ cache:
     - "node_modules"
 before_script:
   - npm run build
-script: npm run test:coveralls
+script: 
+  - npm run test:coveralls
+before_deploy:
+  - npm install --global typedoc
+  - typedoc --out ts-docs src
+deploy:
+  provider: pages
+  skip_cleanup: true
+  keep-history: true
+  local_dir: ts-docs
+  github_token: $GITHUB_TOKEN
+  on:
+    branch: master
+  

README.md

@@ -14,6 +14,11 @@ with the NEM2 (a.k.a Catapult)
 
 - NodeJS 8.9.X
 - NodeJS 9.X.X
+- NodeJS 10.X.X
+
+## Installation
+
+```npm install nem2-sdk rxjs```
 
 ## Documentation and Getting Started
 
@@ -46,4 +51,4 @@ Licensed under the [Apache License 2.0](LICENSE)
 [self]: https://github.com/nemtech/nem2-sdk-typescript-javascript
 [docs]: http://nemtech.github.io/getting-started/setup-workstation.html
 [issues]: https://github.com/nemtech/nem2-sdk-typescript-javascript/issues
-[sdk-ref]: http://nemtech.github.io/nem2-sdk-typescript-javascript
+[sdk-ref]: http://nemtech.github.io/nem2-sdk-typescript-javascript

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,

e2e/service/MosaicService.spec.ts

@@ -1,10 +1,10 @@
-import 'rxjs/add/operator/toPromise';
-import {AccountHttp} from '../../src/infrastructure/AccountHttp';
-import {MosaicHttp} from '../../src/infrastructure/MosaicHttp';
-import {NamespaceHttp} from '../../src/infrastructure/NamespaceHttp';
-import {Address} from '../../src/model/account/Address';
-import {MosaicService} from '../../src/service/MosaicService';
-import {APIUrl} from '../conf/conf.spec';
+import { map, mergeMap, toArray } from 'rxjs/operators';
+import { AccountHttp } from '../../src/infrastructure/AccountHttp';
+import { MosaicHttp } from '../../src/infrastructure/MosaicHttp';
+import { NamespaceHttp } from '../../src/infrastructure/NamespaceHttp';
+import { Address } from '../../src/model/account/Address';
+import { MosaicService } from '../../src/service/MosaicService';
+import { APIUrl } from '../conf/conf.spec';
 
 describe('MosaicService', () => {
 
@@ -17,10 +17,10 @@ describe('MosaicService', () => {
 
         const address = Address.createFromRawAddress('SCO2JY-N6OJSM-CJPPVS-Z3OX7P-TWPQEJ-GZTI6W-GLKK');
 
-        return mosaicService.mosaicsAmountViewFromAddress(address)
-            .flatMap((_) => _)
-            .map((mosaic) => console.log('You have', mosaic.relativeAmount(), mosaic.fullName()))
-            .toArray()
-            .toPromise();
+        return mosaicService.mosaicsAmountViewFromAddress(address).pipe(
+            mergeMap((_) => _),
+            map((mosaic) => console.log('You have', mosaic.relativeAmount(), mosaic.fullName())),
+            toArray(),
+        ).toPromise();
     });
 });