Merge pull request #43 from rg911/master

Issue #36, Error handling on Uint64.fromUnit with negative value.

Author: Grégory Saive

src/infrastructure/Listener.ts

@@ -201,7 +201,7 @@ export class Listener {
             share(),
             filter((_) => _.channelName === ListenerChannelName.block),
             filter((_) => _.message instanceof BlockInfo),
-            map((_) => _.message as BlockInfo),);
+            map((_) => _.message as BlockInfo));
     }
 
     /**
@@ -218,7 +218,7 @@ export class Listener {
             filter((_) => _.channelName === ListenerChannelName.confirmedAdded),
             filter((_) => _.message instanceof Transaction),
             map((_) => _.message as Transaction),
-            filter((_) => this.transactionFromAddress(_, address)),);
+            filter((_) => this.transactionFromAddress(_, address)));
     }
 
     /**
@@ -235,7 +235,7 @@ export class Listener {
             filter((_) => _.channelName === ListenerChannelName.unconfirmedAdded),
             filter((_) => _.message instanceof Transaction),
             map((_) => _.message as Transaction),
-            filter((_) => this.transactionFromAddress(_, address)),);
+            filter((_) => this.transactionFromAddress(_, address)));
     }
 
     /**
@@ -251,7 +251,7 @@ export class Listener {
         return this.messageSubject.asObservable().pipe(
             filter((_) => _.channelName === ListenerChannelName.unconfirmedRemoved),
             filter((_) => typeof _.message === 'string'),
-            map((_) => _.message as string),);
+            map((_) => _.message as string));
     }
 
     /**
@@ -268,7 +268,7 @@ export class Listener {
             filter((_) => _.channelName === ListenerChannelName.aggregateBondedAdded),
             filter((_) => _.message instanceof AggregateTransaction),
             map((_) => _.message as AggregateTransaction),
-            filter((_) => this.transactionFromAddress(_, address)),);
+            filter((_) => this.transactionFromAddress(_, address)));
     }
 
     /**
@@ -284,7 +284,7 @@ export class Listener {
         return this.messageSubject.asObservable().pipe(
             filter((_) => _.channelName === ListenerChannelName.aggregateBondedRemoved),
             filter((_) => typeof _.message === 'string'),
-            map((_) => _.message as string),);
+            map((_) => _.message as string));
     }
 
     /**
@@ -300,7 +300,7 @@ export class Listener {
         return this.messageSubject.asObservable().pipe(
             filter((_) => _.channelName === ListenerChannelName.status),
             filter((_) => _.message instanceof TransactionStatusError),
-            map((_) => _.message as TransactionStatusError),);
+            map((_) => _.message as TransactionStatusError));
     }
 
     /**
@@ -316,7 +316,7 @@ export class Listener {
         return this.messageSubject.asObservable().pipe(
             filter((_) => _.channelName === ListenerChannelName.cosignature),
             filter((_) => _.message instanceof CosignatureSignedTransaction),
-            map((_) => _.message as CosignatureSignedTransaction),);
+            map((_) => _.message as CosignatureSignedTransaction));
     }
 
     /**
@@ -332,6 +332,18 @@ export class Listener {
         this.webSocket.send(JSON.stringify(subscriptionMessage));
     }
 
+    /**
+     * @internal
+     * @param channel - Channel to unsubscribe
+     */
+    private unsubscribeTo(channel: string) {
+        const unsubscribeMessage = {
+            uid: this.uid,
+            unsubscribe: channel,
+        };
+        this.webSocket.send(JSON.stringify(unsubscribeMessage));
+    }
+
     /**
      * @internal
      * Filters if a transaction has been initiated or signed by an address

src/model/UInt64.ts

@@ -37,6 +37,9 @@ export class UInt64 {
      * @returns {UInt64}
      */
     public static fromUint(value: number): UInt64 {
+        if (value < 0) {
+            throw new Error('Unsigned integer cannot be negative');
+        }
         return new UInt64(uint64.fromUint(value));
     }
 

src/model/mosaic/Mosaic.ts

@@ -41,7 +41,6 @@ export class Mosaic {
 
     }
 
-
     /**
      * @internal
      * @returns {{amount: number[], id: number[]}}

src/model/mosaic/MosaicProperties.ts

@@ -60,7 +60,7 @@ export class MosaicProperties {
                  * The duration in blocks a mosaic will be available.
                  * After the duration finishes mosaic is inactive and can be renewed.
                  */
-                public readonly duration: UInt64,) {
+                public readonly duration: UInt64) {
         let binaryFlags = '00' + (flags.lower >>> 0).toString(2);
         binaryFlags = binaryFlags.substr(binaryFlags.length - 3, 3);
         this.supplyMutable = binaryFlags[2] === '1';

test/model/UInt64.spec.ts

@@ -64,6 +64,12 @@ describe('Uint64', () => {
         expect(uint64Compact).to.be.equal(51110867862);
     });
 
+    it('should fromUnit throw exception with negative unit value', () => {
+        expect(() => {
+            UInt64.fromUint(-1);
+        }).to.throw(Error, 'Unsigned integer cannot be negative');
+    });
+
     describe('equal', () => {
         it('should return true if the inside values are the same', () => {
             const value = new UInt64([12, 12]);

tslint.json

@@ -45,7 +45,7 @@
       }
     ],
     "no-arg": true,
-    "no-bitwise": true,
+    "no-bitwise": false,
     "no-console": [
       true,
       "debug",