[JAV-52, JAV-54, JAV-57, JAV-27, JAV-58, JAV-59] Small issue fixes

e2e/infrastructure/RestrictionHttp.spec.ts

@@ -15,7 +15,7 @@
  */
 
 import {deepEqual} from 'assert';
-import {assert} from 'chai';
+import {assert, expect} from 'chai';
 import {AccountHttp} from '../../src/infrastructure/AccountHttp';
 import { Listener, TransactionHttp } from '../../src/infrastructure/infrastructure';
 import { RestrictionHttp } from '../../src/infrastructure/RestrictionHttp';
@@ -309,7 +309,7 @@ describe('RestrictionHttp', () => {
         it('should call getAccountRestrictions successfully', (done) => {
             setTimeout(() => {
                 restrictionHttp.getAccountRestrictions(accountAddress).subscribe((accountRestrictions) => {
-                    deepEqual(accountRestrictions.accountRestrictions.address, accountAddress);
+                    expect(accountRestrictions.length).to.be.greaterThan(0);
                     done();
                 });
             }, 1000);
@@ -320,7 +320,7 @@ describe('RestrictionHttp', () => {
         it('should call getAccountRestrictionsFromAccounts successfully', (done) => {
             setTimeout(() => {
                 restrictionHttp.getAccountRestrictionsFromAccounts([accountAddress]).subscribe((accountRestrictions) => {
-                    deepEqual(accountRestrictions[0]!.accountRestrictions.address, accountAddress);
+                    deepEqual(accountRestrictions[0]!.address, accountAddress);
                     done();
                 });
             }, 1000);

e2e/service/MetadataTransactionService.spec.ts

@@ -206,7 +206,7 @@ describe('MetadataTransactionService', () => {
                     NetworkType.MIJIN_TEST,
                     MetadataType.Account,
                     targetAccount.publicAccount,
-                    key.toHex(),
+                    key,
                     newValue,
                     targetAccount.publicAccount,
                 ).subscribe((transaction: AccountMetadataTransaction) => {
@@ -225,7 +225,7 @@ describe('MetadataTransactionService', () => {
                     NetworkType.MIJIN_TEST,
                     MetadataType.Mosaic,
                     targetAccount.publicAccount,
-                    key.toHex(),
+                    key,
                     newValue + 'delta',
                     targetAccount.publicAccount,
                     mosaicId,
@@ -247,7 +247,7 @@ describe('MetadataTransactionService', () => {
                     NetworkType.MIJIN_TEST,
                     MetadataType.Namespace,
                     targetAccount.publicAccount,
-                    key.toHex(),
+                    key,
                     newValue + 'delta',
                     targetAccount.publicAccount,
                     namespaceId,
@@ -280,7 +280,7 @@ describe('MetadataTransactionService', () => {
                     NetworkType.MIJIN_TEST,
                     MetadataType.Mosaic,
                     targetAccount.publicAccount,
-                    key.toHex(),
+                    key,
                     newValue + 'delta',
                     targetAccount.publicAccount,
                     mosaicId,

e2e/service/MosaicService.spec.ts

@@ -1,4 +1,19 @@
-import { map, mergeMap, toArray } from 'rxjs/operators';
+/*
+ * Copyright 2019 NEM
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 import { AccountHttp } from '../../src/infrastructure/AccountHttp';
 import { MosaicHttp } from '../../src/infrastructure/MosaicHttp';
 import { Address } from '../../src/model/account/Address';
@@ -22,15 +37,17 @@ describe('MosaicService', () => {
             done();
         });
     });
-    it('should return the mosaic list skipping the expired mosaics', () => {
+    it('should return the mosaic list skipping the expired mosaics', (done) => {
         const mosaicService = new MosaicService(accountHttp, mosaicHttp);
 
         const address = accountAddress;
 
-        return mosaicService.mosaicsAmountViewFromAddress(address).pipe(
-            mergeMap((_) => _),
-            map((mosaic) => console.log('You have', mosaic.relativeAmount(), mosaic.fullName())),
-            toArray(),
-        ).toPromise();
+        return mosaicService.mosaicsAmountViewFromAddress(address).subscribe((amountViews) => {
+            const views = amountViews.map((v) => {
+                return {mosaicId: v.fullName(), amount: v.relativeAmount()};
+            });
+            console.log(views);
+            done();
+        });
     });
 });

package.json

@@ -35,6 +35,7 @@
     "@types/chai": "^4.0.4",
     "@types/crypto-js": "^3.1.43",
     "@types/lodash": "^4.14.85",
+    "@types/long": "^4.0.0",
     "@types/mocha": "^2.2.44",
     "@types/request": "^2.47.0",
     "@types/request-promise-native": "^1.0.14",
@@ -55,7 +56,6 @@
     "typescript-require": "^0.2.9-1"
   },
   "dependencies": {
-    "@types/long": "^4.0.0",
     "bluebird": "^3.5.5",
     "crypto-js": "^3.1.9-1",
     "js-joda": "^1.6.2",

src/core/format/KeyGenerator.ts

@@ -0,0 +1,34 @@
+/*
+ * Copyright 2019 NEM
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { UInt64 } from '../../model/UInt64';
+import { sha3_256 } from 'js-sha3';
+
+export class KeyGenerator {
+    /**
+     * Generate UInt64 from a string
+     * @param {string} input Input string
+     * @returns {UInt64} Deterministic uint64 value for the given string
+     */
+    public static generateUInt64Key(input: string): UInt64 {
+        if (input.length === 0) {
+            throw Error(`Input must not be empty`);
+        }
+        const buf = sha3_256.arrayBuffer(input);
+        const result = new Uint32Array(buf);
+        return new UInt64([result[0], (result[1] | 0x80000000) >>> 0]);
+    }
+}

src/core/format/index.ts

@@ -18,4 +18,5 @@ export * from './RawAddress';
 export * from './RawArray';
 export * from './Convert';
 export * from './IdGenerator';
+export * from './KeyGenerator';
 export * from './RawUInt64';

src/infrastructure/AccountHttp.ts

@@ -145,7 +145,7 @@ export class AccountHttp extends Http implements AccountRepository {
 
                     });
                 }),
-                catchError((error) =>  throwError(error)),
+                catchError((error) =>  throwError(this.errorHandling(error))),
         );
     }
 
@@ -166,7 +166,7 @@ export class AccountHttp extends Http implements AccountRepository {
                         );
                     });
                 }),
-                catchError((error) =>  throwError(error)),
+                catchError((error) =>  throwError(this.errorHandling(error))),
         );
     }
     /**
@@ -190,7 +190,7 @@ export class AccountHttp extends Http implements AccountRepository {
                                 .map((multisigAccount) => PublicAccount.createFromPublicKey(multisigAccount, networkType)),
                         );
                     }),
-                    catchError((error) =>  throwError(error)),
+                    catchError((error) =>  throwError(this.errorHandling(error))),
         )));
     }
 
@@ -223,7 +223,7 @@ export class AccountHttp extends Http implements AccountRepository {
                         });
                         return new MultisigAccountGraphInfo(multisigAccounts);
                     }),
-                    catchError((error) =>  throwError(error)),
+                    catchError((error) =>  throwError(this.errorHandling(error))),
         )));
     }
 
@@ -245,7 +245,7 @@ export class AccountHttp extends Http implements AccountRepository {
                     return CreateTransactionFromDTO(transactionDTO);
                 });
             }),
-            catchError((error) =>  throwError(error)),
+            catchError((error) =>  throwError(this.errorHandling(error))),
         );
     }
 
@@ -268,7 +268,7 @@ export class AccountHttp extends Http implements AccountRepository {
                     return CreateTransactionFromDTO(transactionDTO);
                 });
             }),
-            catchError((error) =>  throwError(error)),
+            catchError((error) =>  throwError(this.errorHandling(error))),
         );
     }
 
@@ -291,7 +291,7 @@ export class AccountHttp extends Http implements AccountRepository {
                     return CreateTransactionFromDTO(transactionDTO);
                 });
             }),
-            catchError((error) =>  throwError(error)),
+            catchError((error) =>  throwError(this.errorHandling(error))),
         );
     }
 
@@ -315,7 +315,7 @@ export class AccountHttp extends Http implements AccountRepository {
                     return CreateTransactionFromDTO(transactionDTO);
                 });
             }),
-            catchError((error) =>  throwError(error)),
+            catchError((error) =>  throwError(this.errorHandling(error))),
         );
     }
 
@@ -338,7 +338,7 @@ export class AccountHttp extends Http implements AccountRepository {
                     return CreateTransactionFromDTO(transactionDTO) as AggregateTransaction;
                 });
             }),
-            catchError((error) =>  throwError(error)),
+            catchError((error) =>  throwError(this.errorHandling(error))),
         );
     }
 }

src/infrastructure/Http.ts

@@ -59,10 +59,11 @@ export abstract class Http {
     }
 
     errorHandling(error: any): Error {
-        if (error.response && error.response.statusCode && error.response.body) {
+        if (error.response && error.response.statusCode && error.body) {
             const formattedError = {
                 statusCode: error.response.statusCode,
-                errorDetails: error.response.body,
+                errorDetails: error.response,
+                body: error.body,
             };
             return new Error(JSON.stringify(formattedError));
         }

src/infrastructure/MetadataHttp.ts

@@ -72,7 +72,7 @@ export class MetadataHttp extends Http implements MetadataRepository {
                     return this.buildMetadata(metadataEntry);
                 });
             }),
-            catchError((error) =>  throwError(error)),
+            catchError((error) =>  throwError(this.errorHandling(error))),
         );
     }
 
@@ -91,7 +91,7 @@ export class MetadataHttp extends Http implements MetadataRepository {
                     return this.buildMetadata(metadataEntry);
                 });
             }),
-            catchError((error) =>  throwError(error)),
+            catchError((error) =>  throwError(this.errorHandling(error))),
         );
     }
 
@@ -109,7 +109,7 @@ export class MetadataHttp extends Http implements MetadataRepository {
                 const metadataDTO = response.body;
                 return this.buildMetadata(metadataDTO);
             }),
-            catchError((error) =>  throwError(error)),
+            catchError((error) =>  throwError(this.errorHandling(error))),
         );
     }
 
@@ -131,7 +131,7 @@ export class MetadataHttp extends Http implements MetadataRepository {
                     return this.buildMetadata(metadataEntry);
                 });
             }),
-            catchError((error) =>  throwError(error)),
+            catchError((error) =>  throwError(this.errorHandling(error))),
         );
     }
 
@@ -150,7 +150,7 @@ export class MetadataHttp extends Http implements MetadataRepository {
                     return this.buildMetadata(metadataEntry);
                 });
             }),
-            catchError((error) =>  throwError(error)),
+            catchError((error) =>  throwError(this.errorHandling(error))),
         );
     }
 
@@ -168,7 +168,7 @@ export class MetadataHttp extends Http implements MetadataRepository {
                 const metadataDTO = response.body;
                 return this.buildMetadata(metadataDTO);
             }),
-            catchError((error) =>  throwError(error)),
+            catchError((error) =>  throwError(this.errorHandling(error))),
         );
     }
 
@@ -190,7 +190,7 @@ export class MetadataHttp extends Http implements MetadataRepository {
                     return this.buildMetadata(metadataEntry);
                 });
             }),
-            catchError((error) =>  throwError(error)),
+            catchError((error) =>  throwError(this.errorHandling(error))),
         );
     }
 
@@ -209,7 +209,7 @@ export class MetadataHttp extends Http implements MetadataRepository {
                     return this.buildMetadata(metadataEntry);
                 });
             }),
-            catchError((error) =>  throwError(error)),
+            catchError((error) =>  throwError(this.errorHandling(error))),
         );
     }
 
@@ -227,7 +227,7 @@ export class MetadataHttp extends Http implements MetadataRepository {
                 const metadataDTO = response.body;
                 return this.buildMetadata(metadataDTO);
             }),
-            catchError((error) =>  throwError(error)),
+            catchError((error) =>  throwError(this.errorHandling(error))),
         );
     }
 

src/infrastructure/NamespaceHttp.ts

@@ -270,9 +270,9 @@ export class NamespaceHttp extends Http implements NamespaceRepository {
      */
     private extractAlias(namespace: any): Alias {
         if (namespace.alias && namespace.alias.type === AliasType.Mosaic) {
-            return new MosaicAlias(namespace.alias.type, namespace.alias.mosaicId);
+            return new MosaicAlias(namespace.alias.mosaicId);
         } else if (namespace.alias && namespace.alias.type === AliasType.Address) {
-            return new AddressAlias(namespace.alias.type, namespace.alias.address);
+            return new AddressAlias(namespace.alias.address);
         }
 
         return new EmptyAlias();