Sub NamespaceId generation bug fix (#763)

* Fixed #753

* Removed unused var

* Add more unit tests

Co-authored-by: fboucquez <[email protected]>

Author: rg911

src/model/UInt64.ts

@@ -94,7 +94,6 @@ export class UInt64 {
     /**
      * Get DTO representation with format: `[lower, higher]`
      *
-     * @internal
      * @returns {[number,number]}
      */
     public toDTO(): number[] {

src/model/transaction/NamespaceRegistrationTransaction.ts

@@ -24,6 +24,7 @@ import {
     TransactionBuilder,
 } from 'catbuffer-typescript';
 import { Convert } from '../../core/format';
+import * as Utilities from '../../core/format/Utilities';
 import { NamespaceMosaicIdGenerator } from '../../infrastructure/transaction';
 import { Address, PublicAccount } from '../account';
 import { NamespaceId, NamespaceRegistrationType } from '../namespace';
@@ -105,7 +106,7 @@ export class NamespaceRegistrationTransaction extends Transaction {
         const namespaceId =
             typeof parentNamespace === 'string'
                 ? new NamespaceId(NamespaceMosaicIdGenerator.subnamespaceNamespaceId(parentNamespace, namespaceName))
-                : new NamespaceId(NamespaceMosaicIdGenerator.namespaceId(namespaceName));
+                : new NamespaceId(Utilities.generateNamespaceId(parentId.id.toDTO(), namespaceName));
         return new NamespaceRegistrationTransaction(
             networkType,
             TransactionVersion.NAMESPACE_REGISTRATION,

src/service/CurrencyService.ts

@@ -26,8 +26,6 @@ import { ICurrencyService } from './interfaces';
  * A service used to load Currencies objects.
  */
 export class CurrencyService implements ICurrencyService {
-    x;
-
     constructor(private readonly repositoryFactory: RepositoryFactory) {}
 
     /**

test/core/utils/TransactionMapping.spec.ts

@@ -1471,7 +1471,7 @@ describe('TransactionMapping - createFromDTO (Transaction.toJSON() feed)', () =>
         );
 
         const expectedHex =
-            'A5000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001A84E4100000000000000002B02000000000000FFFFFFFFFFFFFFFFCFCBE72D994BE69B0113726F6F742D746573742D6E616D657370616365';
+            'A5000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001A84E4100000000000000002B02000000000000FFFFFFFFFFFFFFFFE25C68E93F91F0E90113726F6F742D746573742D6E616D657370616365';
         assertSerialization(registerNamespaceTransaction, expectedHex);
 
         const transaction = TransactionMapping.createFromDTO(registerNamespaceTransaction.toJSON()) as NamespaceRegistrationTransaction;

test/model/transaction/NamespaceRegistrationTransaction.spec.ts

@@ -101,7 +101,7 @@ describe('NamespaceRegistrationTransaction', () => {
         const signedTransaction = registerNamespaceTransaction.signWith(account, generationHash);
 
         expect(signedTransaction.payload.substring(256, signedTransaction.payload.length)).to.be.equal(
-            '4BFA5F372D55B384CFCBE72D994BE69B0113726F6F742D746573742D6E616D657370616365',
+            '4BFA5F372D55B384EE393014E8B74B9C0113726F6F742D746573742D6E616D657370616365',
         );
     });
 
@@ -153,4 +153,27 @@ describe('NamespaceRegistrationTransaction', () => {
         Object.assign(tx, { signer: account.publicAccount });
         expect(tx.shouldNotifyAccount(account.address)).to.be.true;
     });
+
+    it('Sub namespacename craetd by different type of parent id', () => {
+        const parentNamespace = 'parent';
+        const childNamespace = 'child';
+        const parentId = new NamespaceId(parentNamespace);
+
+        const subNameSpaceTransactionStringParent = NamespaceRegistrationTransaction.createSubNamespace(
+            Deadline.create(1573430400),
+            childNamespace,
+            parentNamespace,
+            NetworkType.TEST_NET,
+            UInt64.fromUint(100000),
+        );
+        const subNameSpaceTransactionIdParent = NamespaceRegistrationTransaction.createSubNamespace(
+            Deadline.create(1573430400),
+            childNamespace,
+            parentId,
+            NetworkType.TEST_NET,
+            UInt64.fromUint(100000),
+        );
+
+        expect(subNameSpaceTransactionStringParent.namespaceId.equals(subNameSpaceTransactionIdParent.namespaceId)).to.be.true;
+    });
 });