Skip to content

Commit 90cfe00

Browse files
committed
Fixed #688
- Renamed MIJIN to PRIVATE
1 parent bd72e13 commit 90cfe00

File tree

76 files changed

+767
-724
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+767
-724
lines changed

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -458,7 +458,7 @@ Client Library | v0.7.20-alpha.6 | [nem2-sdk-openapi-typescript-node-client](ht
458458
- Fixed http repository `error handling` issues.
459459
- Fixed bugs in `Alias` interface.
460460
- Fixed `MosaicId significant byte` not detected properly in TransactionPayload.
461-
- Fixed only `MIJIN_TEST` network type allowed in NetworkTypeHttp.
461+
- Fixed only `PRIVATE_TEST` network type allowed in NetworkTypeHttp.
462462
- Applied latest OpenAPI doc (`v0.7.19`).
463463
- Changed `SignedTransaction` class constructor to public.
464464
- Changed `MosaicRestrictionKey` format to be Hexadecimal.

e2e/infrastructure/PersistentHarvesting.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ describe('PersistentHarvesting', () => {
3333

3434
const vrfKeyPair = Account.createFromPrivateKey(
3535
'82798EA9A2D2D202AFCCC82C40A287780BCA3C7F7A2FD5B754832804C6BE1BAA',
36-
NetworkType.MIJIN_TEST,
36+
NetworkType.PRIVATE_TEST,
3737
);
3838

3939
before(() => {
@@ -113,7 +113,7 @@ describe('PersistentHarvesting', () => {
113113
remoteAccount.privateKey,
114114
vrfKeyPair.privateKey,
115115
'cfd84eca83508bbee954668e4aecca736caefa615367da76afe6985d695381db',
116-
NetworkType.MIJIN_TEST,
116+
NetworkType.PRIVATE_TEST,
117117
helper.maxFee,
118118
);
119119

src/model/account/Address.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@ export class Address {
4545
throw new Error('Address ' + addressTrimAndUpperCase + ' has to be 39 characters long');
4646
}
4747
if (addressTrimAndUpperCase.charAt(0) === 'S') {
48-
networkType = NetworkType.MIJIN_TEST;
48+
networkType = NetworkType.PRIVATE_TEST;
4949
} else if (addressTrimAndUpperCase.charAt(0) === 'M') {
50-
networkType = NetworkType.MIJIN;
50+
networkType = NetworkType.PRIVATE;
5151
} else if (addressTrimAndUpperCase.charAt(0) === 'T') {
5252
networkType = NetworkType.TEST_NET;
5353
} else if (addressTrimAndUpperCase.charAt(0) === 'N') {

src/model/network/NetworkType.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@ export enum NetworkType {
2929
*/
3030
TEST_NET = 0x98,
3131
/**
32-
* Mijin net network
32+
* Private net network
3333
* @type {number}
3434
*/
35-
MIJIN = 0x60,
35+
PRIVATE = 0x60,
3636
/**
37-
* Mijin test net network
37+
* Private test net network
3838
* @type {number}
3939
*/
40-
MIJIN_TEST = 0x90,
40+
PRIVATE_TEST = 0x90,
4141
}

test/conf/conf.spec.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,27 +19,27 @@ import { NetworkType } from '../../src/model/network/NetworkType';
1919

2020
export const TestingAccount = Account.createFromPrivateKey(
2121
'26b64cb10f005e5988a36744ca19e20d835ccc7c105aaa5f3b212da593180930',
22-
NetworkType.MIJIN_TEST,
22+
NetworkType.PRIVATE_TEST,
2323
);
2424

2525
export const MultisigAccount = Account.createFromPrivateKey(
2626
'5edebfdbeb32e9146d05ffd232c8af2cf9f396caf9954289daa0362d097fff3b',
27-
NetworkType.MIJIN_TEST,
27+
NetworkType.PRIVATE_TEST,
2828
);
2929

3030
export const CosignatoryAccount = Account.createFromPrivateKey(
3131
'2a2b1f5d366a5dd5dc56c3c757cf4fe6c66e2787087692cf329d7a49a594658b',
32-
NetworkType.MIJIN_TEST,
32+
NetworkType.PRIVATE_TEST,
3333
);
3434

3535
export const Cosignatory2Account = Account.createFromPrivateKey(
3636
'b8afae6f4ad13a1b8aad047b488e0738a437c7389d4ff30c359ac068910c1d59',
37-
NetworkType.MIJIN_TEST,
37+
NetworkType.PRIVATE_TEST,
3838
);
3939

4040
export const Cosignatory3Account = Account.createFromPrivateKey(
4141
'111602be4d36f92dd60ca6a3c68478988578f26f6a02f8c72089839515ab603e',
42-
NetworkType.MIJIN_TEST,
42+
NetworkType.PRIVATE_TEST,
4343
);
4444

4545
export const NIS2_URL = 'http://localhost:3000';

test/core/format/IdGenerator.spec.ts

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -40,100 +40,100 @@ const mosaicTestVector = [
4040
mosaicNonce: 2039925808,
4141
address_Public: 'NATNE7Q5BITMUTRRN6IB4I7FLSDRDWZA34SQ33Y',
4242
address_PublicTest: 'TATNE7Q5BITMUTRRN6IB4I7FLSDRDWZA37JGO5Q',
43-
address_Mijin: 'MATNE7Q5BITMUTRRN6IB4I7FLSDRDWZA34YACRA',
44-
address_MijinTest: 'SATNE7Q5BITMUTRRN6IB4I7FLSDRDWZA34I2PMQ',
43+
address_Private: 'MATNE7Q5BITMUTRRN6IB4I7FLSDRDWZA34YACRA',
44+
address_PrivateTest: 'SATNE7Q5BITMUTRRN6IB4I7FLSDRDWZA34I2PMQ',
4545
mosaicId_Public: '044C577DBDD6DC71',
4646
mosaicId_PublicTest: '1796754FB181EF1E',
47-
mosaicId_Mijin: '7DCEDD54DAEDF7B7',
48-
mosaicId_MijinTest: '5BCD295FC8801FE6',
47+
mosaicId_Private: '7DCEDD54DAEDF7B7',
48+
mosaicId_PrivateTest: '5BCD295FC8801FE6',
4949
},
5050
{
5151
mosaicNonce: 1477337076,
5252
address_Public: 'NDR6EW2WBHJQDYMNGFX2UBZHMMZC5PGL2YCZOQQ',
5353
address_PublicTest: 'TDR6EW2WBHJQDYMNGFX2UBZHMMZC5PGL2YBO3KA',
54-
address_Mijin: 'MDR6EW2WBHJQDYMNGFX2UBZHMMZC5PGL22B27FI',
55-
address_MijinTest: 'SDR6EW2WBHJQDYMNGFX2UBZHMMZC5PGL2Z5UYYY',
54+
address_Private: 'MDR6EW2WBHJQDYMNGFX2UBZHMMZC5PGL22B27FI',
55+
address_PrivateTest: 'SDR6EW2WBHJQDYMNGFX2UBZHMMZC5PGL2Z5UYYY',
5656
mosaicId_Public: '7E45A001465DEEA0',
5757
mosaicId_PublicTest: '5E55573E3EBBB596',
58-
mosaicId_Mijin: '0D47486978FA4316',
59-
mosaicId_MijinTest: '55595BF89461E7C1',
58+
mosaicId_Private: '0D47486978FA4316',
59+
mosaicId_PrivateTest: '55595BF89461E7C1',
6060
},
6161
{
6262
mosaicNonce: 1921674920,
6363
address_Public: 'NCOXVZMAZJTT4I3F7EAZYGNGR77D6WPTRH6SYIQ',
6464
address_PublicTest: 'TCOXVZMAZJTT4I3F7EAZYGNGR77D6WPTRE3VIBQ',
65-
address_Mijin: 'MCOXVZMAZJTT4I3F7EAZYGNGR77D6WPTRFDHL7I',
66-
address_MijinTest: 'SCOXVZMAZJTT4I3F7EAZYGNGR77D6WPTRFENHXQ',
65+
address_Private: 'MCOXVZMAZJTT4I3F7EAZYGNGR77D6WPTRFDHL7I',
66+
address_PrivateTest: 'SCOXVZMAZJTT4I3F7EAZYGNGR77D6WPTRFENHXQ',
6767
mosaicId_Public: '28E680397FDD9336',
6868
mosaicId_PublicTest: '2F05C98474E9B263',
69-
mosaicId_Mijin: '51B440266AE7F5B4',
70-
mosaicId_MijinTest: '5693742C8290F33E',
69+
mosaicId_Private: '51B440266AE7F5B4',
70+
mosaicId_PrivateTest: '5693742C8290F33E',
7171
},
7272
{
7373
mosaicNonce: 737150288,
7474
address_Public: 'NDZ4373ASEGJ7S7GQTKF26TIIMC7HK5EWFDDCHA',
7575
address_PublicTest: 'TDZ4373ASEGJ7S7GQTKF26TIIMC7HK5EWEPHRSI',
76-
address_Mijin: 'MDZ4373ASEGJ7S7GQTKF26TIIMC7HK5EWFN3NKY',
77-
address_MijinTest: 'SDZ4373ASEGJ7S7GQTKF26TIIMC7HK5EWH6N46A',
76+
address_Private: 'MDZ4373ASEGJ7S7GQTKF26TIIMC7HK5EWFN3NKY',
77+
address_PrivateTest: 'SDZ4373ASEGJ7S7GQTKF26TIIMC7HK5EWH6N46A',
7878
mosaicId_Public: '75FAE31C9E1CEE38',
7979
mosaicId_PublicTest: '35C831D2A6D9702B',
80-
mosaicId_Mijin: '0476D83DF29A0426',
81-
mosaicId_MijinTest: '4F5597E18C0182BC',
80+
mosaicId_Private: '0476D83DF29A0426',
81+
mosaicId_PrivateTest: '4F5597E18C0182BC',
8282
},
8383
{
8484
mosaicNonce: 4118830514,
8585
address_Public: 'NDI5I7Z3BRBAAHTZHGONGOXX742CW4W5QAZ4BMQ',
8686
address_PublicTest: 'TDI5I7Z3BRBAAHTZHGONGOXX742CW4W5QCY5ZUA',
87-
address_Mijin: 'MDI5I7Z3BRBAAHTZHGONGOXX742CW4W5QCLCVEA',
88-
address_MijinTest: 'SDI5I7Z3BRBAAHTZHGONGOXX742CW4W5QDVZG2I',
87+
address_Private: 'MDI5I7Z3BRBAAHTZHGONGOXX742CW4W5QCLCVEA',
88+
address_PrivateTest: 'SDI5I7Z3BRBAAHTZHGONGOXX742CW4W5QDVZG2I',
8989
mosaicId_Public: '656748D5F82E87A1',
9090
mosaicId_PublicTest: '1CB636C5A32F0293',
91-
mosaicId_Mijin: '35C2901E25DCF921',
92-
mosaicId_MijinTest: '18FF3D8F9FA932D4',
91+
mosaicId_Private: '35C2901E25DCF921',
92+
mosaicId_PrivateTest: '18FF3D8F9FA932D4',
9393
},
9494
{
9595
mosaicNonce: 2640226657,
9696
address_Public: 'NAA6RO4ZAPEDGTCVADE3G4C7SWAE3DBQ4SCMOAI',
9797
address_PublicTest: 'TAA6RO4ZAPEDGTCVADE3G4C7SWAE3DBQ4RTFBQY',
98-
address_Mijin: 'MAA6RO4ZAPEDGTCVADE3G4C7SWAE3DBQ4TEKNHA',
99-
address_MijinTest: 'SAA6RO4ZAPEDGTCVADE3G4C7SWAE3DBQ4RYAIEA',
98+
address_Private: 'MAA6RO4ZAPEDGTCVADE3G4C7SWAE3DBQ4TEKNHA',
99+
address_PrivateTest: 'SAA6RO4ZAPEDGTCVADE3G4C7SWAE3DBQ4RYAIEA',
100100
mosaicId_Public: '3840F6C79934A159',
101101
mosaicId_PublicTest: '5B0FFAA57C41D62E',
102-
mosaicId_Mijin: '11BA1D842237D52B',
103-
mosaicId_MijinTest: '0585182BF5BC7B57',
102+
mosaicId_Private: '11BA1D842237D52B',
103+
mosaicId_PrivateTest: '0585182BF5BC7B57',
104104
},
105105
{
106106
mosaicNonce: 1996615061,
107107
address_Public: 'NBEOZ72O73OYXFDLID5KGBMP67MROHONPQHVKAI',
108108
address_PublicTest: 'TBEOZ72O73OYXFDLID5KGBMP67MROHONPR72UPQ',
109-
address_Mijin: 'MBEOZ72O73OYXFDLID5KGBMP67MROHONPTHVSXQ',
110-
address_MijinTest: 'SBEOZ72O73OYXFDLID5KGBMP67MROHONPTACBLI',
109+
address_Private: 'MBEOZ72O73OYXFDLID5KGBMP67MROHONPTHVSXQ',
110+
address_PrivateTest: 'SBEOZ72O73OYXFDLID5KGBMP67MROHONPTACBLI',
111111
mosaicId_Public: '5AA0FF3892EF3345',
112112
mosaicId_PublicTest: '79BD9AF30668FBDF',
113-
mosaicId_Mijin: '0F8D3270B8ADDF77',
114-
mosaicId_MijinTest: '092E4A9D08A9C1C5',
113+
mosaicId_Private: '0F8D3270B8ADDF77',
114+
mosaicId_PrivateTest: '092E4A9D08A9C1C5',
115115
},
116116
{
117117
mosaicNonce: 205824978,
118118
address_Public: 'NAMJCSC2BEW52LVAULFRRJJTSRHLI7ABRG2X5RI',
119119
address_PublicTest: 'TAMJCSC2BEW52LVAULFRRJJTSRHLI7ABRHFJZ5I',
120-
address_Mijin: 'MAMJCSC2BEW52LVAULFRRJJTSRHLI7ABRG7GL5A',
121-
address_MijinTest: 'SAMJCSC2BEW52LVAULFRRJJTSRHLI7ABRGLZY6A',
120+
address_Private: 'MAMJCSC2BEW52LVAULFRRJJTSRHLI7ABRG7GL5A',
121+
address_PrivateTest: 'SAMJCSC2BEW52LVAULFRRJJTSRHLI7ABRGLZY6A',
122122
mosaicId_Public: '3AB75AF98A5E0365',
123123
mosaicId_PublicTest: '3494FFAE1F6B2B4D',
124-
mosaicId_Mijin: '3DF5D3B47E956692',
125-
mosaicId_MijinTest: '4AA757991E36C79C',
124+
mosaicId_Private: '3DF5D3B47E956692',
125+
mosaicId_PrivateTest: '4AA757991E36C79C',
126126
},
127127
{
128128
mosaicNonce: 3310277026,
129129
address_Public: 'NCOVTFVVDZGNURZFU4IJLJR37X5TXNWMTSEHR6I',
130130
address_PublicTest: 'TCOVTFVVDZGNURZFU4IJLJR37X5TXNWMTTXN3DI',
131-
address_Mijin: 'MCOVTFVVDZGNURZFU4IJLJR37X5TXNWMTTARXZQ',
132-
address_MijinTest: 'SCOVTFVVDZGNURZFU4IJLJR37X5TXNWMTSJ6YWY',
131+
address_Private: 'MCOVTFVVDZGNURZFU4IJLJR37X5TXNWMTTARXZQ',
132+
address_PrivateTest: 'SCOVTFVVDZGNURZFU4IJLJR37X5TXNWMTSJ6YWY',
133133
mosaicId_Public: '213E6E2EC43285C4',
134134
mosaicId_PublicTest: '659C0D4A03D119D2',
135-
mosaicId_Mijin: '756AC167798FA3DF',
136-
mosaicId_MijinTest: '164D3F56862E9520',
135+
mosaicId_Private: '756AC167798FA3DF',
136+
mosaicId_PrivateTest: '164D3F56862E9520',
137137
},
138138
];
139139

@@ -193,8 +193,8 @@ describe('id generator', () => {
193193
mosaicTestVector.map((row) => {
194194
const addressPublic = Address.createFromRawAddress(row.address_Public);
195195
const addressTest = Address.createFromRawAddress(row.address_PublicTest);
196-
const addressMijin = Address.createFromRawAddress(row.address_Mijin);
197-
const addressMijinTest = Address.createFromRawAddress(row.address_MijinTest);
196+
const addressPrivate = Address.createFromRawAddress(row.address_Private);
197+
const addressPrivateTest = Address.createFromRawAddress(row.address_PrivateTest);
198198

199199
// Assert:
200200
expect(
@@ -206,13 +206,13 @@ describe('id generator', () => {
206206
'PublicTest',
207207
).to.deep.equal(row.mosaicId_PublicTest);
208208
expect(
209-
MosaicId.createFromNonce(MosaicNonce.createFromNumber(row.mosaicNonce), addressMijin).toHex(),
210-
'Mijin',
211-
).to.deep.equal(row.mosaicId_Mijin);
209+
MosaicId.createFromNonce(MosaicNonce.createFromNumber(row.mosaicNonce), addressPrivate).toHex(),
210+
'Private',
211+
).to.deep.equal(row.mosaicId_Private);
212212
expect(
213-
MosaicId.createFromNonce(MosaicNonce.createFromNumber(row.mosaicNonce), addressMijinTest).toHex(),
214-
'MijinTest',
215-
).to.deep.equal(row.mosaicId_MijinTest);
213+
MosaicId.createFromNonce(MosaicNonce.createFromNumber(row.mosaicNonce), addressPrivateTest).toHex(),
214+
'PrivateTest',
215+
).to.deep.equal(row.mosaicId_PrivateTest);
216216
});
217217
});
218218
});

test/core/format/RawAddress.spec.ts

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -98,10 +98,10 @@ describe('address', () => {
9898
const publicKey = convert.hexToUint8('2E834140FD66CF87B254A693A2C7862C819217B676D3943267156625E816EC6F');
9999

100100
// Act:
101-
const decoded = address.publicKeyToAddress(publicKey, NetworkType.MIJIN);
101+
const decoded = address.publicKeyToAddress(publicKey, NetworkType.PRIVATE);
102102

103103
// Assert:
104-
expect(decoded[0]).to.equal(NetworkType.MIJIN);
104+
expect(decoded[0]).to.equal(NetworkType.PRIVATE);
105105
expect(address.isValidAddress(decoded)).to.equal(true);
106106
expect(convert.uint8ToHex(decoded)).to.equal(expectedHex);
107107
});
@@ -112,10 +112,10 @@ describe('address', () => {
112112
const publicKey = convert.hexToUint8('2E834140FD66CF87B254A693A2C7862C819217B676D3943267156625E816EC6F');
113113

114114
// Act:
115-
const decoded = address.publicKeyToAddress(publicKey, NetworkType.MIJIN_TEST);
115+
const decoded = address.publicKeyToAddress(publicKey, NetworkType.PRIVATE_TEST);
116116

117117
// Assert:
118-
expect(decoded[0]).to.equal(NetworkType.MIJIN_TEST);
118+
expect(decoded[0]).to.equal(NetworkType.PRIVATE_TEST);
119119
expect(address.isValidAddress(decoded)).to.equal(true);
120120
expect(convert.uint8ToHex(decoded)).to.equal(expectedHex);
121121
});
@@ -125,8 +125,8 @@ describe('address', () => {
125125
const publicKey = convert.hexToUint8('2E834140FD66CF87B254A693A2C7862C819217B676D3943267156625E816EC6F');
126126

127127
// Act:
128-
const decoded1 = address.publicKeyToAddress(publicKey, NetworkType.MIJIN_TEST);
129-
const decoded2 = address.publicKeyToAddress(publicKey, NetworkType.MIJIN_TEST);
128+
const decoded1 = address.publicKeyToAddress(publicKey, NetworkType.PRIVATE_TEST);
129+
const decoded2 = address.publicKeyToAddress(publicKey, NetworkType.PRIVATE_TEST);
130130

131131
// Assert:
132132
expect(address.isValidAddress(decoded1)).to.equal(true);
@@ -139,8 +139,8 @@ describe('address', () => {
139139
const publicKey2 = convert.hexToUint8('4875FD2E32875D1BC6567745F1509F0F890A1BF8EE59FA74452FA4183A270E03');
140140

141141
// Act:
142-
const decoded1 = address.publicKeyToAddress(publicKey1, NetworkType.MIJIN_TEST);
143-
const decoded2 = address.publicKeyToAddress(publicKey2, NetworkType.MIJIN_TEST);
142+
const decoded1 = address.publicKeyToAddress(publicKey1, NetworkType.PRIVATE_TEST);
143+
const decoded2 = address.publicKeyToAddress(publicKey2, NetworkType.PRIVATE_TEST);
144144

145145
// Assert:
146146
expect(address.isValidAddress(decoded1)).to.equal(true);
@@ -153,7 +153,7 @@ describe('address', () => {
153153
const publicKey = convert.hexToUint8('4875FD2E32875D1BC6567745F1509F0F890A1BF8EE59FA74452FA4183A270E03');
154154

155155
// Act:
156-
const decoded1 = address.publicKeyToAddress(publicKey, NetworkType.MIJIN_TEST);
156+
const decoded1 = address.publicKeyToAddress(publicKey, NetworkType.PRIVATE_TEST);
157157
const decoded2 = address.publicKeyToAddress(publicKey, NetworkType.TEST_NET);
158158

159159
// Assert:
@@ -285,7 +285,7 @@ describe('address', () => {
285285
/**
286286
* @see https://raw.githubusercontent.com/nemtech/test-vectors/master/1.test-address.json
287287
*/
288-
describe('Catapult test vector [MIJIN] - PublicKey to Address', () => {
288+
describe('Catapult test vector [PRIVATE] - PublicKey to Address', () => {
289289
it('can create Address from Catapult public Key', () => {
290290
// Arrange:
291291
const Public_Keys = [
@@ -313,7 +313,7 @@ describe('address', () => {
313313
const expectedAddress = Addresses[i];
314314

315315
// Act:
316-
const result = address.addressToString(address.publicKeyToAddress(convert.hexToUint8(publicKeyHex), NetworkType.MIJIN));
316+
const result = address.addressToString(address.publicKeyToAddress(convert.hexToUint8(publicKeyHex), NetworkType.PRIVATE));
317317

318318
// Assert:
319319
const message = ` from ${publicKeyHex}`;
@@ -325,7 +325,7 @@ describe('address', () => {
325325
/**
326326
* @see https://raw.githubusercontent.com/nemtech/test-vectors/master/1.test-address.json
327327
*/
328-
describe('Catapult test vector [MIJIN_TEST] - PublicKey to Address', () => {
328+
describe('Catapult test vector [PRIVATE_TEST] - PublicKey to Address', () => {
329329
it('can create Address from Catapult public Key', () => {
330330
// Arrange:
331331
const Public_Keys = [
@@ -354,7 +354,7 @@ describe('address', () => {
354354

355355
// Act:
356356
const result = address.addressToString(
357-
address.publicKeyToAddress(convert.hexToUint8(publicKeyHex), NetworkType.MIJIN_TEST),
357+
address.publicKeyToAddress(convert.hexToUint8(publicKeyHex), NetworkType.PRIVATE_TEST),
358358
);
359359

360360
// Assert:

test/core/utils/DtoMapping.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import { DtoMapping } from '../../../src/core/utils/DtoMapping';
2828
describe('DtoMapping', () => {
2929
const publicAccount = PublicAccount.createFromPublicKey(
3030
'9801508C58666C746F471538E43002B85B1CD542F9874B2861183919BA8787B6',
31-
NetworkType.MIJIN_TEST,
31+
NetworkType.PRIVATE_TEST,
3232
);
3333
const address = publicAccount.address;
3434
const mosaicId = new MosaicId('11F4B1B3AC033DB5');

0 commit comments

Comments
 (0)