Fixed a few issues raised from PR

rg911 · rg911 · commit 47c06891f318 · 2019-05-31T14:46:28.000+01:00
diff --git a/e2e/infrastructure/BlockHttp.spec.ts b/e2e/infrastructure/BlockHttp.spec.ts
@@ -80,7 +80,6 @@ describe('BlockHttp', () => {
             listener.confirmed(account.address).subscribe((transaction: Transaction) => {
 
                 chainHeight = transaction.transactionInfo!.height.lower;
-                console.log(`Test chain height: ${chainHeight}`);
                 done();
             });
             listener.status(account.address).subscribe((error) => {
diff --git a/src/infrastructure/AccountHttp.ts b/src/infrastructure/AccountHttp.ts
@@ -28,6 +28,7 @@ import {PublicAccount} from '../model/account/PublicAccount';
 import {Mosaic} from '../model/mosaic/Mosaic';
 import {MosaicId} from '../model/mosaic/MosaicId';
 import { NamespaceId } from '../model/namespace/NamespaceId';
+import { NamespaceName } from '../model/namespace/NamespaceName';
 import {AggregateTransaction} from '../model/transaction/AggregateTransaction';
 import {Transaction} from '../model/transaction/Transaction';
 import {UInt64} from '../model/UInt64';
@@ -147,7 +148,7 @@ export class AccountHttp extends Http implements AccountRepository {
                 return new AccountNames(
                     Address.createFromEncoded(accountName.address),
                     accountName.names.map((name) => {
-                        new NamespaceId(name);
+                        new NamespaceName(new NamespaceId(name), name);
                     }),
                 );
             });
diff --git a/src/infrastructure/BlockHttp.ts b/src/infrastructure/BlockHttp.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 NEM
+ * 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.
diff --git a/src/infrastructure/BlockRepository.ts b/src/infrastructure/BlockRepository.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 NEM
+ * 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.
diff --git a/src/infrastructure/ChainHttp.ts b/src/infrastructure/ChainHttp.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 NEM
+ * 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.
diff --git a/src/infrastructure/MosaicHttp.ts b/src/infrastructure/MosaicHttp.ts
@@ -22,8 +22,9 @@ import {MosaicId} from '../model/mosaic/MosaicId';
 import {MosaicInfo} from '../model/mosaic/MosaicInfo';
 import { MosaicNames } from '../model/mosaic/MosaicNames';
 import {MosaicProperties} from '../model/mosaic/MosaicProperties';
-import { MosaicPropertyIdEnum } from '../model/mosaic/MosaicPropertyIdEnum';
+import { MosaicPropertyType } from '../model/mosaic/MosaicPropertyType';
 import {NamespaceId} from '../model/namespace/NamespaceId';
+import { NamespaceName } from '../model/namespace/NamespaceName';
 import {UInt64} from '../model/UInt64';
 import {Http} from './Http';
 import {MosaicRepository} from './MosaicRepository';
@@ -69,9 +70,9 @@ export class MosaicHttp extends Http implements MosaicRepository {
                     PublicAccount.createFromPublicKey(mosaicInfoDTO.mosaic.owner, networkType),
                     mosaicInfoDTO.mosaic.revision,
                     new MosaicProperties(
-                        new UInt64(mosaicInfoDTO.mosaic.properties[MosaicPropertyIdEnum.MosaicFlags].value),
-                        (new UInt64(mosaicInfoDTO.mosaic.properties[MosaicPropertyIdEnum.Divisibility].value)).compact(),
-                        new UInt64(mosaicInfoDTO.mosaic.properties[MosaicPropertyIdEnum.Duration].value),
+                        new UInt64(mosaicInfoDTO.mosaic.properties[MosaicPropertyType.MosaicFlags].value),
+                        (new UInt64(mosaicInfoDTO.mosaic.properties[MosaicPropertyType.Divisibility].value)).compact(),
+                        new UInt64(mosaicInfoDTO.mosaic.properties[MosaicPropertyType.Duration].value),
                     ),
                 );
             }))));
@@ -98,9 +99,9 @@ export class MosaicHttp extends Http implements MosaicRepository {
                         PublicAccount.createFromPublicKey(mosaicInfoDTO.mosaic.owner, networkType),
                         mosaicInfoDTO.mosaic.revision,
                         new MosaicProperties(
-                            new UInt64(mosaicInfoDTO.mosaic.properties[MosaicPropertyIdEnum.MosaicFlags].value),
-                            (new UInt64(mosaicInfoDTO.mosaic.properties[MosaicPropertyIdEnum.Divisibility].value)).compact(),
-                            new UInt64(mosaicInfoDTO.mosaic.properties[MosaicPropertyIdEnum.Duration].value),
+                            new UInt64(mosaicInfoDTO.mosaic.properties[MosaicPropertyType.MosaicFlags].value),
+                            (new UInt64(mosaicInfoDTO.mosaic.properties[MosaicPropertyType.Divisibility].value)).compact(),
+                            new UInt64(mosaicInfoDTO.mosaic.properties[MosaicPropertyType.Duration].value),
                         ),
                     );
                 });
