Skip to content

Commit a98d3c0

Browse files
rg911rg911
committed
Fixed errors in createFromDto e2e tests
1 parent 43fc724 commit a98d3c0

File tree

2 files changed

+48
-43
lines changed

2 files changed

+48
-43
lines changed

‎e2e/infrastructure/transaction/CreateTransactionFromDTO.spec.ts‎

Lines changed: 42 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ describe('CreateTransactionFromDTO', () => {
3636
// tslint:disable-next-line:max-line-length
3737
signature: '7442156D839A3AC900BC0299E8701ECDABA674DCF91283223450953B005DE72C538EA54236F5E089530074CE78067CD3325CF53750B9118154C08B20A5CDC00D',
3838
signerPublicKey: '2FC3872A792933617D70E02AFF8FBDE152821A0DF0CA5FB04CB56FC3D21C8863',
39-
version: 36865,
39+
version: 1,
40+
network: 144,
4041
type: 16724,
4142
maxFee: '0',
4243
deadline: '1000',
@@ -72,7 +73,8 @@ describe('CreateTransactionFromDTO', () => {
7273
// tslint:disable-next-line:max-line-length
7374
signature: '7442156D839A3AC900BC0299E8701ECDABA674DCF91283223450953B005DE72C538EA54236F5E089530074CE78067CD3325CF53750B9118154C08B20A5CDC00D',
7475
signerPublicKey: '2FC3872A792933617D70E02AFF8FBDE152821A0DF0CA5FB04CB56FC3D21C8863',
75-
version: 36865,
76+
version: 1,
77+
network: 144,
7678
type: 16724,
7779
maxFee: '0',
7880
deadline: '1000',
@@ -136,12 +138,14 @@ describe('CreateTransactionFromDTO', () => {
136138
recipientAddress: '9050B9837EFAB4BBE8A4B9BB32D812F9885C00D8FC1650E142',
137139
signerPublicKey: 'B4F12E7C9F6946091E2CB8B6D3A12B50D17CCBBF646386EA27CE2946A7423DCF',
138140
type: 16724,
139-
version: 36865,
141+
version: 1,
142+
network: 144,
140143
},
141144
},
142145
],
143146
type: 16705,
144-
version: 36865,
147+
version: 1,
148+
network: 144,
145149
},
146150
};
147151

@@ -173,7 +177,8 @@ describe('CreateTransactionFromDTO', () => {
173177
'2F6EE63025FEEBCED3293B622AF8581334D0BDAB7541A9E7411E7EE4EF0BC5D0E',
174178
signerPublicKey: 'B4F12E7C9F6946091E2CB8B6D3A12B50D17CCBBF646386EA27CE2946A7423DCF',
175179
type: 16718,
176-
version: 36865,
180+
version: 1,
181+
network: 144,
177182
},
178183
};
179184

@@ -220,12 +225,14 @@ describe('CreateTransactionFromDTO', () => {
220225
registrationType: 0,
221226
signerPublicKey: 'B4F12E7C9F6946091E2CB8B6D3A12B50D17CCBBF646386EA27CE2946A7423DCF',
222227
type: 16718,
223-
version: 36865,
228+
version: 1,
229+
network: 144,
224230
},
225231
},
226232
],
227233
type: 16705,
228-
version: 36865,
234+
version: 1,
235+
network: 144,
229236
},
230237
};
231238

@@ -259,7 +266,8 @@ describe('CreateTransactionFromDTO', () => {
259266
'E02F6EE63025FEEBCED3293B622AF8581334D0BDAB7541A9E7411E7EE4EF0BC5D0E',
260267
signerPublicKey: 'B4F12E7C9F6946091E2CB8B6D3A12B50D17CCBBF646386EA27CE2946A7423DCF',
261268
type: 16718,
262-
version: 36865,
269+
version: 1,
270+
network: 144,
263271
},
264272
};
265273
const transferTransaction = CreateTransactionFromDTO(registerNamespaceTransactionDTO);
@@ -305,12 +313,14 @@ describe('CreateTransactionFromDTO', () => {
305313
parentId: '85BBEA6CC462B244',
306314
signerPublicKey: 'B4F12E7C9F6946091E2CB8B6D3A12B50D17CCBBF646386EA27CE2946A7423DCF',
307315
type: 16718,
308-
version: 36865,
316+
version: 1,
317+
network: 144,
309318
},
310319
},
311320
],
312321
type: 16705,
313-
version: 36865,
322+
version: 1,
323+
network: 144,
314324
},
315325
};
316326

