symbol · rg911 · Oct 12, 2020
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -458,7 +458,7 @@ Client Library | v0.7.20-alpha.6  | [nem2-sdk-openapi-typescript-node-client](ht
 - Fixed http repository `error handling` issues.
 - Fixed bugs in `Alias` interface.
 - Fixed `MosaicId significant byte` not detected properly in TransactionPayload.
-- Fixed only `MIJIN_TEST` network type allowed in NetworkTypeHttp.
+- Fixed only `PRIVATE_TEST` network type allowed in NetworkTypeHttp.
 - Applied latest OpenAPI doc (`v0.7.19`).
 - Changed `SignedTransaction` class constructor to public.
 - Changed `MosaicRestrictionKey` format to be Hexadecimal.

diff --git a/e2e/infrastructure/PersistentHarvesting.spec.ts b/e2e/infrastructure/PersistentHarvesting.spec.ts
@@ -33,7 +33,7 @@ describe('PersistentHarvesting', () => {
 
     const vrfKeyPair = Account.createFromPrivateKey(
         '82798EA9A2D2D202AFCCC82C40A287780BCA3C7F7A2FD5B754832804C6BE1BAA',
-        NetworkType.MIJIN_TEST,
+        NetworkType.PRIVATE_TEST,
     );
 
     before(() => {
@@ -113,7 +113,7 @@ describe('PersistentHarvesting', () => {
                 remoteAccount.privateKey,
                 vrfKeyPair.privateKey,
                 'cfd84eca83508bbee954668e4aecca736caefa615367da76afe6985d695381db',
-                NetworkType.MIJIN_TEST,
+                NetworkType.PRIVATE_TEST,
                 helper.maxFee,
             );
 

diff --git a/src/model/account/Address.ts b/src/model/account/Address.ts
@@ -45,9 +45,9 @@ export class Address {
             throw new Error('Address ' + addressTrimAndUpperCase + ' has to be 39 characters long');
         }
         if (addressTrimAndUpperCase.charAt(0) === 'S') {
-            networkType = NetworkType.MIJIN_TEST;
+            networkType = NetworkType.PRIVATE_TEST;
         } else if (addressTrimAndUpperCase.charAt(0) === 'M') {
-            networkType = NetworkType.MIJIN;
+            networkType = NetworkType.PRIVATE;
         } else if (addressTrimAndUpperCase.charAt(0) === 'T') {
             networkType = NetworkType.TEST_NET;
         } else if (addressTrimAndUpperCase.charAt(0) === 'N') {

diff --git a/src/model/network/NetworkType.ts b/src/model/network/NetworkType.ts
@@ -29,13 +29,13 @@ export enum NetworkType {
      */
     TEST_NET = 0x98,
     /**
-     * Mijin net network
+     * Private net network
      * @type {number}
      */
-    MIJIN = 0x60,
+    PRIVATE = 0x60,
     /**
-     * Mijin test net network
+     * Private test net network
      * @type {number}
      */
-    MIJIN_TEST = 0x90,
+    PRIVATE_TEST = 0x90,
 }
diff --git a/test/conf/conf.spec.ts b/test/conf/conf.spec.ts
@@ -19,27 +19,27 @@ import { NetworkType } from '../../src/model/network/NetworkType';
 
 export const TestingAccount = Account.createFromPrivateKey(
     '26b64cb10f005e5988a36744ca19e20d835ccc7c105aaa5f3b212da593180930',
-    NetworkType.MIJIN_TEST,
+    NetworkType.PRIVATE_TEST,
 );
 
 export const MultisigAccount = Account.createFromPrivateKey(
     '5edebfdbeb32e9146d05ffd232c8af2cf9f396caf9954289daa0362d097fff3b',
-    NetworkType.MIJIN_TEST,
+    NetworkType.PRIVATE_TEST,
 );
 
 export const CosignatoryAccount = Account.createFromPrivateKey(
     '2a2b1f5d366a5dd5dc56c3c757cf4fe6c66e2787087692cf329d7a49a594658b',
-    NetworkType.MIJIN_TEST,
+    NetworkType.PRIVATE_TEST,
 );
 
 export const Cosignatory2Account = Account.createFromPrivateKey(
     'b8afae6f4ad13a1b8aad047b488e0738a437c7389d4ff30c359ac068910c1d59',
-    NetworkType.MIJIN_TEST,
+    NetworkType.PRIVATE_TEST,
 );
 
 export const Cosignatory3Account = Account.createFromPrivateKey(
     '111602be4d36f92dd60ca6a3c68478988578f26f6a02f8c72089839515ab603e',
-    NetworkType.MIJIN_TEST,
+    NetworkType.PRIVATE_TEST,
 );
 
 export const NIS2_URL = 'http://localhost:3000';
diff --git a/test/core/format/IdGenerator.spec.ts b/test/core/format/IdGenerator.spec.ts
@@ -40,100 +40,100 @@ const mosaicTestVector = [
         mosaicNonce: 2039925808,
         address_Public: 'NATNE7Q5BITMUTRRN6IB4I7FLSDRDWZA34SQ33Y',
         address_PublicTest: 'TATNE7Q5BITMUTRRN6IB4I7FLSDRDWZA37JGO5Q',
-        address_Mijin: 'MATNE7Q5BITMUTRRN6IB4I7FLSDRDWZA34YACRA',
-        address_MijinTest: 'SATNE7Q5BITMUTRRN6IB4I7FLSDRDWZA34I2PMQ',
+        address_Private: 'MATNE7Q5BITMUTRRN6IB4I7FLSDRDWZA34YACRA',
+        address_PrivateTest: 'SATNE7Q5BITMUTRRN6IB4I7FLSDRDWZA34I2PMQ',
         mosaicId_Public: '044C577DBDD6DC71',
         mosaicId_PublicTest: '1796754FB181EF1E',
-        mosaicId_Mijin: '7DCEDD54DAEDF7B7',
-        mosaicId_MijinTest: '5BCD295FC8801FE6',
+        mosaicId_Private: '7DCEDD54DAEDF7B7',
+        mosaicId_PrivateTest: '5BCD295FC8801FE6',
     },
     {
         mosaicNonce: 1477337076,
         address_Public: 'NDR6EW2WBHJQDYMNGFX2UBZHMMZC5PGL2YCZOQQ',
         address_PublicTest: 'TDR6EW2WBHJQDYMNGFX2UBZHMMZC5PGL2YBO3KA',
-        address_Mijin: 'MDR6EW2WBHJQDYMNGFX2UBZHMMZC5PGL22B27FI',
-        address_MijinTest: 'SDR6EW2WBHJQDYMNGFX2UBZHMMZC5PGL2Z5UYYY',
+        address_Private: 'MDR6EW2WBHJQDYMNGFX2UBZHMMZC5PGL22B27FI',
+        address_PrivateTest: 'SDR6EW2WBHJQDYMNGFX2UBZHMMZC5PGL2Z5UYYY',
         mosaicId_Public: '7E45A001465DEEA0',
         mosaicId_PublicTest: '5E55573E3EBBB596',
-        mosaicId_Mijin: '0D47486978FA4316',
-        mosaicId_MijinTest: '55595BF89461E7C1',
+        mosaicId_Private: '0D47486978FA4316',
+        mosaicId_PrivateTest: '55595BF89461E7C1',
     },
     {
         mosaicNonce: 1921674920,
         address_Public: 'NCOXVZMAZJTT4I3F7EAZYGNGR77D6WPTRH6SYIQ',
         address_PublicTest: 'TCOXVZMAZJTT4I3F7EAZYGNGR77D6WPTRE3VIBQ',
-        address_Mijin: 'MCOXVZMAZJTT4I3F7EAZYGNGR77D6WPTRFDHL7I',
-        address_MijinTest: 'SCOXVZMAZJTT4I3F7EAZYGNGR77D6WPTRFENHXQ',
+        address_Private: 'MCOXVZMAZJTT4I3F7EAZYGNGR77D6WPTRFDHL7I',
+        address_PrivateTest: 'SCOXVZMAZJTT4I3F7EAZYGNGR77D6WPTRFENHXQ',
         mosaicId_Public: '28E680397FDD9336',
         mosaicId_PublicTest: '2F05C98474E9B263',
-        mosaicId_Mijin: '51B440266AE7F5B4',
-        mosaicId_MijinTest: '5693742C8290F33E',
+        mosaicId_Private: '51B440266AE7F5B4',
+        mosaicId_PrivateTest: '5693742C8290F33E',
     },
     {
         mosaicNonce: 737150288,
         address_Public: 'NDZ4373ASEGJ7S7GQTKF26TIIMC7HK5EWFDDCHA',
         address_PublicTest: 'TDZ4373ASEGJ7S7GQTKF26TIIMC7HK5EWEPHRSI',
-        address_Mijin: 'MDZ4373ASEGJ7S7GQTKF26TIIMC7HK5EWFN3NKY',
-        address_MijinTest: 'SDZ4373ASEGJ7S7GQTKF26TIIMC7HK5EWH6N46A',
+        address_Private: 'MDZ4373ASEGJ7S7GQTKF26TIIMC7HK5EWFN3NKY',
+        address_PrivateTest: 'SDZ4373ASEGJ7S7GQTKF26TIIMC7HK5EWH6N46A',
         mosaicId_Public: '75FAE31C9E1CEE38',
         mosaicId_PublicTest: '35C831D2A6D9702B',
-        mosaicId_Mijin: '0476D83DF29A0426',
-        mosaicId_MijinTest: '4F5597E18C0182BC',
+        mosaicId_Private: '0476D83DF29A0426',
+        mosaicId_PrivateTest: '4F5597E18C0182BC',
     },
     {
         mosaicNonce: 4118830514,
         address_Public: 'NDI5I7Z3BRBAAHTZHGONGOXX742CW4W5QAZ4BMQ',
         address_PublicTest: 'TDI5I7Z3BRBAAHTZHGONGOXX742CW4W5QCY5ZUA',
-        address_Mijin: 'MDI5I7Z3BRBAAHTZHGONGOXX742CW4W5QCLCVEA',
-        address_MijinTest: 'SDI5I7Z3BRBAAHTZHGONGOXX742CW4W5QDVZG2I',
+        address_Private: 'MDI5I7Z3BRBAAHTZHGONGOXX742CW4W5QCLCVEA',
+        address_PrivateTest: 'SDI5I7Z3BRBAAHTZHGONGOXX742CW4W5QDVZG2I',
         mosaicId_Public: '656748D5F82E87A1',
         mosaicId_PublicTest: '1CB636C5A32F0293',
-        mosaicId_Mijin: '35C2901E25DCF921',
-        mosaicId_MijinTest: '18FF3D8F9FA932D4',
+        mosaicId_Private: '35C2901E25DCF921',
+        mosaicId_PrivateTest: '18FF3D8F9FA932D4',
     },
     {
         mosaicNonce: 2640226657,
         address_Public: 'NAA6RO4ZAPEDGTCVADE3G4C7SWAE3DBQ4SCMOAI',
         address_PublicTest: 'TAA6RO4ZAPEDGTCVADE3G4C7SWAE3DBQ4RTFBQY',
-        address_Mijin: 'MAA6RO4ZAPEDGTCVADE3G4C7SWAE3DBQ4TEKNHA',
-        address_MijinTest: 'SAA6RO4ZAPEDGTCVADE3G4C7SWAE3DBQ4RYAIEA',
+        address_Private: 'MAA6RO4ZAPEDGTCVADE3G4C7SWAE3DBQ4TEKNHA',
+        address_PrivateTest: 'SAA6RO4ZAPEDGTCVADE3G4C7SWAE3DBQ4RYAIEA',
         mosaicId_Public: '3840F6C79934A159',
         mosaicId_PublicTest: '5B0FFAA57C41D62E',
-        mosaicId_Mijin: '11BA1D842237D52B',
-        mosaicId_MijinTest: '0585182BF5BC7B57',
+        mosaicId_Private: '11BA1D842237D52B',
+        mosaicId_PrivateTest: '0585182BF5BC7B57',
     },
     {
         mosaicNonce: 1996615061,
         address_Public: 'NBEOZ72O73OYXFDLID5KGBMP67MROHONPQHVKAI',
         address_PublicTest: 'TBEOZ72O73OYXFDLID5KGBMP67MROHONPR72UPQ',
-        address_Mijin: 'MBEOZ72O73OYXFDLID5KGBMP67MROHONPTHVSXQ',
-        address_MijinTest: 'SBEOZ72O73OYXFDLID5KGBMP67MROHONPTACBLI',
+        address_Private: 'MBEOZ72O73OYXFDLID5KGBMP67MROHONPTHVSXQ',
+        address_PrivateTest: 'SBEOZ72O73OYXFDLID5KGBMP67MROHONPTACBLI',
         mosaicId_Public: '5AA0FF3892EF3345',
         mosaicId_PublicTest: '79BD9AF30668FBDF',
-        mosaicId_Mijin: '0F8D3270B8ADDF77',
-        mosaicId_MijinTest: '092E4A9D08A9C1C5',
+        mosaicId_Private: '0F8D3270B8ADDF77',
+        mosaicId_PrivateTest: '092E4A9D08A9C1C5',
     },
     {
         mosaicNonce: 205824978,
         address_Public: 'NAMJCSC2BEW52LVAULFRRJJTSRHLI7ABRG2X5RI',
         address_PublicTest: 'TAMJCSC2BEW52LVAULFRRJJTSRHLI7ABRHFJZ5I',
-        address_Mijin: 'MAMJCSC2BEW52LVAULFRRJJTSRHLI7ABRG7GL5A',
-        address_MijinTest: 'SAMJCSC2BEW52LVAULFRRJJTSRHLI7ABRGLZY6A',
+        address_Private: 'MAMJCSC2BEW52LVAULFRRJJTSRHLI7ABRG7GL5A',
+        address_PrivateTest: 'SAMJCSC2BEW52LVAULFRRJJTSRHLI7ABRGLZY6A',
         mosaicId_Public: '3AB75AF98A5E0365',
         mosaicId_PublicTest: '3494FFAE1F6B2B4D',
-        mosaicId_Mijin: '3DF5D3B47E956692',
-        mosaicId_MijinTest: '4AA757991E36C79C',
+        mosaicId_Private: '3DF5D3B47E956692',
+        mosaicId_PrivateTest: '4AA757991E36C79C',
     },
     {
         mosaicNonce: 3310277026,
         address_Public: 'NCOVTFVVDZGNURZFU4IJLJR37X5TXNWMTSEHR6I',
         address_PublicTest: 'TCOVTFVVDZGNURZFU4IJLJR37X5TXNWMTTXN3DI',
-        address_Mijin: 'MCOVTFVVDZGNURZFU4IJLJR37X5TXNWMTTARXZQ',
-        address_MijinTest: 'SCOVTFVVDZGNURZFU4IJLJR37X5TXNWMTSJ6YWY',
+        address_Private: 'MCOVTFVVDZGNURZFU4IJLJR37X5TXNWMTTARXZQ',
+        address_PrivateTest: 'SCOVTFVVDZGNURZFU4IJLJR37X5TXNWMTSJ6YWY',
         mosaicId_Public: '213E6E2EC43285C4',
         mosaicId_PublicTest: '659C0D4A03D119D2',
-        mosaicId_Mijin: '756AC167798FA3DF',
-        mosaicId_MijinTest: '164D3F56862E9520',
+        mosaicId_Private: '756AC167798FA3DF',
+        mosaicId_PrivateTest: '164D3F56862E9520',
     },
 ];
 
@@ -193,8 +193,8 @@ describe('id generator', () => {
             mosaicTestVector.map((row) => {
                 const addressPublic = Address.createFromRawAddress(row.address_Public);
                 const addressTest = Address.createFromRawAddress(row.address_PublicTest);
-                const addressMijin = Address.createFromRawAddress(row.address_Mijin);
-                const addressMijinTest = Address.createFromRawAddress(row.address_MijinTest);
+                const addressPrivate = Address.createFromRawAddress(row.address_Private);
+                const addressPrivateTest = Address.createFromRawAddress(row.address_PrivateTest);
 
                 // Assert:
                 expect(
@@ -206,13 +206,13 @@ describe('id generator', () => {
                     'PublicTest',
                 ).to.deep.equal(row.mosaicId_PublicTest);
                 expect(
-                    MosaicId.createFromNonce(MosaicNonce.createFromNumber(row.mosaicNonce), addressMijin).toHex(),
-                    'Mijin',
-                ).to.deep.equal(row.mosaicId_Mijin);
+                    MosaicId.createFromNonce(MosaicNonce.createFromNumber(row.mosaicNonce), addressPrivate).toHex(),
+                    'Private',
+                ).to.deep.equal(row.mosaicId_Private);
                 expect(
-                    MosaicId.createFromNonce(MosaicNonce.createFromNumber(row.mosaicNonce), addressMijinTest).toHex(),
-                    'MijinTest',
-                ).to.deep.equal(row.mosaicId_MijinTest);
+                    MosaicId.createFromNonce(MosaicNonce.createFromNumber(row.mosaicNonce), addressPrivateTest).toHex(),
+                    'PrivateTest',
+                ).to.deep.equal(row.mosaicId_PrivateTest);
             });
         });
     });

diff --git a/test/core/format/RawAddress.spec.ts b/test/core/format/RawAddress.spec.ts
@@ -98,10 +98,10 @@ describe('address', () => {
             const publicKey = convert.hexToUint8('2E834140FD66CF87B254A693A2C7862C819217B676D3943267156625E816EC6F');
 
             // Act:
-            const decoded = address.publicKeyToAddress(publicKey, NetworkType.MIJIN);
+            const decoded = address.publicKeyToAddress(publicKey, NetworkType.PRIVATE);
 
             // Assert:
-            expect(decoded[0]).to.equal(NetworkType.MIJIN);
+            expect(decoded[0]).to.equal(NetworkType.PRIVATE);
             expect(address.isValidAddress(decoded)).to.equal(true);
             expect(convert.uint8ToHex(decoded)).to.equal(expectedHex);
         });
@@ -112,10 +112,10 @@ describe('address', () => {
             const publicKey = convert.hexToUint8('2E834140FD66CF87B254A693A2C7862C819217B676D3943267156625E816EC6F');
 
             // Act:
-            const decoded = address.publicKeyToAddress(publicKey, NetworkType.MIJIN_TEST);
+            const decoded = address.publicKeyToAddress(publicKey, NetworkType.PRIVATE_TEST);
 
             // Assert:
-            expect(decoded[0]).to.equal(NetworkType.MIJIN_TEST);
+            expect(decoded[0]).to.equal(NetworkType.PRIVATE_TEST);
             expect(address.isValidAddress(decoded)).to.equal(true);
             expect(convert.uint8ToHex(decoded)).to.equal(expectedHex);
         });
@@ -125,8 +125,8 @@ describe('address', () => {
             const publicKey = convert.hexToUint8('2E834140FD66CF87B254A693A2C7862C819217B676D3943267156625E816EC6F');
 
             // Act:
-            const decoded1 = address.publicKeyToAddress(publicKey, NetworkType.MIJIN_TEST);
-            const decoded2 = address.publicKeyToAddress(publicKey, NetworkType.MIJIN_TEST);
+            const decoded1 = address.publicKeyToAddress(publicKey, NetworkType.PRIVATE_TEST);
+            const decoded2 = address.publicKeyToAddress(publicKey, NetworkType.PRIVATE_TEST);
 
             // Assert:
             expect(address.isValidAddress(decoded1)).to.equal(true);
@@ -139,8 +139,8 @@ describe('address', () => {
             const publicKey2 = convert.hexToUint8('4875FD2E32875D1BC6567745F1509F0F890A1BF8EE59FA74452FA4183A270E03');
 
             // Act:
-            const decoded1 = address.publicKeyToAddress(publicKey1, NetworkType.MIJIN_TEST);
-            const decoded2 = address.publicKeyToAddress(publicKey2, NetworkType.MIJIN_TEST);
+            const decoded1 = address.publicKeyToAddress(publicKey1, NetworkType.PRIVATE_TEST);
+            const decoded2 = address.publicKeyToAddress(publicKey2, NetworkType.PRIVATE_TEST);
 
             // Assert:
             expect(address.isValidAddress(decoded1)).to.equal(true);
@@ -153,7 +153,7 @@ describe('address', () => {
             const publicKey = convert.hexToUint8('4875FD2E32875D1BC6567745F1509F0F890A1BF8EE59FA74452FA4183A270E03');
 
             // Act:
-            const decoded1 = address.publicKeyToAddress(publicKey, NetworkType.MIJIN_TEST);
+            const decoded1 = address.publicKeyToAddress(publicKey, NetworkType.PRIVATE_TEST);
             const decoded2 = address.publicKeyToAddress(publicKey, NetworkType.TEST_NET);
 
             // Assert:
@@ -285,7 +285,7 @@ describe('address', () => {
     /**
      * @see https://raw.githubusercontent.com/nemtech/test-vectors/master/1.test-address.json
      */
-    describe('Catapult test vector [MIJIN] - PublicKey to Address', () => {
+    describe('Catapult test vector [PRIVATE] - PublicKey to Address', () => {
         it('can create Address from Catapult public Key', () => {
             // Arrange:
             const Public_Keys = [
@@ -313,7 +313,7 @@ describe('address', () => {
                 const expectedAddress = Addresses[i];
 
                 // Act:
-                const result = address.addressToString(address.publicKeyToAddress(convert.hexToUint8(publicKeyHex), NetworkType.MIJIN));
+                const result = address.addressToString(address.publicKeyToAddress(convert.hexToUint8(publicKeyHex), NetworkType.PRIVATE));
 
                 // Assert:
                 const message = ` from ${publicKeyHex}`;
@@ -325,7 +325,7 @@ describe('address', () => {
     /**
      * @see https://raw.githubusercontent.com/nemtech/test-vectors/master/1.test-address.json
      */
-    describe('Catapult test vector [MIJIN_TEST] - PublicKey to Address', () => {
+    describe('Catapult test vector [PRIVATE_TEST] - PublicKey to Address', () => {
         it('can create Address from Catapult public Key', () => {
             // Arrange:
             const Public_Keys = [
@@ -354,7 +354,7 @@ describe('address', () => {
 
                 // Act:
                 const result = address.addressToString(
-                    address.publicKeyToAddress(convert.hexToUint8(publicKeyHex), NetworkType.MIJIN_TEST),
+                    address.publicKeyToAddress(convert.hexToUint8(publicKeyHex), NetworkType.PRIVATE_TEST),
                 );
 
                 // Assert:

diff --git a/test/core/utils/DtoMapping.spec.ts b/test/core/utils/DtoMapping.spec.ts
@@ -28,7 +28,7 @@ import { DtoMapping } from '../../../src/core/utils/DtoMapping';
 describe('DtoMapping', () => {
     const publicAccount = PublicAccount.createFromPublicKey(
         '9801508C58666C746F471538E43002B85B1CD542F9874B2861183919BA8787B6',
-        NetworkType.MIJIN_TEST,
+        NetworkType.PRIVATE_TEST,
     );
     const address = publicAccount.address;
     const mosaicId = new MosaicId('11F4B1B3AC033DB5');