@@ -123,7 +124,7 @@ export class MosaicHttp extends Http implements MosaicRepository {
                 return new MosaicNames(
                     new MosaicId(mosaic.mosaicId),
                     mosaic.names.map((name) => {
-                        new NamespaceId(name);
+                        new NamespaceName(new NamespaceId(name), name);
                     }),
                 );
             });
diff --git a/src/infrastructure/receipt/CreateReceiptFromDTO.ts b/src/infrastructure/receipt/CreateReceiptFromDTO.ts
@@ -39,6 +39,8 @@ import {UInt64} from '../../model/UInt64';
  * @param receiptDTO
  * @param networkType
  * @returns {Statement}
+ * @see https://github.com/nemtech/catapult-server/blob/master/src/catapult/model/ReceiptType.h
+ * @see https://github.com/nemtech/catapult-server/blob/master/src/catapult/model/ReceiptType.cpp
  * @constructor
  */
 export const CreateStatementFromDTO = (receiptDTO, networkType): Statement => {
diff --git a/src/infrastructure/transaction/CreateTransactionFromDTO.ts b/src/infrastructure/transaction/CreateTransactionFromDTO.ts
@@ -22,7 +22,7 @@ import {Id} from '../../model/Id';
 import {Mosaic} from '../../model/mosaic/Mosaic';
 import {MosaicId} from '../../model/mosaic/MosaicId';
 import {MosaicProperties} from '../../model/mosaic/MosaicProperties';
-import { MosaicPropertyIdEnum } from '../../model/mosaic/MosaicPropertyIdEnum';
+import { MosaicPropertyType } from '../../model/mosaic/MosaicPropertyType';
 import {NamespaceId} from '../../model/namespace/NamespaceId';
 import { AccountLinkTransaction } from '../../model/transaction/AccountLinkTransaction';
 import {AccountPropertyModification} from '../../model/transaction/AccountPropertyModification';
@@ -160,10 +160,10 @@ const CreateStandaloneTransactionFromDTO = (transactionDTO, transactionInfo): Tr
             transactionDTO.nonce,
             new MosaicId(transactionDTO.mosaicId),
             new MosaicProperties(
-                new UInt64(transactionDTO.properties[MosaicPropertyIdEnum.MosaicFlags].value),
-                (new UInt64(transactionDTO.properties[MosaicPropertyIdEnum.Divisibility].value)).compact(),
-                transactionDTO.properties.length === 3 &&  transactionDTO.properties[MosaicPropertyIdEnum.Duration].value ?
-                    new UInt64(transactionDTO.properties[MosaicPropertyIdEnum.Duration].value) : undefined,
+                new UInt64(transactionDTO.properties[MosaicPropertyType.MosaicFlags].value),
+                (new UInt64(transactionDTO.properties[MosaicPropertyType.Divisibility].value)).compact(),
+                transactionDTO.properties.length === 3 &&  transactionDTO.properties[MosaicPropertyType.Duration].value ?
+                    new UInt64(transactionDTO.properties[MosaicPropertyType.Duration].value) : undefined,
             ),
             transactionDTO.signature,
             transactionDTO.signer ? PublicAccount.createFromPublicKey(transactionDTO.signer,
diff --git a/src/model/account/AccountNames.ts b/src/model/account/AccountNames.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 NEM
+ * 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.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { NamespaceId } from '../namespace/NamespaceId';
+import { NamespaceName } from '../namespace/NamespaceName';
 import {Address} from './Address';
 
 /**
@@ -31,9 +31,9 @@ export class AccountNames {
          */
         public readonly address: Address,
         /**
-         * Address linked namespace names
+         * Address linked namespace Ids
          */
-        public readonly names: NamespaceId[]) {
+        public readonly names: NamespaceName[]) {
 
     }
 }
diff --git a/src/model/model.ts b/src/model/model.ts
@@ -55,7 +55,7 @@ export * from '../service/MosaicAmountView';
 export * from './mosaic/NetworkCurrencyMosaic';
 export * from './mosaic/NetworkHarvestMosaic';
 export * from './mosaic/MosaicNames';
-export * from './mosaic/MosaicPropertyIdEnum';
+export * from './mosaic/MosaicPropertyType';
 
 // Namespace
 export * from '../service/Namespace';