@@ -345,7 +355,8 @@ describe('CreateTransactionFromDTO', () => {
345355
'EBCED3293B622AF8581334D0BDAB7541A9E7411E7EE4EF0BC5D0E',
346356
signerPublicKey: 'B4F12E7C9F6946091E2CB8B6D3A12B50D17CCBBF646386EA27CE2946A7423DCF',
347357
type: 16717,
348-
version: 36865,
358+
version: 1,
359+
network: 144,
349360
},
350361
};
351362

@@ -393,12 +404,14 @@ describe('CreateTransactionFromDTO', () => {
393404
duration: '1000',
394405
signerPublicKey: 'B4F12E7C9F6946091E2CB8B6D3A12B50D17CCBBF646386EA27CE2946A7423DCF',
395406
type: 16717,
396-
version: 36865,
407+
version: 1,
408+
network: 144,
397409
},
398410
},
399411
],
400412
type: 16705,
401-
version: 36865,
413+
version: 1,
414+
network: 144,
402415
},
403416
};
404417

@@ -430,7 +443,8 @@ describe('CreateTransactionFromDTO', () => {
430443
'2F6EE63025FEEBCED3293B622AF8581334D0BDAB7541A9E7411E7EE4EF0BC5D0E',
431444
signerPublicKey: 'B4F12E7C9F6946091E2CB8B6D3A12B50D17CCBBF646386EA27CE2946A7423DCF',
432445
type: 16973,
433-
version: 36865,
446+
version: 1,
447+
network: 144,
434448
},
435449
};
436450

@@ -476,12 +490,14 @@ describe('CreateTransactionFromDTO', () => {
476490
mosaicId: '85BBEA6CC462B244',
477491
signerPublicKey: 'B4F12E7C9F6946091E2CB8B6D3A12B50D17CCBBF646386EA27CE2946A7423DCF',
478492
type: 16973,
479-
version: 36865,
493+
version: 1,
494+
network: 144,
480495
},
481496
},
482497
],
483498
type: 16705,
484-
version: 36865,
499+
version: 1,
500+
network: 144,
485501
},
486502
};
487503

@@ -508,17 +524,14 @@ describe('CreateTransactionFromDTO', () => {
508524
maxFee: '0',
509525
minApprovalDelta: 1,
510526
minRemovalDelta: 1,
511-
modifications: [
512-
{
513-
cosignatoryPublicKey: '76C1622C7FB58986E500228E8FFB30C606CAAFC1CD78E770E82C73DAB7BD7C9F',
514-
modificationAction: 0,
515-
},
516-
],
527+
publicKeyAdditions: ['76C1622C7FB58986E500228E8FFB30C606CAAFC1CD78E770E82C73DAB7BD7C9F'],
528+
publicKeyDeletions: [],
517529
signature: '553E696EB4A54E43A11D180EBA57E4B89D0048C9DD2604A9E0608120018B9E0' +
518530
'2F6EE63025FEEBCED3293B622AF8581334D0BDAB7541A9E7411E7EE4EF0BC5D0E',
519531
signerPublicKey: 'B4F12E7C9F6946091E2CB8B6D3A12B50D17CCBBF646386EA27CE2946A7423DCF',
520532
type: 16725,
521-
version: 36865,
533+
version: 1,
534+
network: 144,
522535
},
523536
};
524537

