Skip to content

Commit 2274bf3

Browse files
rg911rg911
authored
Feat unused network types (#820)
* feat: removed unused network types * fix: renamed publicTest to testnet * fix: dedupe * fix: more dedupe
1 parent 5557858 commit 2274bf3

File tree

91 files changed

+1086
-1504
lines changed

Some content is hidden

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

91 files changed

+1086
-1504
lines changed

‎package-lock.json‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/model/account/Address.ts‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -45,18 +45,10 @@ export class Address {
4545
if (addressTrimAndUpperCase.length !== 39) {
4646
throw new Error('Address ' + addressTrimAndUpperCase + ' has to be 39 characters long');
4747
}
48-
if (addressTrimAndUpperCase.charAt(0) === 'S') {
49-
networkType = NetworkType.MIJIN_TEST;
50-
} else if (addressTrimAndUpperCase.charAt(0) === 'M') {
51-
networkType = NetworkType.MIJIN;
52-
} else if (addressTrimAndUpperCase.charAt(0) === 'T') {
48+
if (addressTrimAndUpperCase.charAt(0) === 'T') {
5349
networkType = NetworkType.TEST_NET;
5450
} else if (addressTrimAndUpperCase.charAt(0) === 'N') {
5551
networkType = NetworkType.MAIN_NET;
56-
} else if (addressTrimAndUpperCase.charAt(0) === 'P') {
57-
networkType = NetworkType.PRIVATE;
58-
} else if (addressTrimAndUpperCase.charAt(0) === 'V') {
59-
networkType = NetworkType.PRIVATE_TEST;
6052
} else {
6153
throw new Error('Address Network unsupported');
6254
}
@@ -74,7 +66,7 @@ export class Address {
7466

7567
/**
7668
* Determines the validity of an raw address string.
77-
* @param {string} rawAddress The raw address string. Expected format VATNE7Q5BITMUTRRN6IB4I7FLSDRDWZA35C4KNQ
69+
* @param {string} rawAddress The raw address string. Expected format TATNE7Q5BITMUTRRN6IB4I7FLSDRDWZA37JGO5Q
7870
* @returns {boolean} true if the raw address string is valid, false otherwise.
7971
*/
8072
public static isValidRawAddress = (rawAddress: string): boolean => {

‎src/model/network/NetworkType.ts‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -28,24 +28,4 @@ export enum NetworkType {
2828
* @type {number}
2929
*/
3030
TEST_NET = 0x98,
31-
/**
32-
* Mijin net network
33-
* @type {number}
34-
*/
35-
MIJIN = 0x60,
36-
/**
37-
* Mijin test net network
38-
* @type {number}
39-
*/
40-
MIJIN_TEST = 0x90,
41-
/**
42-
* Private net network
43-
* @type {number}
44-
*/
45-
PRIVATE = 0x78,
46-
/**
47-
* Private test net network
48-
* @type {number}
49-
*/
50-
PRIVATE_TEST = 0xa8,
5131
}

‎test/conf/conf.spec.ts‎

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,31 +15,36 @@
1515
*/
1616

1717
import { Account } from '../../src/model/account/Account';
18+
import { Address } from '../../src/model/account/Address';
1819
import { NetworkType } from '../../src/model/network/NetworkType';
1920

2021
export const TestingAccount = Account.createFromPrivateKey(
21-
'26b64cb10f005e5988a36744ca19e20d835ccc7c105aaa5f3b212da593180930',
22-
NetworkType.PRIVATE_TEST,
22+
'575DBB3062267EFF57C970A336EBBC8FBCFE12C5BD3ED7BC11EB0481D7704CED',
23+
NetworkType.TEST_NET,
2324
);
2425

2526
export const MultisigAccount = Account.createFromPrivateKey(
26-
'5edebfdbeb32e9146d05ffd232c8af2cf9f396caf9954289daa0362d097fff3b',
27-
NetworkType.PRIVATE_TEST,
27+
'5B0E3FA5D3B49A79022D7C1E121BA1CBBF4DB5821F47AB8C708EF88DEFC29BFE',
28+
NetworkType.TEST_NET,
2829
);
2930

3031
export const CosignatoryAccount = Account.createFromPrivateKey(
31-
'2a2b1f5d366a5dd5dc56c3c757cf4fe6c66e2787087692cf329d7a49a594658b',
32-
NetworkType.PRIVATE_TEST,
32+
'738BA9BB9110AEA8F15CAA353ACA5653B4BDFCA1DB9F34D0EFED2CE1325AEEDA',
33+
NetworkType.TEST_NET,
3334
);
3435

3536
export const Cosignatory2Account = Account.createFromPrivateKey(
36-
'b8afae6f4ad13a1b8aad047b488e0738a437c7389d4ff30c359ac068910c1d59',
37-
NetworkType.PRIVATE_TEST,
37+
'E8BF9BC0F35C12D8C8BF94DD3A8B5B4034F1063948E3CC5304E55E31AA4B95A6',
38+
NetworkType.TEST_NET,
3839
);
3940

4041
export const Cosignatory3Account = Account.createFromPrivateKey(
41-
'111602be4d36f92dd60ca6a3c68478988578f26f6a02f8c72089839515ab603e',
42-
NetworkType.PRIVATE_TEST,
42+
'C325EA529674396DB5675939E7988883D59A5FC17A28CA977E3BA85370232A83',
43+
NetworkType.TEST_NET,
4344
);
4445

46+
export const TestAddress = Address.createFromRawAddress('TATNE7Q5BITMUTRRN6IB4I7FLSDRDWZA37JGO5Q');
47+
48+
export const TestNetworkType = NetworkType.TEST_NET;
49+
4550
export const NIS2_URL = 'http://localhost:3000';

‎test/core/format/IdGenerator.spec.ts‎

Lines changed: 42 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -38,108 +38,72 @@ const basicMosaicInfo = {
3838
const mosaicTestVector = [
3939
{
4040
mosaicNonce: 2039925808,
41-
address_Public: 'NATNE7Q5BITMUTRRN6IB4I7FLSDRDWZA34SQ33Y',
42-
address_PublicTest: 'TATNE7Q5BITMUTRRN6IB4I7FLSDRDWZA37JGO5Q',
43-
address_Private: 'PATNE7Q5BITMUTRRN6IB4I7FLSDRDWZA35OETNI',
44-
address_PrivateTest: 'VATNE7Q5BITMUTRRN6IB4I7FLSDRDWZA35C4KNQ',
45-
mosaicId_Public: '044C577DBDD6DC71',
46-
mosaicId_PublicTest: '1796754FB181EF1E',
47-
mosaicId_Private: '2DE5561540AAA72C',
48-
mosaicId_PrivateTest: '679DF003FA26DBDB',
41+
address_mainnet: 'NATNE7Q5BITMUTRRN6IB4I7FLSDRDWZA34SQ33Y',
42+
address_Testnet: 'TATNE7Q5BITMUTRRN6IB4I7FLSDRDWZA37JGO5Q',
43+
mosaicId_Mainnet: '044C577DBDD6DC71',
44+
mosaicId_Testnet: '1796754FB181EF1E',
4945
},
5046
{
5147
mosaicNonce: 1477337076,
52-
address_Public: 'NDR6EW2WBHJQDYMNGFX2UBZHMMZC5PGL2YCZOQQ',
53-
address_PublicTest: 'TDR6EW2WBHJQDYMNGFX2UBZHMMZC5PGL2YBO3KA',
54-
address_Private: 'PDR6EW2WBHJQDYMNGFX2UBZHMMZC5PGL2ZMEBFQ',
55-
address_PrivateTest: 'VATNE7Q5BITMUTRRN6IB4I7FLSDRDWZA35C4KNQ',
56-
mosaicId_Public: '7E45A001465DEEA0',
57-
mosaicId_PublicTest: '5E55573E3EBBB596',
58-
mosaicId_Private: '2F6D0DA76516DA99',
59-
mosaicId_PrivateTest: '3407DF9A8C64B004',
48+
address_mainnet: 'NDR6EW2WBHJQDYMNGFX2UBZHMMZC5PGL2YCZOQQ',
49+
address_Testnet: 'TDR6EW2WBHJQDYMNGFX2UBZHMMZC5PGL2YBO3KA',
50+
mosaicId_Mainnet: '7E45A001465DEEA0',
51+
mosaicId_Testnet: '5E55573E3EBBB596',
6052
},
6153
{
6254
mosaicNonce: 1921674920,
63-
address_Public: 'NCOXVZMAZJTT4I3F7EAZYGNGR77D6WPTRH6SYIQ',
64-
address_PublicTest: 'TCOXVZMAZJTT4I3F7EAZYGNGR77D6WPTRE3VIBQ',
65-
address_Private: 'PCOXVZMAZJTT4I3F7EAZYGNGR77D6WPTREWK33Q',
66-
address_PrivateTest: 'VATNE7Q5BITMUTRRN6IB4I7FLSDRDWZA35C4KNQ',
67-
mosaicId_Public: '28E680397FDD9336',
68-
mosaicId_PublicTest: '2F05C98474E9B263',
69-
mosaicId_Private: '686E0DC244F5093D',
70-
mosaicId_PrivateTest: '45BED110FA798811',
55+
address_mainnet: 'NCOXVZMAZJTT4I3F7EAZYGNGR77D6WPTRH6SYIQ',
56+
address_Testnet: 'TCOXVZMAZJTT4I3F7EAZYGNGR77D6WPTRE3VIBQ',
57+
mosaicId_Mainnet: '28E680397FDD9336',
58+
mosaicId_Testnet: '2F05C98474E9B263',
7159
},
7260
{
7361
mosaicNonce: 812613930,
7462
publicKey: '2E834140FD66CF87B254A693A2C7862C819217B676D3943267156625E816EC6F',
75-
address_Public: 'NATNE7Q5BITMUTRRN6IB4I7FLSDRDWZA34SQ33Y',
76-
address_PublicTest: 'TATNE7Q5BITMUTRRN6IB4I7FLSDRDWZA37JGO5Q',
77-
address_Private: 'PATNE7Q5BITMUTRRN6IB4I7FLSDRDWZA35OETNI',
78-
address_PrivateTest: 'VATNE7Q5BITMUTRRN6IB4I7FLSDRDWZA35C4KNQ',
79-
mosaicId_Public: '296994F01121AFC9',
80-
mosaicId_PublicTest: '570FB3ED9379624C',
81-
mosaicId_Private: '09557FCB9DAB83DC',
82-
mosaicId_PrivateTest: '333AC200C158FDA6',
63+
address_mainnet: 'NATNE7Q5BITMUTRRN6IB4I7FLSDRDWZA34SQ33Y',
64+
address_Testnet: 'TATNE7Q5BITMUTRRN6IB4I7FLSDRDWZA37JGO5Q',
65+
mosaicId_Mainnet: '296994F01121AFC9',
66+
mosaicId_Testnet: '570FB3ED9379624C',
8367
},
8468
{
8569
mosaicNonce: 1456792364,
8670
publicKey: '4875FD2E32875D1BC6567745F1509F0F890A1BF8EE59FA74452FA4183A270E03',
87-
address_Public: 'NDR6EW2WBHJQDYMNGFX2UBZHMMZC5PGL2YCZOQQ',
88-
address_PublicTest: 'TDR6EW2WBHJQDYMNGFX2UBZHMMZC5PGL2YBO3KA',
89-
address_Private: 'PDR6EW2WBHJQDYMNGFX2UBZHMMZC5PGL2ZMEBFQ',
90-
address_PrivateTest: 'VATNE7Q5BITMUTRRN6IB4I7FLSDRDWZA35C4KNQ',
91-
mosaicId_Public: '14AA6D651D9081B4',
92-
mosaicId_PublicTest: '3A334999B5C56073',
93-
mosaicId_Private: '6D6DEB080F52932A',
94-
mosaicId_PrivateTest: '7711BD151ED49510',
71+
address_mainnet: 'NDR6EW2WBHJQDYMNGFX2UBZHMMZC5PGL2YCZOQQ',
72+
address_Testnet: 'TDR6EW2WBHJQDYMNGFX2UBZHMMZC5PGL2YBO3KA',
73+
mosaicId_Mainnet: '14AA6D651D9081B4',
74+
mosaicId_Testnet: '3A334999B5C56073',
9575
},
9676
{
9777
mosaicNonce: 2843362027,
9878
publicKey: '9F780097FB6A1F287ED2736A597B8EA7F08D20F1ECDB9935DE6694ECF1C58900',
99-
address_Public: 'NCOXVZMAZJTT4I3F7EAZYGNGR77D6WPTRH6SYIQ',
100-
address_PublicTest: 'TCOXVZMAZJTT4I3F7EAZYGNGR77D6WPTRE3VIBQ',
101-
address_Private: 'PCOXVZMAZJTT4I3F7EAZYGNGR77D6WPTREWK33Q',
102-
address_PrivateTest: 'VATNE7Q5BITMUTRRN6IB4I7FLSDRDWZA35C4KNQ',
103-
mosaicId_Public: '4A0C3A1CA50F2CFC',
104-
mosaicId_PublicTest: '23CE1EAEBE30195A',
105-
mosaicId_Private: '4CC83B59753ED5FD',
106-
mosaicId_PrivateTest: '013A96268508688B',
79+
address_mainnet: 'NCOXVZMAZJTT4I3F7EAZYGNGR77D6WPTRH6SYIQ',
80+
address_Testnet: 'TCOXVZMAZJTT4I3F7EAZYGNGR77D6WPTRE3VIBQ',
81+
mosaicId_Mainnet: '4A0C3A1CA50F2CFC',
82+
mosaicId_Testnet: '23CE1EAEBE30195A',
10783
},
10884
{
10985
mosaicNonce: 1686841592,
11086
publicKey: '0815926E003CDD5AF0113C0E067262307A42CD1E697F53B683F7E5F9F57D72C9',
111-
address_Public: 'NDZ4373ASEGJ7S7GQTKF26TIIMC7HK5EWFDDCHA',
112-
address_PublicTest: 'TDZ4373ASEGJ7S7GQTKF26TIIMC7HK5EWEPHRSI',
113-
address_Private: 'PDZ4373ASEGJ7S7GQTKF26TIIMC7HK5EWELJG3Y',
114-
address_PrivateTest: 'VATNE7Q5BITMUTRRN6IB4I7FLSDRDWZA35C4KNQ',
115-
mosaicId_Public: '75A9C882F9A89606',
116-
mosaicId_PublicTest: '748A1BD01A40DCF8',
117-
mosaicId_Private: '2397BBB964A3ACCB',
118-
mosaicId_PrivateTest: '3A5C341CFB24B621',
87+
address_mainnet: 'NDZ4373ASEGJ7S7GQTKF26TIIMC7HK5EWFDDCHA',
88+
address_Testnet: 'TDZ4373ASEGJ7S7GQTKF26TIIMC7HK5EWEPHRSI',
89+
mosaicId_Mainnet: '75A9C882F9A89606',
90+
mosaicId_Testnet: '748A1BD01A40DCF8',
11991
},
12092
{
12193
mosaicNonce: 4206379750,
12294
publicKey: '3683B3E45E76870CFE076E47C2B34CE8E3EAEC26C8AA7C1ED752E3E840AF8A27',
123-
address_Public: 'NDI5I7Z3BRBAAHTZHGONGOXX742CW4W5QAZ4BMQ',
124-
address_PublicTest: 'TDI5I7Z3BRBAAHTZHGONGOXX742CW4W5QCY5ZUA',
125-
address_Private: 'PDI5I7Z3BRBAAHTZHGONGOXX742CW4W5QAAJTUI',
126-
address_PrivateTest: 'VATNE7Q5BITMUTRRN6IB4I7FLSDRDWZA35C4KNQ',
127-
mosaicId_Public: '3E949FBC6D09833D',
128-
mosaicId_PublicTest: '40B85E3227EE56A0',
129-
mosaicId_Private: '5A0D55D5D2F104F9',
130-
mosaicId_PrivateTest: '66ECD110D23BC5DC',
95+
address_mainnet: 'NDI5I7Z3BRBAAHTZHGONGOXX742CW4W5QAZ4BMQ',
96+
address_Testnet: 'TDI5I7Z3BRBAAHTZHGONGOXX742CW4W5QCY5ZUA',
97+
mosaicId_Mainnet: '3E949FBC6D09833D',
98+
mosaicId_Testnet: '40B85E3227EE56A0',
13199
},
132100
{
133101
mosaicNonce: 2539328334,
134102
publicKey: '4F593111964B37A9CAC59D2A70BC959AE9269589B75FBD640145EB0038960540',
135-
address_Public: 'NAA6RO4ZAPEDGTCVADE3G4C7SWAE3DBQ4SCMOAI',
136-
address_PublicTest: 'TAA6RO4ZAPEDGTCVADE3G4C7SWAE3DBQ4RTFBQY',
137-
address_Private: 'PAA6RO4ZAPEDGTCVADE3G4C7SWAE3DBQ4QVXSZQ',
138-
address_PrivateTest: 'VATNE7Q5BITMUTRRN6IB4I7FLSDRDWZA35C4KNQ',
139-
mosaicId_Public: '1B5FFAEBF3C9602A',
140-
mosaicId_PublicTest: '503EBA0288209C64',
141-
mosaicId_Private: '41CF06028C230DF4',
142-
mosaicId_PrivateTest: '0698BBBA0131FEF4',
103+
address_mainnet: 'NAA6RO4ZAPEDGTCVADE3G4C7SWAE3DBQ4SCMOAI',
104+
address_Testnet: 'TAA6RO4ZAPEDGTCVADE3G4C7SWAE3DBQ4RTFBQY',
105+
mosaicId_Mainnet: '1B5FFAEBF3C9602A',
106+
mosaicId_Testnet: '503EBA0288209C64',
143107
},
144108
];
145109

@@ -197,28 +161,18 @@ describe('id generator', () => {
197161
// @dataProvider mosaicTestVector
198162
it('generates correct mosaicId given nonce and address', () => {
199163
mosaicTestVector.map((row) => {
200-
const addressPublic = Address.createFromRawAddress(row.address_Public);
201-
const addressTest = Address.createFromRawAddress(row.address_PublicTest);
202-
const addressPrivate = Address.createFromRawAddress(row.address_Private);
203-
const addressPrivateTest = Address.createFromRawAddress(row.address_PrivateTest);
164+
const addressPublic = Address.createFromRawAddress(row.address_mainnet);
165+
const addressTest = Address.createFromRawAddress(row.address_Testnet);
204166

205167
// Assert:
206168
expect(
207169
MosaicId.createFromNonce(MosaicNonce.createFromNumber(row.mosaicNonce), addressPublic).toHex(),
208-
'Public',
209-
).to.deep.equal(row.mosaicId_Public);
170+
'Mainnet',
171+
).to.deep.equal(row.mosaicId_Mainnet);
210172
expect(
211173
MosaicId.createFromNonce(MosaicNonce.createFromNumber(row.mosaicNonce), addressTest).toHex(),
212-
'PublicTest',
213-
).to.deep.equal(row.mosaicId_PublicTest);
214-
expect(
215-
MosaicId.createFromNonce(MosaicNonce.createFromNumber(row.mosaicNonce), addressPrivate).toHex(),
216-
'Private',
217-
).to.deep.equal(row.mosaicId_Private);
218-
expect(
219-
MosaicId.createFromNonce(MosaicNonce.createFromNumber(row.mosaicNonce), addressPrivateTest).toHex(),
220-
'PrivateTest',
221-
).to.deep.equal(row.mosaicId_PrivateTest);
174+
'Testnet',
175+
).to.deep.equal(row.mosaicId_Testnet);
222176
});
223177
});
224178
});

0 commit comments

Comments
 (0)