diff --git a/src/model/mosaic/MosaicNames.ts b/src/model/mosaic/MosaicNames.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 NEM
+ * 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.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { NamespaceId } from '../namespace/NamespaceId';
+import { NamespaceName } from '../namespace/NamespaceName';
 import { MosaicId } from './MosaicId';
 
 /**
@@ -33,7 +33,7 @@ export class MosaicNames {
         /**
          * Address linked namespace names
          */
-        public readonly names: string[]) {
+        public readonly names: NamespaceName[]) {
 
     }
 }
diff --git a/src/model/mosaic/MosaicProperties.ts b/src/model/mosaic/MosaicProperties.ts
@@ -15,7 +15,7 @@
  */
 
 import {UInt64} from '../UInt64';
-import { MosaicPropertyIdEnum } from './MosaicPropertyIdEnum';
+import { MosaicPropertyType } from './MosaicPropertyType';
 
 /**
  * Mosaic properties model
@@ -84,13 +84,13 @@ export class MosaicProperties {
      */
     toDTO() {
         const dto = [
-            {id: MosaicPropertyIdEnum.MosaicFlags, value: UInt64.fromUint((this.supplyMutable ? 1 : 0) +
+            {id: MosaicPropertyType.MosaicFlags, value: UInt64.fromUint((this.supplyMutable ? 1 : 0) +
                                         (this.transferable ? 2 : 0)).toDTO()},
-            {id: MosaicPropertyIdEnum.Divisibility, value: UInt64.fromUint(this.divisibility).toDTO()},
+            {id: MosaicPropertyType.Divisibility, value: UInt64.fromUint(this.divisibility).toDTO()},
         ];
 
         if (this.duration !== undefined) {
-            dto.push({id: MosaicPropertyIdEnum.Duration, value: this.duration.toDTO()});
+            dto.push({id: MosaicPropertyType.Duration, value: this.duration.toDTO()});
         }
 
         return dto;
diff --git a/src/model/mosaic/MosaicPropertyType.ts b/src/model/mosaic/MosaicPropertyType.ts
@@ -20,7 +20,7 @@
  * 1 - Divisibility
  * 2 - Duration
  */
-export enum MosaicPropertyIdEnum {
+export enum MosaicPropertyType {
     MosaicFlags = 0,
     Divisibility = 1,
     Duration = 2,
diff --git a/src/model/receipt/ReceiptType.ts b/src/model/receipt/ReceiptType.ts
@@ -17,7 +17,8 @@
 /**
  * Receipt type enums.
  *
- * @see https://nemtech.github.io/concepts/receipt.html
+ * @see https://github.com/nemtech/catapult-server/blob/master/src/catapult/model/ReceiptType.h
+ * @see https://github.com/nemtech/catapult-server/blob/master/src/catapult/model/ReceiptType.cpp
  */
 export enum ReceiptType {
 
diff --git a/src/model/receipt/ReceiptVersion.ts b/src/model/receipt/ReceiptVersion.ts
@@ -17,7 +17,8 @@
 /**
  * Receipt version constants.
  *
- * @see https://nemtech.github.io/concepts/receipt.html
+ * @see https://github.com/nemtech/catapult-server/blob/master/src/catapult/model/ReceiptType.h
+ * @see https://github.com/nemtech/catapult-server/blob/master/src/catapult/model/ReceiptType.cpp
  */
 export class ReceiptVersion {
 
diff --git a/test/infrastructure/receipt/CreateReceiptFromDTO.spec.ts b/test/infrastructure/receipt/CreateReceiptFromDTO.spec.ts
@@ -93,7 +93,7 @@ describe('Receipt - CreateStatementFromDTO', () => {
                       primaryId: 1,
                       secondaryId: 0,
                     },
-                    resolved: '08a12f89ee5a49f8',
+                    resolved: [2553890912, 2234768168],
                   },
                 ],
             },
@@ -112,7 +112,7 @@ describe('Receipt - CreateStatementFromDTO', () => {
                       primaryId: 5,
                       secondaryId: 0,
                     },
-                    resolved: '08a12f89ee5a49f8',
+                    resolved: [2553890912, 2234768168],
                   },
                 ],
             },
@@ -144,6 +144,6 @@ describe('Receipt - CreateStatementFromDTO', () => {
         deepEqual(unresolvedMosaicId.toDTO().id, [4014740460, 2448037180]);
         expect(statement.mosaicResolutionStatements[0].resolutionEntries.length).to.be.equal(1);
         deepEqual((statement.mosaicResolutionStatements[0].resolutionEntries[0].resolved as MosaicAlias)
-                .mosaicId.toHex(), '08a12f89ee5a49f8');
+                .mosaicId.id.toDTO(), [2553890912, 2234768168]);
     });
 });

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2018 NEM`
	`2`	`+ * Copyright 2019 NEM`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`