@@ -562,21 +575,18 @@ describe('CreateTransactionFromDTO', () => {
562575
transaction: {
563576
minApprovalDelta: 1,
564577
minRemovalDelta: 1,
565-
modifications: [
566-
{
567-
cosignatoryPublicKey: '589B73FBC22063E9AE6FBAC67CB9C6EA865EF556E5' +
568-
'FB8B7310D45F77C1250B97',
569-
modificationAction: 0,
570-
},
571-
],
578+
publicKeyAdditions: ['589B73FBC22063E9AE6FBAC67CB9C6EA865EF556E5FB8B7310D45F77C1250B97'],
579+
publicKeyDeletions: [],
572580
signerPublicKey: 'B4F12E7C9F6946091E2CB8B6D3A12B50D17CCBBF646386EA27CE2946A7423DCF',
573581
type: 16725,
574-
version: 36865,
582+
version: 1,
583+
network: 144,
575584
},
576585
},
577586
],
578587
type: 16705,
579-
version: 36865,
588+
version: 1,
589+
network: 144,
580590
},
581591
};
582592

‎e2e/infrastructure/transaction/ValidateTransaction.ts‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ const ValidateTransaction = {
4343
expect(transaction.signer.publicKey)
4444
.to.be.equal(transactionDTO.transaction.signerPublicKey);
4545
expect(transaction.networkType)
46-
.to.be.equal(parseInt(transactionDTO.transaction.version.toString(16).substr(0, 2), 16));
46+
.to.be.equal(transactionDTO.transaction.network);
4747
expect(transaction.version)
48-
.to.be.equal(parseInt(transactionDTO.transaction.version.toString(16).substr(2, 2), 16));
48+
.to.be.equal(transactionDTO.transaction.version);
4949
expect(transaction.type)
5050
.to.be.equal(transactionDTO.transaction.type);
5151
deepEqual(transaction.maxFee,
@@ -82,9 +82,9 @@ const ValidateTransaction = {
8282
expect(aggregateTransaction.signer.publicKey)
8383
.to.be.equal(aggregateTransactionDTO.transaction.signerPublicKey);
8484
expect(aggregateTransaction.networkType)
85-
.to.be.equal(parseInt(aggregateTransactionDTO.transaction.version.toString(16).substr(0, 2), 16));
85+
.to.be.equal(aggregateTransactionDTO.transaction.network);
8686
expect(aggregateTransaction.version)
87-
.to.be.equal(parseInt(aggregateTransactionDTO.transaction.version.toString(16).substr(2, 2), 16));
87+
.to.be.equal(aggregateTransactionDTO.transaction.version);
8888
expect(aggregateTransaction.type)
8989
.to.be.equal(aggregateTransactionDTO.transaction.type);
9090
deepEqual(aggregateTransaction.maxFee,
@@ -122,13 +122,8 @@ const ValidateTransaction = {
122122
.to.be.equal(modifyMultisigAccountTransactionDTO.transaction.minApprovalDelta);
123123
expect(modifyMultisigAccountTransaction.minRemovalDelta)
124124
.to.be.equal(modifyMultisigAccountTransactionDTO.transaction.minRemovalDelta);
125-
126-
deepEqual(modifyMultisigAccountTransaction.modifications[0], new MultisigCosignatoryModification(
127-
modifyMultisigAccountTransactionDTO.transaction.modifications[0].modificationAction,
128-
PublicAccount.createFromPublicKey(modifyMultisigAccountTransactionDTO.transaction.modifications[0].cosignatoryPublicKey,
129-
NetworkType.MIJIN_TEST),
130-
),
131-
);
125+
expect(modifyMultisigAccountTransaction.publicKeyAdditions.length).to.be.equal(1);
126+
expect(modifyMultisigAccountTransaction.publicKeyDeletions.length).to.be.equal(0);
132127
},
133128
validateNamespaceCreationTx: (registerNamespaceTransaction, registerNamespaceTransactionDTO) => {
134129
expect(registerNamespaceTransaction.registrationType)

0 commit comments

Comments
 (0)