From 90cfe00899b61b2cec684fb9090d260f244c701b Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Mon, 12 Oct 2020 16:38:35 +0100 Subject: [PATCH] Fixed #688 - Renamed MIJIN to PRIVATE --- CHANGELOG.md | 2 +- .../PersistentHarvesting.spec.ts | 4 +- src/model/account/Address.ts | 4 +- src/model/network/NetworkType.ts | 8 +- test/conf/conf.spec.ts | 10 +- test/core/format/IdGenerator.spec.ts | 88 +++++----- test/core/format/RawAddress.spec.ts | 26 +-- test/core/utils/DtoMapping.spec.ts | 2 +- test/core/utils/TransactionMapping.spec.ts | 164 +++++++++--------- .../TransactionMappingWithSignatures.spec.ts | 90 +++++----- test/core/utils/UnresolvedMapping.spec.ts | 8 +- test/infrastructure/BlockHttp.spec.ts | 2 +- test/infrastructure/Listener.spec.ts | 12 +- test/infrastructure/MetadataHttp.spec.ts | 12 +- test/infrastructure/MosaicHttp.spec.ts | 4 +- test/infrastructure/MultisigHttp.spec.ts | 2 +- test/infrastructure/NamespaceHttp.spec.ts | 4 +- test/infrastructure/NetworkHttp.spec.ts | 4 +- test/infrastructure/ReceiptHttp.spec.ts | 6 +- test/infrastructure/RepositoryFactory.spec.ts | 14 +- .../RestrictionAccountHttp.spec.ts | 2 +- .../RestrictionMosaicHttp.spec.ts | 2 +- .../SerializeTransactionToJSON.spec.ts | 50 +++--- test/infrastructure/TransactionHttp.spec.ts | 18 +- .../receipt/CreateReceiptFromDTO.spec.ts | 5 +- test/model/account/Account.spec.ts | 18 +- test/model/account/AccountInfo.spec.ts | 2 +- test/model/account/Address.spec.ts | 28 +-- .../account/MultisigAccountGraphInfo.spec.ts | 10 +- .../model/account/MultisigAccountInfo.spec.ts | 30 +++- test/model/account/PublicAccount.spec.ts | 12 +- test/model/blockchain/NewBlock.spec.ts | 2 +- test/model/message/EncryptedMessage.spec.ts | 6 +- ...sistentHarvestingDelegationMessage.spec.ts | 10 +- test/model/mosaic/MosaicAmountView.spec.ts | 4 +- test/model/mosaic/MosaicId.spec.ts | 4 +- test/model/mosaic/MosaicInfo.spec.ts | 2 +- test/model/mosaic/MosaicView.spec.ts | 2 +- test/model/namespace/NamespaceInfo.spec.ts | 4 +- test/model/network/NetworkType.spec.ts | 12 +- test/model/receipt/Receipt.spec.ts | 5 +- test/model/receipt/Statement.spec.ts | 2 +- .../AccountKeyLinkTransaction.spec.ts | 16 +- .../AccountMetadataTransaction.spec.ts | 18 +- .../AccountRestrictionTransaction.spec.ts | 34 ++-- .../AddressAliasTransaction.spec.ts | 16 +- .../transaction/AggregateTransaction.spec.ts | 109 ++++++------ .../CosignatureTransaction.spec.ts | 10 +- .../transaction/HashLockTransaction.spec.ts | 17 +- .../transaction/LockFundsTransaction.spec.ts | 45 ++--- ...osaicAddressRestrictionTransaction.spec.ts | 12 +- .../MosaicAliasTransaction.spec.ts | 20 +-- .../MosaicDefinitionTransaction.spec.ts | 18 +- ...MosaicGlobalRestrictionTransaction.spec.ts | 12 +- .../MosaicMetadataTransaction.spec.ts | 22 +-- .../MosaicSupplyChangeTransaction.spec.ts | 16 +- ...isigAccountModificationTransaction.spec.ts | 24 +-- .../MultisigCosignatoryModification.spec.ts | 8 +- .../NamespaceMetadataTransaction.spec.ts | 20 +-- .../NamespaceRegistrationTransaction.spec.ts | 18 +- .../NodeKeyLinkTransaction.spec.ts | 16 +- ...istentDelegationRequestTransaction.spec.ts | 8 +- .../transaction/SecretLockTransaction.spec.ts | 32 ++-- .../SecretProofTransaction.spec.ts | 34 ++-- .../transaction/SignedTransaction.spec.ts | 6 +- test/model/transaction/Transaction.spec.ts | 28 +-- .../transaction/TransferTransaction.spec.ts | 60 +++---- .../VotingKeyLinkTransaction.spec.ts | 14 +- .../transaction/VrfKeyLinkTransaction.spec.ts | 14 +- test/model/wallet/SimpleWallet.spec.ts | 28 ++- .../AggregateTransactionService.spec.ts | 70 ++++---- test/service/BlockService.spec.ts | 4 +- .../MetadataTransactionservice.spec.ts | 12 +- ...osaicRestrictionTransactionservice.spec.ts | 20 +-- test/service/NamespaceService.spec.ts | 4 +- test/service/TransactionService.spec.ts | 10 +- 76 files changed, 767 insertions(+), 724 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1932dcfeb7..ed77fa5095 100644 --- 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 index fc02e9abec..543cb784b5 100644 --- 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 index a219d4ca61..7fa1806973 100644 --- 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 index df8255cf4e..2972606e3e 100644 --- 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 index fed52157ec..99d8622c6f 100644 --- 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 index 35cdd05eb1..c9575c71e9 100644 --- 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 index a7d98455af..1ebaf8695d 100644 --- 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 index 1000742b67..57589d364a 100644 --- 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'); diff --git a/test/core/utils/TransactionMapping.spec.ts b/test/core/utils/TransactionMapping.spec.ts index 8a61b47541..164cb92046 100644 --- a/test/core/utils/TransactionMapping.spec.ts +++ b/test/core/utils/TransactionMapping.spec.ts @@ -86,7 +86,7 @@ describe('TransactionMapping - createFromPayload', () => { AddressRestrictionFlag.AllowIncomingAddress, [address], [], - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const signedTransaction = addressRestrictionTransaction.signWith(account, generationHash); @@ -105,7 +105,7 @@ describe('TransactionMapping - createFromPayload', () => { MosaicRestrictionFlag.AllowMosaic, [mosaicId], [], - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const signedTransaction = mosaicRestrictionTransaction.signWith(account, generationHash); @@ -123,7 +123,7 @@ describe('TransactionMapping - createFromPayload', () => { OperationRestrictionFlag.AllowOutgoingTransactionType, [operation], [], - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const signedTransaction = operationRestrictionTransaction.signWith(account, generationHash); @@ -142,7 +142,7 @@ describe('TransactionMapping - createFromPayload', () => { AliasAction.Link, namespaceId, address, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const signedTransaction = addressAliasTransaction.signWith(account, generationHash); @@ -163,7 +163,7 @@ describe('TransactionMapping - createFromPayload', () => { AliasAction.Link, namespaceId, mosaicId, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const signedTransaction = mosaicAliasTransaction.signWith(account, generationHash); @@ -184,7 +184,7 @@ describe('TransactionMapping - createFromPayload', () => { MosaicFlags.create(false, false, false), 3, UInt64.fromUint(1000), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const signedTransaction = mosaicDefinitionTransaction.signWith(account, generationHash); @@ -207,7 +207,7 @@ describe('TransactionMapping - createFromPayload', () => { MosaicFlags.create(false, false, false), 3, UInt64.fromUint(0), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const signedTransaction = mosaicDefinitionTransaction.signWith(account, generationHash); @@ -228,7 +228,7 @@ describe('TransactionMapping - createFromPayload', () => { MosaicFlags.create(false, false, false), 3, UInt64.fromUint(0), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const signedTransaction = mosaicDefinitionTransaction.signWith(account, generationHash); @@ -249,7 +249,7 @@ describe('TransactionMapping - createFromPayload', () => { MosaicFlags.create(false, false, false), 3, UInt64.fromUint(0), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const signedTransaction = mosaicDefinitionTransaction.signWith(account, generationHash); @@ -270,7 +270,7 @@ describe('TransactionMapping - createFromPayload', () => { MosaicFlags.create(false, false, false), 3, UInt64.fromUint(0), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const signedTransaction = mosaicDefinitionTransaction.signWith(account, generationHash); @@ -290,7 +290,7 @@ describe('TransactionMapping - createFromPayload', () => { mosaicId, MosaicSupplyChangeAction.Increase, UInt64.fromUint(10), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const signedTransaction = mosaicSupplyChangeTransaction.signWith(account, generationHash); @@ -310,7 +310,7 @@ describe('TransactionMapping - createFromPayload', () => { Address.createFromRawAddress('SATNE7Q5BITMUTRRN6IB4I7FLSDRDWZA34I2PMQ'), [NetworkCurrencyLocal.createRelative(100)], PlainMessage.create('test-message'), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const signedTransaction = transferTransaction.signWith(account, generationHash); @@ -332,7 +332,7 @@ describe('TransactionMapping - createFromPayload', () => { LockHashAlgorithm.Op_Sha3_256, sha3_256.create().update(Convert.hexToUint8(proof)).hex(), recipientAddress, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const signedTransaction = secretLockTransaction.signWith(account, generationHash); @@ -354,7 +354,7 @@ describe('TransactionMapping - createFromPayload', () => { sha3_256.create().update(Convert.hexToUint8(proof)).hex(), account.address, proof, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const signedTransaction = secretProofTransaction.signWith(account, generationHash); @@ -371,9 +371,9 @@ describe('TransactionMapping - createFromPayload', () => { Deadline.create(epochAdjustment), 2, 1, - [Address.createFromPublicKey('B0F93CBEE49EEB9953C6F3985B15A4F238E205584D8F924C621CBE4D7AC6EC24', NetworkType.MIJIN_TEST)], + [Address.createFromPublicKey('B0F93CBEE49EEB9953C6F3985B15A4F238E205584D8F924C621CBE4D7AC6EC24', NetworkType.PRIVATE_TEST)], [], - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const signedTransaction = modifyMultisigAccountTransaction.signWith(account, generationHash); @@ -384,7 +384,7 @@ describe('TransactionMapping - createFromPayload', () => { expect(transaction.minRemovalDelta).to.be.equal(1); expect( transaction.addressAdditions[0].equals( - Address.createFromPublicKey('B0F93CBEE49EEB9953C6F3985B15A4F238E205584D8F924C621CBE4D7AC6EC24', NetworkType.MIJIN_TEST), + Address.createFromPublicKey('B0F93CBEE49EEB9953C6F3985B15A4F238E205584D8F924C621CBE4D7AC6EC24', NetworkType.PRIVATE_TEST), ), ).to.be.true; expect(transaction.addressDeletions.length).to.be.equal(0); @@ -396,26 +396,26 @@ describe('TransactionMapping - createFromPayload', () => { Address.createFromRawAddress('SATNE7Q5BITMUTRRN6IB4I7FLSDRDWZA34I2PMQ'), [], PlainMessage.create('test-message'), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const accountLinkTransaction = AccountKeyLinkTransaction.create( Deadline.create(epochAdjustment), account.publicKey, LinkAction.Link, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const vrfKeyLinkTransaction = VrfKeyLinkTransaction.create( Deadline.create(epochAdjustment), account.publicKey, LinkAction.Link, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const nodeKeyLinkTransaction = NodeKeyLinkTransaction.create( Deadline.create(epochAdjustment), account.publicKey, LinkAction.Link, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const votingKeyLinkTransaction = VotingKeyLinkTransaction.create( Deadline.create(epochAdjustment), @@ -423,13 +423,13 @@ describe('TransactionMapping - createFromPayload', () => { 1, 3, LinkAction.Link, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const registerNamespaceTransaction = NamespaceRegistrationTransaction.createRootNamespace( Deadline.create(epochAdjustment), 'root-test-namespace', UInt64.fromUint(1000), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const mosaicGlobalRestrictionTransaction = MosaicGlobalRestrictionTransaction.create( Deadline.create(epochAdjustment), @@ -439,7 +439,7 @@ describe('TransactionMapping - createFromPayload', () => { MosaicRestrictionType.NONE, UInt64.fromUint(0), MosaicRestrictionType.GE, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const mosaicAddressRestrictionTransaction = MosaicAddressRestrictionTransaction.create( Deadline.create(epochAdjustment), @@ -447,7 +447,7 @@ describe('TransactionMapping - createFromPayload', () => { UInt64.fromUint(4444), account.address, UInt64.fromUint(0), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, UInt64.fromUint(0), ); const accountMetadataTransaction = AccountMetadataTransaction.create( @@ -456,7 +456,7 @@ describe('TransactionMapping - createFromPayload', () => { UInt64.fromUint(1000), 1, Convert.uint8ToUtf8(new Uint8Array(10)), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const mosaicMetadataTransaction = MosaicMetadataTransaction.create( Deadline.create(epochAdjustment), @@ -465,7 +465,7 @@ describe('TransactionMapping - createFromPayload', () => { new MosaicId([2262289484, 3405110546]), 1, Convert.uint8ToUtf8(new Uint8Array(10)), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const namespaceMetadataTransaction = NamespaceMetadataTransaction.create( Deadline.create(epochAdjustment), @@ -474,7 +474,7 @@ describe('TransactionMapping - createFromPayload', () => { new NamespaceId([2262289484, 3405110546]), 1, Convert.uint8ToUtf8(new Uint8Array(10)), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const mosaicAliasTransaction = MosaicAliasTransaction.create( @@ -482,7 +482,7 @@ describe('TransactionMapping - createFromPayload', () => { AliasAction.Link, new NamespaceId([2262289484, 3405110546]), new MosaicId([2262289484, 3405110546]), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const secretProofTransaction = SecretProofTransaction.create( @@ -491,7 +491,7 @@ describe('TransactionMapping - createFromPayload', () => { sha3_256.create().update(Convert.hexToUint8('B778A39A3663719DFC5E48C9D78431B1E45C2AF9DF538782BF199C189DABEAC7')).hex(), account.address, 'B778A39A3663719DFC5E48C9D78431B1E45C2AF9DF538782BF199C189DABEAC7', - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const aggregateTransaction = AggregateTransaction.createComplete( @@ -511,7 +511,7 @@ describe('TransactionMapping - createFromPayload', () => { mosaicAliasTransaction.toAggregate(account.publicAccount), secretProofTransaction.toAggregate(account.publicAccount), ], - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, [], ); @@ -530,13 +530,13 @@ describe('TransactionMapping - createFromPayload', () => { Address.createFromRawAddress('SATNE7Q5BITMUTRRN6IB4I7FLSDRDWZA34I2PMQ'), [], PlainMessage.create('test-message'), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const aggregateTransaction = AggregateTransaction.createBonded( Deadline.create(epochAdjustment), [transferTransaction.toAggregate(account.publicAccount)], - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, [], ); @@ -549,14 +549,14 @@ describe('TransactionMapping - createFromPayload', () => { }); it('should create LockFundTransaction', () => { - const aggregateTransaction = AggregateTransaction.createBonded(Deadline.create(epochAdjustment), [], NetworkType.MIJIN_TEST, []); + const aggregateTransaction = AggregateTransaction.createBonded(Deadline.create(epochAdjustment), [], NetworkType.PRIVATE_TEST, []); const signedTransaction = account.sign(aggregateTransaction, generationHash); const lockTransaction = LockFundsTransaction.create( Deadline.create(epochAdjustment), NetworkCurrencyLocal.createRelative(10), UInt64.fromUint(10), signedTransaction, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const signedLockFundTransaction = lockTransaction.signWith(account, generationHash); @@ -573,7 +573,7 @@ describe('TransactionMapping - createFromPayload', () => { Deadline.create(epochAdjustment), account.publicKey, LinkAction.Link, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const signedTransaction = accountLinkTransaction.signWith(account, generationHash); @@ -588,7 +588,7 @@ describe('TransactionMapping - createFromPayload', () => { Deadline.create(epochAdjustment), account.publicKey, LinkAction.Link, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const signedTransaction = vrfKeyLinkTransaction.signWith(account, generationHash); @@ -603,7 +603,7 @@ describe('TransactionMapping - createFromPayload', () => { Deadline.create(epochAdjustment), account.publicKey, LinkAction.Link, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const signedTransaction = nodeKeyLinkTransaction.signWith(account, generationHash); @@ -621,7 +621,7 @@ describe('TransactionMapping - createFromPayload', () => { 1, 3, LinkAction.Link, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const signedTransaction = votingKeyLinkTransaction.signWith(account, generationHash); @@ -638,7 +638,7 @@ describe('TransactionMapping - createFromPayload', () => { Deadline.create(epochAdjustment), 'root-test-namespace', UInt64.fromUint(1000), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const signedTransaction = registerNamespaceTransaction.signWith(account, generationHash); @@ -654,7 +654,7 @@ describe('TransactionMapping - createFromPayload', () => { Deadline.create(epochAdjustment), 'root-test-namespace', 'parent-test-namespace', - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const signedTransaction = registerNamespaceTransaction.signWith(account, generationHash); @@ -674,7 +674,7 @@ describe('TransactionMapping - createFromPayload', () => { MosaicRestrictionType.NONE, UInt64.fromUint(0), MosaicRestrictionType.GE, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const signedTx = mosaicGlobalRestrictionTransaction.signWith(account, generationHash); @@ -698,7 +698,7 @@ describe('TransactionMapping - createFromPayload', () => { UInt64.fromUint(4444), account.address, UInt64.fromUint(0), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, UInt64.fromUint(0), ); @@ -721,7 +721,7 @@ describe('TransactionMapping - createFromPayload', () => { UInt64.fromUint(4444), account.address, UInt64.fromUint(0), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, UInt64.fromUint(0), ); @@ -745,7 +745,7 @@ describe('TransactionMapping - createFromPayload', () => { UInt64.fromUint(1000), 1, Convert.uint8ToUtf8(new Uint8Array(10)), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const signedTx = accountMetadataTransaction.signWith(account, generationHash); @@ -766,7 +766,7 @@ describe('TransactionMapping - createFromPayload', () => { new MosaicId([2262289484, 3405110546]), 1, Convert.uint8ToUtf8(new Uint8Array(10)), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const signedTx = mosaicMetadataTransaction.signWith(account, generationHash); @@ -789,7 +789,7 @@ describe('TransactionMapping - createFromPayload', () => { new NamespaceId([2262289484, 3405110546]), 1, Convert.uint8ToUtf8(new Uint8Array(10)), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const signedTx = namespaceMetadataTransaction.signWith(account, generationHash); @@ -810,7 +810,7 @@ describe('TransactionMapping - createFromPayload', () => { Address.createFromRawAddress('SATNE7Q5BITMUTRRN6IB4I7FLSDRDWZA34I2PMQ'), [NetworkCurrencyLocal.createRelative(100)], PlainMessage.create('test-message'), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const signedTransaction = transferTransaction.signWith(account, generationHash); @@ -836,7 +836,7 @@ describe('TransactionMapping - createFromDTO (Transaction.toJSON() feed)', () => Address.createFromRawAddress('SATNE7Q5BITMUTRRN6IB4I7FLSDRDWZA34I2PMQ'), [NetworkCurrencyLocal.createRelative(100)], PlainMessage.create('test-message'), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const transaction = TransactionMapping.createFromDTO(transferTransaction.toJSON()) as TransferTransaction; @@ -851,7 +851,7 @@ describe('TransactionMapping - createFromDTO (Transaction.toJSON() feed)', () => new NamespaceId([33347626, 3779697293]), [NetworkCurrencyLocal.createRelative(100)], PlainMessage.create('test-message'), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const transaction = TransactionMapping.createFromDTO(transferTransaction.toJSON()) as TransferTransaction; @@ -867,7 +867,7 @@ describe('TransactionMapping - createFromDTO (Transaction.toJSON() feed)', () => Address.createFromRawAddress('SATNE7Q5BITMUTRRN6IB4I7FLSDRDWZA34I2PMQ'), [NetworkCurrencyLocal.createRelative(100)], new EncryptedMessage('12324556'), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const transaction = TransactionMapping.createFromDTO(transferTransaction.toJSON()) as TransferTransaction; @@ -881,7 +881,7 @@ describe('TransactionMapping - createFromDTO (Transaction.toJSON() feed)', () => Deadline.create(epochAdjustment), account.publicKey, LinkAction.Link, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const transaction = TransactionMapping.createFromDTO(accountLinkTransaction.toJSON()) as AccountKeyLinkTransaction; @@ -895,7 +895,7 @@ describe('TransactionMapping - createFromDTO (Transaction.toJSON() feed)', () => Deadline.create(epochAdjustment), account.publicKey, LinkAction.Link, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const transaction = TransactionMapping.createFromDTO(vrfKeyLinkTransaction.toJSON()) as VrfKeyLinkTransaction; @@ -909,7 +909,7 @@ describe('TransactionMapping - createFromDTO (Transaction.toJSON() feed)', () => Deadline.create(epochAdjustment), account.publicKey, LinkAction.Link, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const transaction = TransactionMapping.createFromDTO(nodeKeyLinkTransaction.toJSON()) as NodeKeyLinkTransaction; @@ -926,7 +926,7 @@ describe('TransactionMapping - createFromDTO (Transaction.toJSON() feed)', () => 1, 3, LinkAction.Link, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const transaction = TransactionMapping.createFromDTO(votingKeyLinkTransaction.toJSON()) as VotingKeyLinkTransaction; @@ -943,7 +943,7 @@ describe('TransactionMapping - createFromDTO (Transaction.toJSON() feed)', () => AddressRestrictionFlag.AllowIncomingAddress, [address], [], - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const transaction = TransactionMapping.createFromDTO( @@ -962,7 +962,7 @@ describe('TransactionMapping - createFromDTO (Transaction.toJSON() feed)', () => MosaicRestrictionFlag.AllowMosaic, [mosaicId], [], - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const transaction = TransactionMapping.createFromDTO(mosaicRestrictionTransaction.toJSON()) as AccountMosaicRestrictionTransaction; @@ -979,7 +979,7 @@ describe('TransactionMapping - createFromDTO (Transaction.toJSON() feed)', () => OperationRestrictionFlag.AllowOutgoingTransactionType, [operation], [], - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const transaction = TransactionMapping.createFromDTO( @@ -999,7 +999,7 @@ describe('TransactionMapping - createFromDTO (Transaction.toJSON() feed)', () => AliasAction.Link, namespaceId, address, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const transaction = TransactionMapping.createFromDTO(addressAliasTransaction.toJSON()) as AddressAliasTransaction; @@ -1016,7 +1016,7 @@ describe('TransactionMapping - createFromDTO (Transaction.toJSON() feed)', () => AliasAction.Link, namespaceId, mosaicId, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const transaction = TransactionMapping.createFromDTO(mosaicAliasTransaction.toJSON()) as MosaicAliasTransaction; @@ -1032,7 +1032,7 @@ describe('TransactionMapping - createFromDTO (Transaction.toJSON() feed)', () => MosaicFlags.create(false, false, false), 3, UInt64.fromUint(1000), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const transaction = TransactionMapping.createFromDTO(mosaicDefinitionTransaction.toJSON()) as MosaicDefinitionTransaction; @@ -1051,7 +1051,7 @@ describe('TransactionMapping - createFromDTO (Transaction.toJSON() feed)', () => mosaicId, MosaicSupplyChangeAction.Increase, UInt64.fromUint(10), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const transaction = TransactionMapping.createFromDTO(mosaicSupplyChangeTransaction.toJSON()) as MosaicSupplyChangeTransaction; @@ -1070,7 +1070,7 @@ describe('TransactionMapping - createFromDTO (Transaction.toJSON() feed)', () => LockHashAlgorithm.Op_Sha3_256, sha3_256.create().update(Convert.hexToUint8(proof)).hex(), recipientAddress, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const transaction = TransactionMapping.createFromDTO(secretLockTransaction.toJSON()) as SecretLockTransaction; @@ -1089,7 +1089,7 @@ describe('TransactionMapping - createFromDTO (Transaction.toJSON() feed)', () => LockHashAlgorithm.Op_Sha3_256, sha3_256.create().update(Convert.hexToUint8(proof)).hex(), recipientAddress, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const transaction = TransactionMapping.createFromDTO(secretLockTransaction.toJSON()) as SecretLockTransaction; @@ -1109,7 +1109,7 @@ describe('TransactionMapping - createFromDTO (Transaction.toJSON() feed)', () => LockHashAlgorithm.Op_Sha3_256, sha3_256.create().update(Convert.hexToUint8(proof)).hex(), recipientAddress, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const transaction = TransactionMapping.createFromDTO(secretLockTransaction.toJSON()) as SecretLockTransaction; @@ -1127,7 +1127,7 @@ describe('TransactionMapping - createFromDTO (Transaction.toJSON() feed)', () => sha3_256.create().update(Convert.hexToUint8(proof)).hex(), account.address, proof, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const transaction = TransactionMapping.createFromDTO(secretProofTransaction.toJSON()) as SecretProofTransaction; @@ -1148,7 +1148,7 @@ describe('TransactionMapping - createFromDTO (Transaction.toJSON() feed)', () => sha3_256.create().update(Convert.hexToUint8(proof)).hex(), recipientAddress, proof, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const transaction = TransactionMapping.createFromDTO(secretProofTransaction.toJSON()) as SecretProofTransaction; @@ -1165,9 +1165,9 @@ describe('TransactionMapping - createFromDTO (Transaction.toJSON() feed)', () => Deadline.create(epochAdjustment), 2, 1, - [Address.createFromPublicKey('B0F93CBEE49EEB9953C6F3985B15A4F238E205584D8F924C621CBE4D7AC6EC24', NetworkType.MIJIN_TEST)], + [Address.createFromPublicKey('B0F93CBEE49EEB9953C6F3985B15A4F238E205584D8F924C621CBE4D7AC6EC24', NetworkType.PRIVATE_TEST)], [], - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const transaction = TransactionMapping.createFromDTO( @@ -1185,13 +1185,13 @@ describe('TransactionMapping - createFromDTO (Transaction.toJSON() feed)', () => Address.createFromRawAddress('SATNE7Q5BITMUTRRN6IB4I7FLSDRDWZA34I2PMQ'), [], PlainMessage.create('test-message'), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const aggregateTransaction = AggregateTransaction.createComplete( Deadline.create(epochAdjustment), [transferTransaction.toAggregate(account.publicAccount)], - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, [], ); @@ -1207,13 +1207,13 @@ describe('TransactionMapping - createFromDTO (Transaction.toJSON() feed)', () => Address.createFromRawAddress('SATNE7Q5BITMUTRRN6IB4I7FLSDRDWZA34I2PMQ'), [], PlainMessage.create('test-message'), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const aggregateTransaction = AggregateTransaction.createBonded( Deadline.create(epochAdjustment), [transferTransaction.toAggregate(account.publicAccount)], - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, [], ); @@ -1224,14 +1224,14 @@ describe('TransactionMapping - createFromDTO (Transaction.toJSON() feed)', () => }); it('should create LockFundTransaction', () => { - const aggregateTransaction = AggregateTransaction.createBonded(Deadline.create(epochAdjustment), [], NetworkType.MIJIN_TEST, []); + const aggregateTransaction = AggregateTransaction.createBonded(Deadline.create(epochAdjustment), [], NetworkType.PRIVATE_TEST, []); const signedTransaction = account.sign(aggregateTransaction, generationHash); const lockTransaction = LockFundsTransaction.create( Deadline.create(epochAdjustment), NetworkCurrencyLocal.createRelative(10), UInt64.fromUint(10), signedTransaction, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const transaction = TransactionMapping.createFromDTO(lockTransaction.toJSON()) as LockFundsTransaction; @@ -1245,7 +1245,7 @@ describe('TransactionMapping - createFromDTO (Transaction.toJSON() feed)', () => Deadline.create(epochAdjustment), 'root-test-namespace', UInt64.fromUint(1000), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const transaction = TransactionMapping.createFromDTO(registerNamespaceTransaction.toJSON()) as NamespaceRegistrationTransaction; @@ -1258,7 +1258,7 @@ describe('TransactionMapping - createFromDTO (Transaction.toJSON() feed)', () => Deadline.create(epochAdjustment), 'root-test-namespace', 'parent-test-namespace', - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const transaction = TransactionMapping.createFromDTO(registerNamespaceTransaction.toJSON()) as NamespaceRegistrationTransaction; @@ -1274,7 +1274,7 @@ describe('TransactionMapping - createFromDTO (Transaction.toJSON() feed)', () => MosaicRestrictionType.NONE, UInt64.fromUint(0), MosaicRestrictionType.GE, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const transaction = TransactionMapping.createFromDTO( @@ -1298,7 +1298,7 @@ describe('TransactionMapping - createFromDTO (Transaction.toJSON() feed)', () => UInt64.fromUint(4444), account.address, UInt64.fromUint(0), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, UInt64.fromUint(0), ); @@ -1321,7 +1321,7 @@ describe('TransactionMapping - createFromDTO (Transaction.toJSON() feed)', () => UInt64.fromUint(1000), 1, 'Test Value', - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const transaction = TransactionMapping.createFromDTO(accountMetadataTransaction.toJSON()) as AccountMetadataTransaction; @@ -1341,7 +1341,7 @@ describe('TransactionMapping - createFromDTO (Transaction.toJSON() feed)', () => new MosaicId([2262289484, 3405110546]), 1, 'Test Value', - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const transaction = TransactionMapping.createFromDTO(mosaicMetadataTransaction.toJSON()) as MosaicMetadataTransaction; @@ -1362,7 +1362,7 @@ describe('TransactionMapping - createFromDTO (Transaction.toJSON() feed)', () => new NamespaceId([2262289484, 3405110546]), 1, 'Test Value', - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const transaction = TransactionMapping.createFromDTO(namespaceMetadataTransaction.toJSON()) as NamespaceMetadataTransaction; diff --git a/test/core/utils/TransactionMappingWithSignatures.spec.ts b/test/core/utils/TransactionMappingWithSignatures.spec.ts index 1bd8cd4ee7..9290be096c 100644 --- a/test/core/utils/TransactionMappingWithSignatures.spec.ts +++ b/test/core/utils/TransactionMappingWithSignatures.spec.ts @@ -86,7 +86,7 @@ describe('TransactionMapping - createFromPayload with optional sigature and sign AddressRestrictionFlag.AllowIncomingAddress, [address], [], - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, undefined, testSignature, account.publicAccount, @@ -116,7 +116,7 @@ describe('TransactionMapping - createFromPayload with optional sigature and sign MosaicRestrictionFlag.AllowMosaic, [mosaicId], [], - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, undefined, testSignature, account.publicAccount, @@ -146,7 +146,7 @@ describe('TransactionMapping - createFromPayload with optional sigature and sign OperationRestrictionFlag.AllowOutgoingTransactionType, [operation], [], - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, undefined, testSignature, account.publicAccount, @@ -178,7 +178,7 @@ describe('TransactionMapping - createFromPayload with optional sigature and sign AliasAction.Link, namespaceId, address, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, undefined, testSignature, account.publicAccount, @@ -211,7 +211,7 @@ describe('TransactionMapping - createFromPayload with optional sigature and sign AliasAction.Link, namespaceId, mosaicId, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, undefined, testSignature, account.publicAccount, @@ -244,7 +244,7 @@ describe('TransactionMapping - createFromPayload with optional sigature and sign MosaicFlags.create(false, false, false), 3, UInt64.fromUint(1000), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, undefined, testSignature, account.publicAccount, @@ -279,7 +279,7 @@ describe('TransactionMapping - createFromPayload with optional sigature and sign MosaicFlags.create(false, false, false), 3, UInt64.fromUint(0), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, undefined, testSignature, account.publicAccount, @@ -311,7 +311,7 @@ describe('TransactionMapping - createFromPayload with optional sigature and sign mosaicId, MosaicSupplyChangeAction.Increase, UInt64.fromUint(10), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, undefined, testSignature, account.publicAccount, @@ -343,7 +343,7 @@ describe('TransactionMapping - createFromPayload with optional sigature and sign Address.createFromRawAddress('SATNE7Q5BITMUTRRN6IB4I7FLSDRDWZA34I2PMQ'), [NetworkCurrencyLocal.createRelative(100)], PlainMessage.create('test-message'), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, undefined, testSignature, account.publicAccount, @@ -377,7 +377,7 @@ describe('TransactionMapping - createFromPayload with optional sigature and sign LockHashAlgorithm.Op_Sha3_256, sha3_256.create().update(Convert.hexToUint8(proof)).hex(), recipientAddress, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, undefined, testSignature, account.publicAccount, @@ -411,7 +411,7 @@ describe('TransactionMapping - createFromPayload with optional sigature and sign sha3_256.create().update(Convert.hexToUint8(proof)).hex(), account.address, proof, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, undefined, testSignature, account.publicAccount, @@ -440,9 +440,9 @@ describe('TransactionMapping - createFromPayload with optional sigature and sign Deadline.create(epochAdjustment), 2, 1, - [Address.createFromPublicKey('B0F93CBEE49EEB9953C6F3985B15A4F238E205584D8F924C621CBE4D7AC6EC24', NetworkType.MIJIN_TEST)], + [Address.createFromPublicKey('B0F93CBEE49EEB9953C6F3985B15A4F238E205584D8F924C621CBE4D7AC6EC24', NetworkType.PRIVATE_TEST)], [], - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, undefined, testSignature, account.publicAccount, @@ -456,7 +456,7 @@ describe('TransactionMapping - createFromPayload with optional sigature and sign expect(transaction.minRemovalDelta).to.be.equal(1); expect( transaction.addressAdditions[0].equals( - Address.createFromPublicKey('B0F93CBEE49EEB9953C6F3985B15A4F238E205584D8F924C621CBE4D7AC6EC24', NetworkType.MIJIN_TEST), + Address.createFromPublicKey('B0F93CBEE49EEB9953C6F3985B15A4F238E205584D8F924C621CBE4D7AC6EC24', NetworkType.PRIVATE_TEST), ), ).to.be.true; expect(transaction.addressDeletions.length).to.be.equal(0); @@ -477,26 +477,26 @@ describe('TransactionMapping - createFromPayload with optional sigature and sign Address.createFromRawAddress('SATNE7Q5BITMUTRRN6IB4I7FLSDRDWZA34I2PMQ'), [], PlainMessage.create('test-message'), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const accountLinkTransaction = AccountKeyLinkTransaction.create( Deadline.create(epochAdjustment), account.publicKey, LinkAction.Link, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const vrfKeyLinkTransaction = VrfKeyLinkTransaction.create( Deadline.create(epochAdjustment), account.publicKey, LinkAction.Link, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const nodeKeyLinkTransaction = NodeKeyLinkTransaction.create( Deadline.create(epochAdjustment), account.publicKey, LinkAction.Link, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const votingKeyLinkTransaction = VotingKeyLinkTransaction.create( Deadline.create(epochAdjustment), @@ -504,13 +504,13 @@ describe('TransactionMapping - createFromPayload with optional sigature and sign 1, 3, LinkAction.Link, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const registerNamespaceTransaction = NamespaceRegistrationTransaction.createRootNamespace( Deadline.create(epochAdjustment), 'root-test-namespace', UInt64.fromUint(1000), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const mosaicGlobalRestrictionTransaction = MosaicGlobalRestrictionTransaction.create( Deadline.create(epochAdjustment), @@ -520,7 +520,7 @@ describe('TransactionMapping - createFromPayload with optional sigature and sign MosaicRestrictionType.NONE, UInt64.fromUint(0), MosaicRestrictionType.GE, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const mosaicAddressRestrictionTransaction = MosaicAddressRestrictionTransaction.create( Deadline.create(epochAdjustment), @@ -528,7 +528,7 @@ describe('TransactionMapping - createFromPayload with optional sigature and sign UInt64.fromUint(4444), account.address, UInt64.fromUint(0), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, UInt64.fromUint(0), ); const accountMetadataTransaction = AccountMetadataTransaction.create( @@ -537,7 +537,7 @@ describe('TransactionMapping - createFromPayload with optional sigature and sign UInt64.fromUint(1000), 1, Convert.uint8ToUtf8(new Uint8Array(10)), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const mosaicMetadataTransaction = MosaicMetadataTransaction.create( Deadline.create(epochAdjustment), @@ -546,7 +546,7 @@ describe('TransactionMapping - createFromPayload with optional sigature and sign new MosaicId([2262289484, 3405110546]), 1, Convert.uint8ToUtf8(new Uint8Array(10)), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const namespaceMetadataTransaction = NamespaceMetadataTransaction.create( Deadline.create(epochAdjustment), @@ -555,7 +555,7 @@ describe('TransactionMapping - createFromPayload with optional sigature and sign new NamespaceId([2262289484, 3405110546]), 1, Convert.uint8ToUtf8(new Uint8Array(10)), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const mosaicAliasTransaction = MosaicAliasTransaction.create( @@ -563,7 +563,7 @@ describe('TransactionMapping - createFromPayload with optional sigature and sign AliasAction.Link, new NamespaceId([2262289484, 3405110546]), new MosaicId([2262289484, 3405110546]), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const secretProofTransaction = SecretProofTransaction.create( @@ -572,7 +572,7 @@ describe('TransactionMapping - createFromPayload with optional sigature and sign sha3_256.create().update(Convert.hexToUint8('B778A39A3663719DFC5E48C9D78431B1E45C2AF9DF538782BF199C189DABEAC7')).hex(), account.address, 'B778A39A3663719DFC5E48C9D78431B1E45C2AF9DF538782BF199C189DABEAC7', - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const aggregateTransaction = AggregateTransaction.createComplete( @@ -592,7 +592,7 @@ describe('TransactionMapping - createFromPayload with optional sigature and sign mosaicAliasTransaction.toAggregate(account.publicAccount), secretProofTransaction.toAggregate(account.publicAccount), ], - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, [], undefined, testSignature, @@ -623,13 +623,13 @@ describe('TransactionMapping - createFromPayload with optional sigature and sign Address.createFromRawAddress('SATNE7Q5BITMUTRRN6IB4I7FLSDRDWZA34I2PMQ'), [], PlainMessage.create('test-message'), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const aggregateTransaction = AggregateTransaction.createBonded( Deadline.create(epochAdjustment), [transferTransaction.toAggregate(account.publicAccount)], - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, [], undefined, testSignature, @@ -654,14 +654,14 @@ describe('TransactionMapping - createFromPayload with optional sigature and sign }); it('should create LockFundTransaction', () => { - const aggregateTransaction = AggregateTransaction.createBonded(Deadline.create(epochAdjustment), [], NetworkType.MIJIN_TEST, []); + const aggregateTransaction = AggregateTransaction.createBonded(Deadline.create(epochAdjustment), [], NetworkType.PRIVATE_TEST, []); const signedTransaction = account.sign(aggregateTransaction, generationHash); const lockTransaction = LockFundsTransaction.create( Deadline.create(epochAdjustment), NetworkCurrencyLocal.createRelative(10), UInt64.fromUint(10), signedTransaction, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, undefined, testSignature, account.publicAccount, @@ -690,7 +690,7 @@ describe('TransactionMapping - createFromPayload with optional sigature and sign Deadline.create(epochAdjustment), account.publicKey, LinkAction.Link, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, undefined, testSignature, account.publicAccount, @@ -717,7 +717,7 @@ describe('TransactionMapping - createFromPayload with optional sigature and sign Deadline.create(epochAdjustment), account.publicKey, LinkAction.Link, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, undefined, testSignature, account.publicAccount, @@ -744,7 +744,7 @@ describe('TransactionMapping - createFromPayload with optional sigature and sign Deadline.create(epochAdjustment), account.publicKey, LinkAction.Link, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, undefined, testSignature, account.publicAccount, @@ -774,7 +774,7 @@ describe('TransactionMapping - createFromPayload with optional sigature and sign 1, 3, LinkAction.Link, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, undefined, testSignature, account.publicAccount, @@ -803,7 +803,7 @@ describe('TransactionMapping - createFromPayload with optional sigature and sign Deadline.create(epochAdjustment), 'root-test-namespace', UInt64.fromUint(1000), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, undefined, testSignature, account.publicAccount, @@ -831,7 +831,7 @@ describe('TransactionMapping - createFromPayload with optional sigature and sign Deadline.create(epochAdjustment), 'root-test-namespace', 'parent-test-namespace', - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, undefined, testSignature, account.publicAccount, @@ -863,7 +863,7 @@ describe('TransactionMapping - createFromPayload with optional sigature and sign MosaicRestrictionType.NONE, UInt64.fromUint(0), MosaicRestrictionType.GE, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, undefined, undefined, testSignature, @@ -900,7 +900,7 @@ describe('TransactionMapping - createFromPayload with optional sigature and sign UInt64.fromUint(4444), account.address, UInt64.fromUint(0), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, UInt64.fromUint(0), undefined, testSignature, @@ -935,7 +935,7 @@ describe('TransactionMapping - createFromPayload with optional sigature and sign UInt64.fromUint(4444), account.address, UInt64.fromUint(0), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, UInt64.fromUint(0), undefined, testSignature, @@ -971,7 +971,7 @@ describe('TransactionMapping - createFromPayload with optional sigature and sign UInt64.fromUint(1000), 1, Convert.uint8ToUtf8(new Uint8Array(10)), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, undefined, testSignature, account.publicAccount, @@ -1004,7 +1004,7 @@ describe('TransactionMapping - createFromPayload with optional sigature and sign new MosaicId([2262289484, 3405110546]), 1, Convert.uint8ToUtf8(new Uint8Array(10)), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, undefined, testSignature, account.publicAccount, @@ -1039,7 +1039,7 @@ describe('TransactionMapping - createFromPayload with optional sigature and sign new NamespaceId([2262289484, 3405110546]), 1, Convert.uint8ToUtf8(new Uint8Array(10)), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, undefined, testSignature, account.publicAccount, @@ -1072,7 +1072,7 @@ describe('TransactionMapping - createFromPayload with optional sigature and sign Address.createFromRawAddress('SATNE7Q5BITMUTRRN6IB4I7FLSDRDWZA34I2PMQ'), [NetworkCurrencyLocal.createRelative(100)], PlainMessage.create('test-message'), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, undefined, testSignature, account.publicAccount, diff --git a/test/core/utils/UnresolvedMapping.spec.ts b/test/core/utils/UnresolvedMapping.spec.ts index dcbf7daea5..12bacd8a30 100644 --- a/test/core/utils/UnresolvedMapping.spec.ts +++ b/test/core/utils/UnresolvedMapping.spec.ts @@ -74,15 +74,15 @@ describe('UnresolvedMapping', () => { describe('toUnresolvedAddressBytes', () => { it('can map Address to buffer', () => { - const buffer = UnresolvedMapping.toUnresolvedAddressBytes(address, NetworkType.MIJIN_TEST); + const buffer = UnresolvedMapping.toUnresolvedAddressBytes(address, NetworkType.PRIVATE_TEST); expect(buffer instanceof Uint8Array).to.be.true; expect(Convert.uint8ToHex(buffer)).to.be.equal(Convert.uint8ToHex(RawAddress.stringToAddress(address.plain()))); }); - it('can map hex string to NamespaceId using MIJIN_TEST', () => { - const buffer = UnresolvedMapping.toUnresolvedAddressBytes(namespacId, NetworkType.MIJIN_TEST); + it('can map hex string to NamespaceId using PRIVATE_TEST', () => { + const buffer = UnresolvedMapping.toUnresolvedAddressBytes(namespacId, NetworkType.PRIVATE_TEST); expect(buffer instanceof Uint8Array).to.be.true; - expect(buffer[0]).to.be.equal(NetworkType.MIJIN_TEST | 1); + expect(buffer[0]).to.be.equal(NetworkType.PRIVATE_TEST | 1); expect(Convert.uint8ToHex(buffer)).to.be.equal('91C51FB4C93FCA5095000000000000000000000000000000'); }); diff --git a/test/infrastructure/BlockHttp.spec.ts b/test/infrastructure/BlockHttp.spec.ts index db832f1ca0..5284c5d159 100644 --- a/test/infrastructure/BlockHttp.spec.ts +++ b/test/infrastructure/BlockHttp.spec.ts @@ -51,7 +51,7 @@ describe('BlockHttp', () => { blockDTO.timestamp = '7'; blockDTO.beneficiaryAddress = Address.createFromPublicKey( '81E5E7AE49998802DABC816EC10158D3A7879702FF29084C2C992CD1289877A8', - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ).encoded(); const blockMetaDTO = {} as BlockMetaDTO; diff --git a/test/infrastructure/Listener.spec.ts b/test/infrastructure/Listener.spec.ts index 2a6e78c47d..d5c307e4f2 100644 --- a/test/infrastructure/Listener.spec.ts +++ b/test/infrastructure/Listener.spec.ts @@ -39,7 +39,7 @@ import { Duration } from 'js-joda'; describe('Listener', () => { const account = Account.createFromPrivateKey( '26b64cb10f005e5988a36744ca19e20d835ccc7c105aaa5f3b212da593180930', - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); let namespaceRepoMock: NamespaceRepository; @@ -241,7 +241,7 @@ describe('Listener', () => { alias, [], PlainMessage.create('test-message'), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const transferTransactionDTO = transferTransaction.toJSON(); const hash = 'abc'; @@ -285,7 +285,7 @@ describe('Listener', () => { alias, [], PlainMessage.create('test-message'), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const transferTransactionDTO = transferTransaction.toJSON(); const hash = 'abc'; @@ -330,7 +330,7 @@ describe('Listener', () => { alias, [], PlainMessage.create('test-message'), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const transferTransactionDTO = transferTransaction.toJSON(); const hash = 'abc'; @@ -374,7 +374,7 @@ describe('Listener', () => { alias2, [], PlainMessage.create('test-message'), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const transferTransactionDTO = transferTransaction.toJSON(); const hash = 'abc'; @@ -420,7 +420,7 @@ describe('Listener', () => { alias2, [], PlainMessage.create('test-message'), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, undefined, undefined, account.publicAccount, diff --git a/test/infrastructure/MetadataHttp.spec.ts b/test/infrastructure/MetadataHttp.spec.ts index 1443a795d5..c25d4789f9 100644 --- a/test/infrastructure/MetadataHttp.spec.ts +++ b/test/infrastructure/MetadataHttp.spec.ts @@ -364,7 +364,7 @@ describe('MetadataHttp', () => { metadataTransactionService .createAccountMetadataTransaction( Deadline.create(epochAdjustment), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, address, UInt64.fromHex('85BBEA6CC462B244'), 'test', @@ -397,7 +397,7 @@ describe('MetadataHttp', () => { metadataTransactionService .createMosaicMetadataTransaction( Deadline.create(epochAdjustment), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, address, mosaicId, UInt64.fromHex('85BBEA6CC462B244'), @@ -431,7 +431,7 @@ describe('MetadataHttp', () => { metadataTransactionService .createNamespaceMetadataTransaction( Deadline.create(epochAdjustment), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, address, namespaceId, UInt64.fromHex('85BBEA6CC462B244'), @@ -464,7 +464,7 @@ describe('MetadataHttp', () => { await metadataTransactionService .createAccountMetadataTransaction( Deadline.create(epochAdjustment), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, address, UInt64.fromHex('85BBEA6CC462B244'), 'test', @@ -493,7 +493,7 @@ describe('MetadataHttp', () => { await metadataTransactionService .createMosaicMetadataTransaction( Deadline.create(epochAdjustment), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, address, mosaicId, UInt64.fromHex('85BBEA6CC462B244'), @@ -523,7 +523,7 @@ describe('MetadataHttp', () => { await metadataTransactionService .createNamespaceMetadataTransaction( Deadline.create(epochAdjustment), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, address, namespaceId, UInt64.fromHex('85BBEA6CC462B244'), diff --git a/test/infrastructure/MosaicHttp.spec.ts b/test/infrastructure/MosaicHttp.spec.ts index 026db01607..9de7cde222 100644 --- a/test/infrastructure/MosaicHttp.spec.ts +++ b/test/infrastructure/MosaicHttp.spec.ts @@ -36,7 +36,7 @@ import { NetworkType } from '../../src/model/network/NetworkType'; describe('MosaicHttp', () => { const publicAccount = PublicAccount.createFromPublicKey( '9801508C58666C746F471538E43002B85B1CD542F9874B2861183919BA8787B6', - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const address = publicAccount.address; const mosaicId = new MosaicId('941299B2B7E1291C'); @@ -60,7 +60,7 @@ describe('MosaicHttp', () => { const url = 'http://someHost'; const response: http.IncomingMessage = mock(); const mosaicRoutesApi: MosaicRoutesApi = mock(); - const mosaicRepository: MosaicRepository = DtoMapping.assign(new MosaicHttp(url, NetworkType.MIJIN_TEST), { + const mosaicRepository: MosaicRepository = DtoMapping.assign(new MosaicHttp(url, NetworkType.PRIVATE_TEST), { mosaicRoutesApi: instance(mosaicRoutesApi), }); diff --git a/test/infrastructure/MultisigHttp.spec.ts b/test/infrastructure/MultisigHttp.spec.ts index 9c63f1b170..08d7bf9025 100644 --- a/test/infrastructure/MultisigHttp.spec.ts +++ b/test/infrastructure/MultisigHttp.spec.ts @@ -31,7 +31,7 @@ import { MultisigAccountInfo } from '../../src/model/account/MultisigAccountInfo import { NetworkType } from '../../src/model/network/NetworkType'; describe('MultisigHttp', () => { - const networkType = NetworkType.MIJIN_TEST; + const networkType = NetworkType.PRIVATE_TEST; const account = Account.generateNewAccount(networkType); const address = account.address; const accountInfoDto = {} as MultisigAccountInfoDTO; diff --git a/test/infrastructure/NamespaceHttp.spec.ts b/test/infrastructure/NamespaceHttp.spec.ts index e7914bfca6..1ca3dc909c 100644 --- a/test/infrastructure/NamespaceHttp.spec.ts +++ b/test/infrastructure/NamespaceHttp.spec.ts @@ -43,7 +43,7 @@ import { NetworkType } from '../../src/model/network/NetworkType'; describe('NamespaceHttp', () => { const publicAccount = PublicAccount.createFromPublicKey( '9801508C58666C746F471538E43002B85B1CD542F9874B2861183919BA8787B6', - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const address = publicAccount.address; const mosaicId = new MosaicId('941299B2B7E1291C'); @@ -91,7 +91,7 @@ describe('NamespaceHttp', () => { const url = 'http://someHost'; const response: http.IncomingMessage = mock(); const namespaceRoutesApi: NamespaceRoutesApi = mock(); - const namespaceRepository: NamespaceRepository = DtoMapping.assign(new NamespaceHttp(url, NetworkType.MIJIN_TEST), { + const namespaceRepository: NamespaceRepository = DtoMapping.assign(new NamespaceHttp(url, NetworkType.PRIVATE_TEST), { namespaceRoutesApi: instance(namespaceRoutesApi), }); diff --git a/test/infrastructure/NetworkHttp.spec.ts b/test/infrastructure/NetworkHttp.spec.ts index 5d653281a0..6c917ded76 100644 --- a/test/infrastructure/NetworkHttp.spec.ts +++ b/test/infrastructure/NetworkHttp.spec.ts @@ -87,7 +87,7 @@ describe('NetworkHttp', () => { it('getNetworkType', async () => { const body: NodeInfoDTO = { - networkIdentifier: NetworkType.MIJIN_TEST, + networkIdentifier: NetworkType.PRIVATE_TEST, friendlyName: '', host: '', networkGenerationHashSeed: '', @@ -100,7 +100,7 @@ describe('NetworkHttp', () => { when(nodeRoutesApi.getNodeInfo()).thenReturn(Promise.resolve(body)); const networkType = await networkRepository.getNetworkType().toPromise(); - expect(networkType).to.be.equals(NetworkType.MIJIN_TEST); + expect(networkType).to.be.equals(NetworkType.PRIVATE_TEST); }); it('getNetworkName', async () => { diff --git a/test/infrastructure/ReceiptHttp.spec.ts b/test/infrastructure/ReceiptHttp.spec.ts index 51ea92fd87..255fe42c95 100644 --- a/test/infrastructure/ReceiptHttp.spec.ts +++ b/test/infrastructure/ReceiptHttp.spec.ts @@ -42,13 +42,13 @@ import { BalanceChangeReceipt } from '../../src/model/receipt/BalanceChangeRecei describe('ReceiptHttp', () => { const publicAccount = PublicAccount.createFromPublicKey( '9801508C58666C746F471538E43002B85B1CD542F9874B2861183919BA8787B6', - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const address = publicAccount.address; const url = 'http://someHost'; const response: http.IncomingMessage = mock(); const receiptRoutesApi: ReceiptRoutesApi = mock(); - const receiptRepository = DtoMapping.assign(new ReceiptHttp(url, NetworkType.MIJIN_TEST), { + const receiptRepository = DtoMapping.assign(new ReceiptHttp(url, NetworkType.PRIVATE_TEST), { receiptRoutesApi: instance(receiptRoutesApi), }); @@ -100,7 +100,7 @@ describe('ReceiptHttp', () => { const resolutionStatementDto = {} as ResolutionStatementDTO; resolutionStatementDto.height = '1'; resolutionStatementDto.unresolved = Convert.uint8ToHex( - RawAddress.aliasToRecipient(Convert.hexToUint8(new NamespaceId('test').toHex()), NetworkType.MIJIN_TEST), + RawAddress.aliasToRecipient(Convert.hexToUint8(new NamespaceId('test').toHex()), NetworkType.PRIVATE_TEST), ); const resolutionEntry = {} as ResolutionEntryDTO; resolutionEntry.resolved = address.encoded(); diff --git a/test/infrastructure/RepositoryFactory.spec.ts b/test/infrastructure/RepositoryFactory.spec.ts index 65e1274e77..aee8245caf 100644 --- a/test/infrastructure/RepositoryFactory.spec.ts +++ b/test/infrastructure/RepositoryFactory.spec.ts @@ -46,7 +46,7 @@ import { NetworkConfigurationDTO } from 'symbol-openapi-typescript-fetch-client' describe('RepositoryFactory', () => { it('Should create repositories', () => { const repositoryFactory = new RepositoryFactoryHttp('http://localhost:3000', { - networkType: NetworkType.MIJIN_TEST, + networkType: NetworkType.PRIVATE_TEST, generationHash: 'testHash', }); @@ -83,7 +83,7 @@ describe('RepositoryFactory', () => { return instance(repositoryMock); } })('http://localhost:3000', { - networkType: NetworkType.MIJIN_TEST, + networkType: NetworkType.PRIVATE_TEST, }); expect(counter).to.be.equals(0); @@ -105,7 +105,7 @@ describe('RepositoryFactory', () => { it('Should get NetworkType from cache', (done) => { let counter = 0; const repositoryMock: NetworkRepository = mock(); - const expectedNetworkType = NetworkType.MIJIN_TEST; + const expectedNetworkType = NetworkType.PRIVATE_TEST; const observableOfBlockInfo = observableOf(expectedNetworkType).pipe( map((v) => { counter++; @@ -187,7 +187,7 @@ describe('RepositoryFactory', () => { const repositoryMock: NetworkRepository = mock(); - const expectedNetworkType = NetworkType.MIJIN_TEST; + const expectedNetworkType = NetworkType.PRIVATE_TEST; const observableOfBlockInfo = observableOf(expectedNetworkType).pipe( map((v) => { counter++; @@ -282,7 +282,7 @@ describe('RepositoryFactory', () => { return instance(namespaceRepository); } })('http://localhost:3000', { - networkType: NetworkType.MIJIN_TEST, + networkType: NetworkType.PRIVATE_TEST, generationHash: 'testHash', websocketInjected: WebSocketMock, }); @@ -295,7 +295,7 @@ describe('RepositoryFactory', () => { return instance(namespaceRepository); } })('http://localhost:3000', { - networkType: NetworkType.MIJIN_TEST, + networkType: NetworkType.PRIVATE_TEST, generationHash: 'testHash', websocketUrl: 'ws://localhost:3000/ws', websocketInjected: WebSocketMock, @@ -307,7 +307,7 @@ describe('RepositoryFactory', () => { it('Should create listener object using injected ws', () => { const factory = new RepositoryFactoryHttp('url', { - networkType: NetworkType.MIJIN_TEST, + networkType: NetworkType.PRIVATE_TEST, generationHash: 'testHash', }); diff --git a/test/infrastructure/RestrictionAccountHttp.spec.ts b/test/infrastructure/RestrictionAccountHttp.spec.ts index df64a3d217..a460b46009 100644 --- a/test/infrastructure/RestrictionAccountHttp.spec.ts +++ b/test/infrastructure/RestrictionAccountHttp.spec.ts @@ -33,7 +33,7 @@ import { AddressRestrictionFlag } from '../../src/model/restriction/AddressRestr describe('RestrictionAccountHttp', () => { const publicAccount = PublicAccount.createFromPublicKey( '9801508C58666C746F471538E43002B85B1CD542F9874B2861183919BA8787B6', - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const address = publicAccount.address; const url = 'http://someHost'; diff --git a/test/infrastructure/RestrictionMosaicHttp.spec.ts b/test/infrastructure/RestrictionMosaicHttp.spec.ts index 96fef83df1..b06ee578c6 100644 --- a/test/infrastructure/RestrictionMosaicHttp.spec.ts +++ b/test/infrastructure/RestrictionMosaicHttp.spec.ts @@ -40,7 +40,7 @@ import { MosaicAddressRestriction } from '../../src/model/restriction/MosaicAddr describe('RestrictionMosaicHttp', () => { const publicAccount = PublicAccount.createFromPublicKey( '9801508C58666C746F471538E43002B85B1CD542F9874B2861183919BA8787B6', - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const address = publicAccount.address; const mosaicId = new MosaicId('941299B2B7E1291C'); diff --git a/test/infrastructure/SerializeTransactionToJSON.spec.ts b/test/infrastructure/SerializeTransactionToJSON.spec.ts index a4fa7413b0..ba9cbd13ad 100644 --- a/test/infrastructure/SerializeTransactionToJSON.spec.ts +++ b/test/infrastructure/SerializeTransactionToJSON.spec.ts @@ -68,7 +68,7 @@ describe('SerializeTransactionToJSON', () => { Deadline.create(epochAdjustment), account.publicKey, LinkAction.Link, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const json = accountLinkTransaction.toJSON(); @@ -84,7 +84,7 @@ describe('SerializeTransactionToJSON', () => { AddressRestrictionFlag.AllowIncomingAddress, [address], [], - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const json = addressRestrictionTransaction.toJSON(); @@ -101,7 +101,7 @@ describe('SerializeTransactionToJSON', () => { MosaicRestrictionFlag.AllowMosaic, [mosaicId], [], - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const json = mosaicRestrictionTransaction.toJSON(); @@ -118,7 +118,7 @@ describe('SerializeTransactionToJSON', () => { OperationRestrictionFlag.AllowOutgoingTransactionType, [operation], [], - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const json = operationRestrictionTransaction.toJSON(); @@ -136,7 +136,7 @@ describe('SerializeTransactionToJSON', () => { AliasAction.Link, namespaceId, address, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const json = addressAliasTransaction.toJSON(); @@ -153,7 +153,7 @@ describe('SerializeTransactionToJSON', () => { AliasAction.Link, namespaceId, mosaicId, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const json = mosaicAliasTransaction.toJSON(); @@ -169,7 +169,7 @@ describe('SerializeTransactionToJSON', () => { MosaicFlags.create(true, true, true), 5, UInt64.fromUint(1000), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const json = mosaicDefinitionTransaction.toJSON(); @@ -188,7 +188,7 @@ describe('SerializeTransactionToJSON', () => { MosaicFlags.create(true, false), 3, UInt64.fromUint(0), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const json = mosaicDefinitionTransaction.toJSON(); @@ -205,7 +205,7 @@ describe('SerializeTransactionToJSON', () => { mosaicId, MosaicSupplyChangeAction.Increase, UInt64.fromUint(10), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const json = mosaicSupplyChangeTransaction.toJSON(); @@ -220,7 +220,7 @@ describe('SerializeTransactionToJSON', () => { Address.createFromRawAddress('SATNE7Q5BITMUTRRN6IB4I7FLSDRDWZA34I2PMQ'), [NetworkCurrencyLocal.createRelative(100)], PlainMessage.create('test-message'), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const json = transferTransaction.toJSON(); @@ -239,7 +239,7 @@ describe('SerializeTransactionToJSON', () => { LockHashAlgorithm.Op_Sha3_256, sha3_256.create().update(convert.hexToUint8(proof)).hex(), recipientAddress, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const json = secretLockTransaction.toJSON(); @@ -256,7 +256,7 @@ describe('SerializeTransactionToJSON', () => { sha3_256.create().update(convert.hexToUint8(proof)).hex(), account.address, proof, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const json = secretProofTransaction.toJSON(); @@ -272,9 +272,9 @@ describe('SerializeTransactionToJSON', () => { Deadline.create(epochAdjustment), 2, 1, - [Address.createFromPublicKey('B0F93CBEE49EEB9953C6F3985B15A4F238E205584D8F924C621CBE4D7AC6EC24', NetworkType.MIJIN_TEST)], + [Address.createFromPublicKey('B0F93CBEE49EEB9953C6F3985B15A4F238E205584D8F924C621CBE4D7AC6EC24', NetworkType.PRIVATE_TEST)], [], - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const json = modifyMultisigAccountTransaction.toJSON(); @@ -290,13 +290,13 @@ describe('SerializeTransactionToJSON', () => { Address.createFromRawAddress('SATNE7Q5BITMUTRRN6IB4I7FLSDRDWZA34I2PMQ'), [], PlainMessage.create('test-message'), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const aggregateTransaction = AggregateTransaction.createComplete( Deadline.create(epochAdjustment), [transferTransaction.toAggregate(account.publicAccount)], - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, [], ); @@ -312,13 +312,13 @@ describe('SerializeTransactionToJSON', () => { Address.createFromRawAddress('SATNE7Q5BITMUTRRN6IB4I7FLSDRDWZA34I2PMQ'), [], PlainMessage.create('test-message'), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const aggregateTransaction = AggregateTransaction.createBonded( Deadline.create(epochAdjustment), [transferTransaction.toAggregate(account.publicAccount)], - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, [], ); @@ -330,14 +330,14 @@ describe('SerializeTransactionToJSON', () => { it('should create LockFundTransaction', () => { const generationHash = '57F7DA205008026C776CB6AED843393F04CD458E0AA2D9F1D5F31A402072B2D6'; - const aggregateTransaction = AggregateTransaction.createBonded(Deadline.create(epochAdjustment), [], NetworkType.MIJIN_TEST, []); + const aggregateTransaction = AggregateTransaction.createBonded(Deadline.create(epochAdjustment), [], NetworkType.PRIVATE_TEST, []); const signedTransaction = account.sign(aggregateTransaction, generationHash); const lockTransaction = LockFundsTransaction.create( Deadline.create(epochAdjustment), NetworkCurrencyLocal.createRelative(10), UInt64.fromUint(10), signedTransaction, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const json = lockTransaction.toJSON(); @@ -351,7 +351,7 @@ describe('SerializeTransactionToJSON', () => { Deadline.create(epochAdjustment), 'root-test-namespace', UInt64.fromUint(1000), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const json = registerNamespaceTransaction.toJSON(); @@ -364,7 +364,7 @@ describe('SerializeTransactionToJSON', () => { Deadline.create(epochAdjustment), 'root-test-namespace', 'parent-test-namespace', - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const json = registerNamespaceTransaction.toJSON(); @@ -377,7 +377,7 @@ describe('SerializeTransactionToJSON', () => { Deadline.create(epochAdjustment), account.publicKey, LinkAction.Link, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const json = vrfKeyLinkTransaction.toJSON(); @@ -390,7 +390,7 @@ describe('SerializeTransactionToJSON', () => { Deadline.create(epochAdjustment), account.publicKey, LinkAction.Link, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const json = nodeKeyLinkTransaction.toJSON(); @@ -406,7 +406,7 @@ describe('SerializeTransactionToJSON', () => { 1, 3, LinkAction.Link, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const json = votingKeyLinkTransaction.toJSON(); diff --git a/test/infrastructure/TransactionHttp.spec.ts b/test/infrastructure/TransactionHttp.spec.ts index 309c85e715..b6758e9ddc 100644 --- a/test/infrastructure/TransactionHttp.spec.ts +++ b/test/infrastructure/TransactionHttp.spec.ts @@ -75,12 +75,12 @@ describe('TransactionHttp', () => { Address.createFromRawAddress('SATNE7Q5BITMUTRRN6IB4I7FLSDRDWZA34I2PMQ'), [], PlainMessage.create('Hi'), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const aggTx = AggregateTransaction.createComplete( Deadline.create(epochAdjustment), [tx.toAggregate(account.publicAccount)], - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, [], ); @@ -364,7 +364,7 @@ describe('TransactionHttp', () => { blockDTO.timestamp = '7'; blockDTO.beneficiaryAddress = Address.createFromPublicKey( '81E5E7AE49998802DABC816EC10158D3A7879702FF29084C2C992CD1289877A8', - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ).encoded(); const blockMetaDTO = {} as BlockMetaDTO; @@ -394,7 +394,7 @@ describe('TransactionHttp', () => { Address.createFromRawAddress('SATNE7Q5BITMUTRRN6IB4I7FLSDRDWZA34I2PMQ'), [], PlainMessage.create('Hi'), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const signedTx = account.sign(tx, generationHash); @@ -413,13 +413,13 @@ describe('TransactionHttp', () => { Address.createFromRawAddress('SATNE7Q5BITMUTRRN6IB4I7FLSDRDWZA34I2PMQ'), [], PlainMessage.create('Hi'), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const aggTx = AggregateTransaction.createBonded( Deadline.create(epochAdjustment), [tx.toAggregate(account.publicAccount)], - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, [], ); @@ -501,7 +501,7 @@ describe('TransactionHttp', () => { Address.createFromRawAddress('SATNE7Q5BITMUTRRN6IB4I7FLSDRDWZA34I2PMQ'), [], PlainMessage.create('Hi'), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const signedTx = account.sign(tx, generationHash); @@ -521,13 +521,13 @@ describe('TransactionHttp', () => { Address.createFromRawAddress('SATNE7Q5BITMUTRRN6IB4I7FLSDRDWZA34I2PMQ'), [], PlainMessage.create('Hi'), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const aggTx = AggregateTransaction.createBonded( Deadline.create(epochAdjustment), [tx.toAggregate(account.publicAccount)], - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, [], ); const signedTx = account.sign(aggTx, generationHash); diff --git a/test/infrastructure/receipt/CreateReceiptFromDTO.spec.ts b/test/infrastructure/receipt/CreateReceiptFromDTO.spec.ts index f0476bbb82..18b0328b00 100644 --- a/test/infrastructure/receipt/CreateReceiptFromDTO.spec.ts +++ b/test/infrastructure/receipt/CreateReceiptFromDTO.spec.ts @@ -36,7 +36,10 @@ describe('Receipt - CreateStatementFromDTO', () => { let statementDto; before(() => { - account = Account.createFromPrivateKey('D242FB34C2C4DD36E995B9C865F93940065E326661BA5A4A247331D211FE3A3D', NetworkType.MIJIN_TEST); + account = Account.createFromPrivateKey( + 'D242FB34C2C4DD36E995B9C865F93940065E326661BA5A4A247331D211FE3A3D', + NetworkType.PRIVATE_TEST, + ); statementDto = { transactionStatements: [ { diff --git a/test/model/account/Account.spec.ts b/test/model/account/Account.spec.ts index b893c3d8a4..e3732233e6 100644 --- a/test/model/account/Account.spec.ts +++ b/test/model/account/Account.spec.ts @@ -36,7 +36,7 @@ describe('Account', () => { const epochAdjustment = Duration.ofSeconds(1573430400); it('should be created via private key', () => { - const account = Account.createFromPrivateKey(accountInformation.privateKey, NetworkType.MIJIN_TEST); + const account = Account.createFromPrivateKey(accountInformation.privateKey, NetworkType.PRIVATE_TEST); expect(account.publicKey).to.be.equal(accountInformation.publicKey); expect(account.privateKey).to.be.equal(accountInformation.privateKey); expect(account.address.plain()).to.be.equal(accountInformation.address); @@ -44,12 +44,12 @@ describe('Account', () => { it('should throw exception when the private key is not valid', () => { expect(() => { - Account.createFromPrivateKey('', NetworkType.MIJIN_TEST); + Account.createFromPrivateKey('', NetworkType.PRIVATE_TEST); }).to.throw(); }); it('should generate a new account', () => { - const account = Account.generateNewAccount(NetworkType.MIJIN_TEST); + const account = Account.generateNewAccount(NetworkType.PRIVATE_TEST); expect(account.publicKey).to.not.be.equal(undefined); expect(account.privateKey).to.not.be.equal(undefined); expect(account.address).to.not.be.equal(undefined); @@ -117,7 +117,7 @@ describe('Account', () => { it('utf-8', () => { const account = Account.createFromPrivateKey( 'AB860ED1FE7C91C02F79C02225DAC708D7BD13369877C1F59E678CC587658C47', - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const publicAccount = account.publicAccount; const signed = account.signData('catapult rocks!'); @@ -127,7 +127,7 @@ describe('Account', () => { it('hexa', () => { const account = Account.createFromPrivateKey( 'AB860ED1FE7C91C02F79C02225DAC708D7BD13369877C1F59E678CC587658C47', - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const publicAccount = account.publicAccount; const signed = account.signData('0xAA'); @@ -157,7 +157,7 @@ describe('Account', () => { it('hexa without 0x previx', () => { const account = Account.createFromPrivateKey( 'AB860ED1FE7C91C02F79C02225DAC708D7BD13369877C1F59E678CC587658C47', - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const publicAccount = account.publicAccount; const signed = account.signData('66128B29E8197352A2FEB51B50CF5D02F1D05B20D44B3F7953B98ACD2BCA15D4'); @@ -167,7 +167,7 @@ describe('Account', () => { it('hexa without 0x previx should be the same as with 0x', () => { const account = Account.createFromPrivateKey( 'AB860ED1FE7C91C02F79C02225DAC708D7BD13369877C1F59E678CC587658C47', - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const publicAccount = account.publicAccount; const signed = account.signData('AA'); @@ -179,7 +179,7 @@ describe('Account', () => { it('hexa without 0x previx should be the same as with 0x', () => { const account = Account.createFromPrivateKey( 'AB860ED1FE7C91C02F79C02225DAC708D7BD13369877C1F59E678CC587658C47', - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const publicAccount = account.publicAccount; const signed = account.signData('ff60983e0c5d21d2fb83c67598d560f3cf0e28ae667b5616aaa58a059666cd8cf826b026243c92cf'); @@ -198,7 +198,7 @@ describe('Account', () => { it('sign empty', () => { const account = Account.createFromPrivateKey( 'AB860ED1FE7C91C02F79C02225DAC708D7BD13369877C1F59E678CC587658C47', - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const publicAccount = account.publicAccount; const signed = account.signData(''); diff --git a/test/model/account/AccountInfo.spec.ts b/test/model/account/AccountInfo.spec.ts index 2a3ad7c101..d2e8a53001 100644 --- a/test/model/account/AccountInfo.spec.ts +++ b/test/model/account/AccountInfo.spec.ts @@ -111,6 +111,6 @@ describe('AccountInfo', () => { deepEqual(accountInfo.publicKeyHeight, accountInfoDTO.account.publicKeyHeight); deepEqual(accountInfo.importance, accountInfoDTO.account.importance); deepEqual(accountInfo.importanceHeight, accountInfoDTO.account.importanceHeight); - deepEqual(accountInfo.publicAccount, PublicAccount.createFromPublicKey(accountInfoDTO.account.publicKey, NetworkType.MIJIN)); + deepEqual(accountInfo.publicAccount, PublicAccount.createFromPublicKey(accountInfoDTO.account.publicKey, NetworkType.PRIVATE)); }); }); diff --git a/test/model/account/Address.spec.ts b/test/model/account/Address.spec.ts index 56f84fb4c1..056ab1b6e0 100644 --- a/test/model/account/Address.spec.ts +++ b/test/model/account/Address.spec.ts @@ -21,21 +21,21 @@ import { NetworkType } from '../../../src/model/network/NetworkType'; describe('Address', () => { const publicKey = '2E834140FD66CF87B254A693A2C7862C819217B676D3943267156625E816EC6F'; - it('createComplete an address given publicKey + NetworkType.MIJIN_TEST', () => { - const address = Address.createFromPublicKey(publicKey, NetworkType.MIJIN_TEST); + it('createComplete an address given publicKey + NetworkType.PRIVATE_TEST', () => { + const address = Address.createFromPublicKey(publicKey, NetworkType.PRIVATE_TEST); expect(address.plain()).to.be.equal('SATNE7Q5BITMUTRRN6IB4I7FLSDRDWZA34I2PMQ'); - expect(address.networkType).to.be.equal(NetworkType.MIJIN_TEST); + expect(address.networkType).to.be.equal(NetworkType.PRIVATE_TEST); }); it('print the address in pretty format', () => { - const address = Address.createFromPublicKey(publicKey, NetworkType.MIJIN_TEST); + const address = Address.createFromPublicKey(publicKey, NetworkType.PRIVATE_TEST); expect(address.pretty()).to.be.equal('SATNE7-Q5BITM-UTRRN6-IB4I7F-LSDRDW-ZA34I2-PMQ'); }); - it('createComplete an address given publicKey + NetworkType.MIJIN', () => { - const address = Address.createFromPublicKey(publicKey, NetworkType.MIJIN); + it('createComplete an address given publicKey + NetworkType.PRIVATE', () => { + const address = Address.createFromPublicKey(publicKey, NetworkType.PRIVATE); expect(address.plain()).to.be.equal('MATNE7Q5BITMUTRRN6IB4I7FLSDRDWZA34YACRA'); - expect(address.networkType).to.be.equal(NetworkType.MIJIN); + expect(address.networkType).to.be.equal(NetworkType.PRIVATE); }); it('createComplete an address given publicKey + NetworkType.MAIN_NET', () => { @@ -52,12 +52,12 @@ describe('Address', () => { it('createComplete an address given SATNE7Q5BITMUTRRN6IB4I7FLSDRDWZA34I2PMQ', () => { const address = Address.createFromRawAddress('SATNE7Q5BITMUTRRN6IB4I7FLSDRDWZA34I2PMQ'); - expect(address.networkType).to.be.equal(NetworkType.MIJIN_TEST); + expect(address.networkType).to.be.equal(NetworkType.PRIVATE_TEST); }); it('createComplete an address given MATNE7Q5BITMUTRRN6IB4I7FLSDRDWZA34YACRA', () => { const address = Address.createFromRawAddress('MATNE7Q5BITMUTRRN6IB4I7FLSDRDWZA34YACRA'); - expect(address.networkType).to.be.equal(NetworkType.MIJIN); + expect(address.networkType).to.be.equal(NetworkType.PRIVATE); }); it('createComplete an address given NATNE7Q5BITMUTRRN6IB4I7FLSDRDWZA34SQ33Y', () => { @@ -72,7 +72,7 @@ describe('Address', () => { it('createComplete an address given SATNE7-Q5BITM-UTRRN6-IB4I7F-LSDRDW-ZA34I2-PMQ', () => { const address = Address.createFromRawAddress('SATNE7-Q5BITM-UTRRN6-IB4I7F-LSDRDW-ZA34I2-PMQ'); - expect(address.networkType).to.be.equal(NetworkType.MIJIN_TEST); + expect(address.networkType).to.be.equal(NetworkType.PRIVATE_TEST); expect(address.pretty()).to.be.equal('SATNE7-Q5BITM-UTRRN6-IB4I7F-LSDRDW-ZA34I2-PMQ'); }); @@ -114,9 +114,9 @@ describe('Address', () => { describe('isValidRawAddress', () => { it('returns true for valid address when generated', () => { // Assert: - expect(Address.isValidRawAddress(Account.generateNewAccount(NetworkType.MIJIN_TEST).address.plain())).to.equal(true); + expect(Address.isValidRawAddress(Account.generateNewAccount(NetworkType.PRIVATE_TEST).address.plain())).to.equal(true); expect(Address.isValidRawAddress(Account.generateNewAccount(NetworkType.MAIN_NET).address.plain())).to.equal(true); - expect(Address.isValidRawAddress(Account.generateNewAccount(NetworkType.MIJIN).address.plain())).to.equal(true); + expect(Address.isValidRawAddress(Account.generateNewAccount(NetworkType.PRIVATE).address.plain())).to.equal(true); expect(Address.isValidRawAddress(Account.generateNewAccount(NetworkType.TEST_NET).address.plain())).to.equal(true); }); @@ -179,9 +179,9 @@ describe('Address', () => { describe('isValidEncodedAddress', () => { it('returns true for valid address when generated', () => { // Assert: - expect(Address.isValidEncodedAddress(Account.generateNewAccount(NetworkType.MIJIN_TEST).address.encoded())).to.equal(true); + expect(Address.isValidEncodedAddress(Account.generateNewAccount(NetworkType.PRIVATE_TEST).address.encoded())).to.equal(true); expect(Address.isValidEncodedAddress(Account.generateNewAccount(NetworkType.MAIN_NET).address.encoded())).to.equal(true); - expect(Address.isValidEncodedAddress(Account.generateNewAccount(NetworkType.MIJIN).address.encoded())).to.equal(true); + expect(Address.isValidEncodedAddress(Account.generateNewAccount(NetworkType.PRIVATE).address.encoded())).to.equal(true); expect(Address.isValidEncodedAddress(Account.generateNewAccount(NetworkType.TEST_NET).address.encoded())).to.equal(true); }); diff --git a/test/model/account/MultisigAccountGraphInfo.spec.ts b/test/model/account/MultisigAccountGraphInfo.spec.ts index 5733a14aa1..8365b4570b 100644 --- a/test/model/account/MultisigAccountGraphInfo.spec.ts +++ b/test/model/account/MultisigAccountGraphInfo.spec.ts @@ -30,20 +30,20 @@ describe('MultisigAccountGraphInfo', () => { multisig: { accountAddress: Address.createFromPublicKey( 'B694186EE4AB0558CA4AFCFDD43B42114AE71094F5A1FC4A913FE9971CACD21D', - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ), cosignatoryAddresses: [ Address.createFromPublicKey( 'CF893FFCC47C33E7F68AB1DB56365C156B0736824A0C1E273F9E00B8DF8F01EB', - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ), Address.createFromPublicKey( '68B3FBB18729C1FDE225C57F8CE080FA828F0067E451A3FD81FA628842B0B763', - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ), Address.createFromPublicKey( 'DAB1C38C3E1642494FCCB33138B95E81867B5FB59FC4277A1D53761C8B9F6D14', - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ), ], minApproval: 3, @@ -51,7 +51,7 @@ describe('MultisigAccountGraphInfo', () => { multisigAddresses: [ Address.createFromPublicKey( '1674016C27FE2C2EB5DFA73996FA54A183B38AED0AA64F756A3918BAF08E061B', - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ), ], }, diff --git a/test/model/account/MultisigAccountInfo.spec.ts b/test/model/account/MultisigAccountInfo.spec.ts index a32cf7b80d..0ba384728c 100644 --- a/test/model/account/MultisigAccountInfo.spec.ts +++ b/test/model/account/MultisigAccountInfo.spec.ts @@ -24,17 +24,17 @@ describe('MultisigAccountInfo', () => { multisig: { accountAddress: Address.createFromPublicKey( 'B694186EE4AB0558CA4AFCFDD43B42114AE71094F5A1FC4A913FE9971CACD21D', - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ), cosignatoryAddresses: [ - Address.createFromPublicKey('CF893FFCC47C33E7F68AB1DB56365C156B0736824A0C1E273F9E00B8DF8F01EB', NetworkType.MIJIN_TEST), - Address.createFromPublicKey('68B3FBB18729C1FDE225C57F8CE080FA828F0067E451A3FD81FA628842B0B763', NetworkType.MIJIN_TEST), - Address.createFromPublicKey('DAB1C38C3E1642494FCCB33138B95E81867B5FB59FC4277A1D53761C8B9F6D14', NetworkType.MIJIN_TEST), + Address.createFromPublicKey('CF893FFCC47C33E7F68AB1DB56365C156B0736824A0C1E273F9E00B8DF8F01EB', NetworkType.PRIVATE_TEST), + Address.createFromPublicKey('68B3FBB18729C1FDE225C57F8CE080FA828F0067E451A3FD81FA628842B0B763', NetworkType.PRIVATE_TEST), + Address.createFromPublicKey('DAB1C38C3E1642494FCCB33138B95E81867B5FB59FC4277A1D53761C8B9F6D14', NetworkType.PRIVATE_TEST), ], minApproval: 3, minRemoval: 3, multisigAddresses: [ - Address.createFromPublicKey('1674016C27FE2C2EB5DFA73996FA54A183B38AED0AA64F756A3918BAF08E061B', NetworkType.MIJIN_TEST), + Address.createFromPublicKey('1674016C27FE2C2EB5DFA73996FA54A183B38AED0AA64F756A3918BAF08E061B', NetworkType.PRIVATE_TEST), ], }, }; @@ -102,7 +102,10 @@ describe('MultisigAccountInfo', () => { expect( multisigAccountInfo.hasCosigner( - Address.createFromPublicKey('CF893FFCC47C33E7F68AB1DB56365C156B0736824A0C1E273F9E00B8DF8F01EB', NetworkType.MIJIN_TEST), + Address.createFromPublicKey( + 'CF893FFCC47C33E7F68AB1DB56365C156B0736824A0C1E273F9E00B8DF8F01EB', + NetworkType.PRIVATE_TEST, + ), ), ).to.be.equal(true); }); @@ -118,7 +121,10 @@ describe('MultisigAccountInfo', () => { expect( multisigAccountInfo.hasCosigner( - Address.createFromPublicKey('B694186EE4AB0558CA4AFCFDD43B42114AE71094F5A1FC4A913FE9971CACD21D', NetworkType.MIJIN_TEST), + Address.createFromPublicKey( + 'B694186EE4AB0558CA4AFCFDD43B42114AE71094F5A1FC4A913FE9971CACD21D', + NetworkType.PRIVATE_TEST, + ), ), ).to.be.equal(false); }); @@ -136,7 +142,10 @@ describe('MultisigAccountInfo', () => { expect( multisigAccountInfo.isCosignerOfMultisigAccount( - Address.createFromPublicKey('1674016C27FE2C2EB5DFA73996FA54A183B38AED0AA64F756A3918BAF08E061B', NetworkType.MIJIN_TEST), + Address.createFromPublicKey( + '1674016C27FE2C2EB5DFA73996FA54A183B38AED0AA64F756A3918BAF08E061B', + NetworkType.PRIVATE_TEST, + ), ), ).to.be.equal(true); }); @@ -152,7 +161,10 @@ describe('MultisigAccountInfo', () => { expect( multisigAccountInfo.isCosignerOfMultisigAccount( - Address.createFromPublicKey('B694186EE4AB0558CA4AFCFDD43B42114AE71094F5A1FC4A913FE9971CACD21D', NetworkType.MIJIN_TEST), + Address.createFromPublicKey( + 'B694186EE4AB0558CA4AFCFDD43B42114AE71094F5A1FC4A913FE9971CACD21D', + NetworkType.PRIVATE_TEST, + ), ), ).to.be.equal(false); }); diff --git a/test/model/account/PublicAccount.spec.ts b/test/model/account/PublicAccount.spec.ts index 559e1efb2b..a29bf18f9a 100644 --- a/test/model/account/PublicAccount.spec.ts +++ b/test/model/account/PublicAccount.spec.ts @@ -23,7 +23,7 @@ describe('PublicAccount', () => { const publicKey = 'b4f12e7c9f6946091e2cb8b6d3a12b50d17ccbbf646386ea27ce2946a7423dcf'; it('should createComplete a public account from public key', () => { - const publicAccount = PublicAccount.createFromPublicKey(publicKey, NetworkType.MIJIN_TEST); + const publicAccount = PublicAccount.createFromPublicKey(publicKey, NetworkType.PRIVATE_TEST); expect(publicAccount.publicKey).to.be.equal(publicKey); expect(publicAccount.address.plain()).to.be.equal('SARNASAS2BIAB6LMFA3FPMGBPGIJGK6IJETM3ZQ'); }); @@ -43,7 +43,7 @@ describe('Signature verification', () => { // Arrange: const signerPublicAccount = PublicAccount.createFromPublicKey( '22816F825B4CACEA334723D51297D8582332D8B875A5829908AAE85831ABB508', - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const data = 'I am so so so awesome as always'; const signature = 'B01DCA6484026C2ECDF3C822E64DEAAFC15EBCCE337EEE209C28513CB5351CDED8863A8E7B855CD471B55C91FAE611C5486'; // Act & Assert: @@ -56,7 +56,7 @@ describe('Signature verification', () => { // Arrange: const signerPublicAccount = PublicAccount.createFromPublicKey( '22816F825B4CACEA334723D51297D8582332D8B875A5829908AAE85831ABB508', - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const data = 'I am so so so awesome as always'; const signature = @@ -70,7 +70,7 @@ describe('Signature verification', () => { // Arrange: const signerPublicAccount = PublicAccount.createFromPublicKey( '12816F825B4CACEA334723D51297D8582332D8B875A5829908AAE85831ABB509', - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const data = 'I am so so so awesome as always'; const signature = @@ -82,7 +82,7 @@ describe('Signature verification', () => { // Arrange: const signerPublicAccount = PublicAccount.createFromPublicKey( '22816F825B4CACEA334723D51297D8582332D8B875A5829908AAE85831ABB508', - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const data = 'I am awesome as always'; const signature = @@ -94,7 +94,7 @@ describe('Signature verification', () => { // Arrange: const signerPublicAccount = PublicAccount.createFromPublicKey( '22816F825B4CACEA334723D51297D8582332D8B875A5829908AAE85831ABB508', - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const data = 'I am so so so awesome as always'; const signature = diff --git a/test/model/blockchain/NewBlock.spec.ts b/test/model/blockchain/NewBlock.spec.ts index 42752bf736..3ea1808c1b 100644 --- a/test/model/blockchain/NewBlock.spec.ts +++ b/test/model/blockchain/NewBlock.spec.ts @@ -42,7 +42,7 @@ describe('NewBlock', () => { signerPublicKey: 'B4F12E7C9F6946091E2CB8B6D3A12B50D17CCBBF646386EA27CE2946A7423DCF', beneficiaryAddress: Address.createFromPublicKey( 'B4F12E7C9F6946091E2CB8B6D3A12B50D17CCBBF646386EA27CE2946A7423DCF', - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ).encoded(), timestamp: new UInt64([0, 0]), type: 32768, diff --git a/test/model/message/EncryptedMessage.spec.ts b/test/model/message/EncryptedMessage.spec.ts index d98315ef24..b3cc89f426 100644 --- a/test/model/message/EncryptedMessage.spec.ts +++ b/test/model/message/EncryptedMessage.spec.ts @@ -31,10 +31,10 @@ describe('EncryptedMessage', () => { let recipient_nis: Account; const epochAdjustment = Duration.ofSeconds(1573430400); before(() => { - sender = Account.createFromPrivateKey('2602F4236B199B3DF762B2AAB46FC3B77D8DDB214F0B62538D3827576C46C108', NetworkType.MIJIN_TEST); + sender = Account.createFromPrivateKey('2602F4236B199B3DF762B2AAB46FC3B77D8DDB214F0B62538D3827576C46C108', NetworkType.PRIVATE_TEST); recipient = Account.createFromPrivateKey( 'B72F2950498111BADF276D6D9D5E345F04E0D5C9B8342DA983C3395B4CF18F08', - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); sender_nis = Account.createFromPrivateKey('2602F4236B199B3DF762B2AAB46FC3B77D8DDB214F0B62538D3827576C46C108', NetworkType.TEST_NET); @@ -69,7 +69,7 @@ describe('EncryptedMessage', () => { recipient.address, [NetworkCurrencyLocal.createAbsolute(1)], sender.encryptMessage('Testing simple transfer', recipient.publicAccount), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const signedTransaction = transferTransaction.signWith(sender, generationHash); const encryptMessage = EncryptedMessage.createFromPayload( diff --git a/test/model/message/PersistentHarvestingDelegationMessage.spec.ts b/test/model/message/PersistentHarvestingDelegationMessage.spec.ts index 25c4c653cd..9d2744012e 100644 --- a/test/model/message/PersistentHarvestingDelegationMessage.spec.ts +++ b/test/model/message/PersistentHarvestingDelegationMessage.spec.ts @@ -31,10 +31,10 @@ describe('PersistentHarvestingDelegationMessage', () => { const vrfPrivateKey = '800F35F1CC66C2B62CE9DD9F31003B9B3E5C7A2F381FB8952A294277A1015D83'; const epochAdjustment = Duration.ofSeconds(1573430400); before(() => { - sender = Account.createFromPrivateKey('2602F4236B199B3DF762B2AAB46FC3B77D8DDB214F0B62538D3827576C46C108', NetworkType.MIJIN_TEST); + sender = Account.createFromPrivateKey('2602F4236B199B3DF762B2AAB46FC3B77D8DDB214F0B62538D3827576C46C108', NetworkType.PRIVATE_TEST); recipient = Account.createFromPrivateKey( 'B72F2950498111BADF276D6D9D5E345F04E0D5C9B8342DA983C3395B4CF18F08', - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); recipient_nis = Account.createFromPrivateKey( 'B72F2950498111BADF276D6D9D5E345F04E0D5C9B8342DA983C3395B4CF18F08', @@ -47,7 +47,7 @@ describe('PersistentHarvestingDelegationMessage', () => { signingPrivateKey, vrfPrivateKey, recipient.publicKey, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); expect(encryptedMessage.payload.length).to.be.equal(264); expect(encryptedMessage.type).to.be.equal(MessageType.PersistentHarvestingDelegationMessage); @@ -75,7 +75,7 @@ describe('PersistentHarvestingDelegationMessage', () => { signingPrivateKey, vrfPrivateKey, recipient.publicKey, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const plainMessage = PersistentHarvestingDelegationMessage.decrypt(encryptedMessage, recipient.privateKey); expect(plainMessage).to.be.equal(signingPrivateKey + vrfPrivateKey); @@ -88,7 +88,7 @@ describe('PersistentHarvestingDelegationMessage', () => { signingPrivateKey, vrfPrivateKey, recipient.publicKey, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const signedTransaction = tx.signWith(sender, generationHash); const encryptMessage = PersistentHarvestingDelegationMessage.createFromPayload( diff --git a/test/model/mosaic/MosaicAmountView.spec.ts b/test/model/mosaic/MosaicAmountView.spec.ts index 942a8fa27c..c38f160610 100644 --- a/test/model/mosaic/MosaicAmountView.spec.ts +++ b/test/model/mosaic/MosaicAmountView.spec.ts @@ -32,7 +32,7 @@ describe('MosaicAmountView', () => { new MosaicId([3294802500, 2243684972]), // mosaicId new UInt64([3403414400, 2095475]), // supply new UInt64([1, 0]), // height - Address.createFromPublicKey('B4F12E7C9F6946091E2CB8B6D3A12B50D17CCBBF646386EA27CE2946A7423DCF', NetworkType.MIJIN_TEST), + Address.createFromPublicKey('B4F12E7C9F6946091E2CB8B6D3A12B50D17CCBBF646386EA27CE2946A7423DCF', NetworkType.PRIVATE_TEST), 1, // revision MosaicFlags.create(true, true, true), 3, @@ -64,7 +64,7 @@ describe('MosaicAmountView', () => { new MosaicId([3294802500, 2243684972]), // mosaicId new UInt64([3403414400, 2095475]), // supply new UInt64([1, 0]), // height - Address.createFromPublicKey('B4F12E7C9F6946091E2CB8B6D3A12B50D17CCBBF646386EA27CE2946A7423DCF', NetworkType.MIJIN_TEST), + Address.createFromPublicKey('B4F12E7C9F6946091E2CB8B6D3A12B50D17CCBBF646386EA27CE2946A7423DCF', NetworkType.PRIVATE_TEST), 1, // revision MosaicFlags.create(true, true, true), 0, diff --git a/test/model/mosaic/MosaicId.spec.ts b/test/model/mosaic/MosaicId.spec.ts index 37c447796f..7729515b2a 100644 --- a/test/model/mosaic/MosaicId.spec.ts +++ b/test/model/mosaic/MosaicId.spec.ts @@ -35,13 +35,13 @@ describe('MosaicId', () => { }); it('should create id given nonce and owner', () => { - const owner = PublicAccount.createFromPublicKey(publicKey, NetworkType.MIJIN_TEST); + const owner = PublicAccount.createFromPublicKey(publicKey, NetworkType.PRIVATE_TEST); const id = MosaicId.createFromNonce(MosaicNonce.createFromNumber(0), owner.address); deepEqual(id.id, new Id([3526830425, 1241357627])); }); it('should create id twice the same given nonce and owner', () => { - const owner = PublicAccount.createFromPublicKey(publicKey, NetworkType.MIJIN_TEST); + const owner = PublicAccount.createFromPublicKey(publicKey, NetworkType.PRIVATE_TEST); const id1 = MosaicId.createFromNonce(MosaicNonce.createFromNumber(12), owner.address); const id2 = MosaicId.createFromNonce(MosaicNonce.createFromNumber(12), owner.address); diff --git a/test/model/mosaic/MosaicInfo.spec.ts b/test/model/mosaic/MosaicInfo.spec.ts index 7bbe750b27..3795f00a25 100644 --- a/test/model/mosaic/MosaicInfo.spec.ts +++ b/test/model/mosaic/MosaicInfo.spec.ts @@ -32,7 +32,7 @@ describe('MosaicInfo', () => { startHeight: new UInt64([1, 0]), ownerAddress: Address.createFromPublicKey( 'B4F12E7C9F6946091E2CB8B6D3A12B50D17CCBBF646386EA27CE2946A7423DCF', - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ), revision: 1, flags: 7, diff --git a/test/model/mosaic/MosaicView.spec.ts b/test/model/mosaic/MosaicView.spec.ts index 426fab1b7d..c230b0dbc6 100644 --- a/test/model/mosaic/MosaicView.spec.ts +++ b/test/model/mosaic/MosaicView.spec.ts @@ -32,7 +32,7 @@ describe('MosaicView', () => { new MosaicId([3294802500, 2243684972]), new UInt64([3403414400, 2095475]), // supply new UInt64([1, 0]), // height - Address.createFromPublicKey('B4F12E7C9F6946091E2CB8B6D3A12B50D17CCBBF646386EA27CE2946A7423DCF', NetworkType.MIJIN_TEST), + Address.createFromPublicKey('B4F12E7C9F6946091E2CB8B6D3A12B50D17CCBBF646386EA27CE2946A7423DCF', NetworkType.PRIVATE_TEST), 1, // revision MosaicFlags.create(true, true, true), 2, diff --git a/test/model/namespace/NamespaceInfo.spec.ts b/test/model/namespace/NamespaceInfo.spec.ts index f9c964538d..1148822444 100644 --- a/test/model/namespace/NamespaceInfo.spec.ts +++ b/test/model/namespace/NamespaceInfo.spec.ts @@ -71,7 +71,7 @@ describe('NamespaceInfo', () => { level0: new NamespaceId([929036875, 2226345261]), ownerAddress: Address.createFromPublicKey( 'B4F12E7C9F6946091E2CB8B6D3A12B50D17CCBBF646386EA27CE2946A7423DCF', - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ).encoded(), parentId: new NamespaceId([0, 0]), startHeight: new UInt64([1, 0]), @@ -93,7 +93,7 @@ describe('NamespaceInfo', () => { parentId: new NamespaceId([3316183705, 3829351378]), ownerAddress: Address.createFromPublicKey( '846B4439154579A5903B1459C9CF69CB8153F6D0110A7A0ED61DE29AE4810BF2', - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ).encoded(), startHeight: [795, 0], endHeight: [50795, 0], diff --git a/test/model/network/NetworkType.spec.ts b/test/model/network/NetworkType.spec.ts index 24cb724f19..a53253207f 100644 --- a/test/model/network/NetworkType.spec.ts +++ b/test/model/network/NetworkType.spec.ts @@ -28,13 +28,13 @@ describe('NetworkType', () => { expect(NetworkType.TEST_NET).to.be.equal(152); }); - it('MIJIN is 0x60', () => { - expect(NetworkType.MIJIN).to.be.equal(0x60); - expect(NetworkType.MIJIN).to.be.equal(96); + it('PRIVATE is 0x60', () => { + expect(NetworkType.PRIVATE).to.be.equal(0x60); + expect(NetworkType.PRIVATE).to.be.equal(96); }); - it('MIJIN_TEST is 0x90', () => { - expect(NetworkType.MIJIN_TEST).to.be.equal(0x90); - expect(NetworkType.MIJIN_TEST).to.be.equal(144); + it('PRIVATE_TEST is 0x90', () => { + expect(NetworkType.PRIVATE_TEST).to.be.equal(0x90); + expect(NetworkType.PRIVATE_TEST).to.be.equal(144); }); }); diff --git a/test/model/receipt/Receipt.spec.ts b/test/model/receipt/Receipt.spec.ts index f1d4a7d5eb..dc3ee0d835 100644 --- a/test/model/receipt/Receipt.spec.ts +++ b/test/model/receipt/Receipt.spec.ts @@ -49,7 +49,10 @@ describe('Receipt', () => { let statementDTO; before(() => { - account = Account.createFromPrivateKey('D242FB34C2C4DD36E995B9C865F93940065E326661BA5A4A247331D211FE3A3D', NetworkType.MIJIN_TEST); + account = Account.createFromPrivateKey( + 'D242FB34C2C4DD36E995B9C865F93940065E326661BA5A4A247331D211FE3A3D', + NetworkType.PRIVATE_TEST, + ); transactionStatementsDTO = [ { statement: { diff --git a/test/model/receipt/Statement.spec.ts b/test/model/receipt/Statement.spec.ts index 7f76eeb4af..745ecaf58c 100644 --- a/test/model/receipt/Statement.spec.ts +++ b/test/model/receipt/Statement.spec.ts @@ -31,7 +31,7 @@ // let statementDTO; // before(() => { -// account = Account.createFromPrivateKey('81C18245507F9C15B61BDEDAFA2C10D9DC2C4E401E573A10935D45AA2A461FD5', NetworkType.MIJIN_TEST); +// account = Account.createFromPrivateKey('81C18245507F9C15B61BDEDAFA2C10D9DC2C4E401E573A10935D45AA2A461FD5', NetworkType.PRIVATE_TEST); // transactionStatementsDTO = [ // { // statement: { diff --git a/test/model/transaction/AccountKeyLinkTransaction.spec.ts b/test/model/transaction/AccountKeyLinkTransaction.spec.ts index da3c7698bd..2d7d260ff5 100644 --- a/test/model/transaction/AccountKeyLinkTransaction.spec.ts +++ b/test/model/transaction/AccountKeyLinkTransaction.spec.ts @@ -39,7 +39,7 @@ describe('AccountKeyLinkTransaction', () => { Deadline.create(epochAdjustment), account.publicKey, LinkAction.Link, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); expect(accountKeyLinkTransaction.maxFee.higher).to.be.equal(0); @@ -51,7 +51,7 @@ describe('AccountKeyLinkTransaction', () => { Deadline.create(epochAdjustment), account.publicKey, LinkAction.Link, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, new UInt64([1, 0]), ); @@ -64,7 +64,7 @@ describe('AccountKeyLinkTransaction', () => { Deadline.create(epochAdjustment), account.publicKey, LinkAction.Link, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); expect(accountKeyLinkTransaction.linkAction).to.be.equal(1); @@ -82,7 +82,7 @@ describe('AccountKeyLinkTransaction', () => { Deadline.create(epochAdjustment), account.publicKey, LinkAction.Unlink, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); expect(accountKeyLinkTransaction.linkAction).to.be.equal(0); @@ -101,7 +101,7 @@ describe('AccountKeyLinkTransaction', () => { Deadline.create(epochAdjustment), account.publicKey, LinkAction.Unlink, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); expect(Convert.hexToUint8(accountKeyLinkTransaction.serialize()).length).to.be.equal(accountKeyLinkTransaction.size); expect(accountKeyLinkTransaction.size).to.be.equal(161); @@ -112,7 +112,7 @@ describe('AccountKeyLinkTransaction', () => { Deadline.create(epochAdjustment), account.publicKey, LinkAction.Unlink, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); expect(Convert.hexToUint8(accountKeyLinkTransaction.serialize()).length).to.be.equal(accountKeyLinkTransaction.size); expect(accountKeyLinkTransaction.size).to.be.equal(161); @@ -125,7 +125,7 @@ describe('AccountKeyLinkTransaction', () => { Deadline.create(epochAdjustment), account.publicKey, LinkAction.Unlink, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ).setMaxFee(2); expect(accountKeyLinkTransaction.maxFee.compact()).to.be.equal(322); @@ -138,7 +138,7 @@ describe('AccountKeyLinkTransaction', () => { Deadline.create(epochAdjustment), account.publicKey, LinkAction.Unlink, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); let canNotify = tx.shouldNotifyAccount(account.address); expect(canNotify).to.be.true; diff --git a/test/model/transaction/AccountMetadataTransaction.spec.ts b/test/model/transaction/AccountMetadataTransaction.spec.ts index bcfc8c3cb7..153fceee69 100644 --- a/test/model/transaction/AccountMetadataTransaction.spec.ts +++ b/test/model/transaction/AccountMetadataTransaction.spec.ts @@ -44,7 +44,7 @@ describe('AccountMetadataTransaction', () => { UInt64.fromUint(1000), 1, Convert.uint8ToUtf8(new Uint8Array(10)), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); expect(accountMetadataTransaction.maxFee.higher).to.be.equal(0); @@ -58,7 +58,7 @@ describe('AccountMetadataTransaction', () => { UInt64.fromUint(1000), 1, Convert.uint8ToUtf8(new Uint8Array(10)), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, new UInt64([1, 0]), ); @@ -73,7 +73,7 @@ describe('AccountMetadataTransaction', () => { UInt64.fromUint(1000), 1, Convert.uint8ToUtf8(new Uint8Array(10)), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const signedTransaction = accountMetadataTransaction.signWith(account, generationHash); @@ -91,7 +91,7 @@ describe('AccountMetadataTransaction', () => { UInt64.fromUint(1000), 1, Convert.uint8ToUtf8(new Uint8Array(10)), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); expect(Convert.hexToUint8(accountMetadataTransaction.serialize()).length).to.be.equal(accountMetadataTransaction.size); @@ -108,7 +108,7 @@ describe('AccountMetadataTransaction', () => { UInt64.fromUint(1000), 1, Convert.uint8ToUtf8(new Uint8Array(10)), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); expect(Convert.hexToUint8(accountMetadataTransaction.serialize()).length).to.be.equal(accountMetadataTransaction.size); @@ -125,7 +125,7 @@ describe('AccountMetadataTransaction', () => { UInt64.fromUint(1000), 1, Convert.uint8ToUtf8(new Uint8Array(10)), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); Object.assign(accountMetadataTransaction, { signer: account.publicAccount }); @@ -144,7 +144,7 @@ describe('AccountMetadataTransaction', () => { UInt64.fromUint(1000), 1, Convert.uint8ToUtf8(new Uint8Array(10)), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const resolved = accountMetadataTransaction.resolveAliases(); @@ -160,7 +160,7 @@ describe('AccountMetadataTransaction', () => { UInt64.fromUint(1000), 1, Convert.uint8ToUtf8(new Uint8Array(10)), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); let canNotify = tx.shouldNotifyAccount(account.address, []); @@ -182,7 +182,7 @@ describe('AccountMetadataTransaction', () => { UInt64.fromUint(1000), 1, Convert.uint8ToUtf8(new Uint8Array(10)), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); let canNotify = tx.shouldNotifyAccount(account.address, [alias]); diff --git a/test/model/transaction/AccountRestrictionTransaction.spec.ts b/test/model/transaction/AccountRestrictionTransaction.spec.ts index 738b332fc4..4d03d632a2 100644 --- a/test/model/transaction/AccountRestrictionTransaction.spec.ts +++ b/test/model/transaction/AccountRestrictionTransaction.spec.ts @@ -73,7 +73,7 @@ describe('AccountRestrictionTransaction', () => { AddressRestrictionFlag.AllowIncomingAddress, [address], [], - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); expect(Convert.hexToUint8(addressRestrictionTransaction.serialize()).length).to.be.equal(addressRestrictionTransaction.size); @@ -87,7 +87,7 @@ describe('AccountRestrictionTransaction', () => { MosaicRestrictionFlag.AllowMosaic, [mosaicId], [], - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); expect(mosaicRestrictionTransaction.size).to.be.equal(144); }); @@ -98,7 +98,7 @@ describe('AccountRestrictionTransaction', () => { MosaicRestrictionFlag.AllowMosaic, [mosaicId], [], - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); expect(mosaicRestrictionTransaction.setPayloadSize(10).size).to.be.equal(10); }); @@ -111,7 +111,7 @@ describe('AccountRestrictionTransaction', () => { OperationRestrictionFlag.AllowOutgoingTransactionType, [operation], [], - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); expect(operationRestrictionTransaction.size).to.be.equal(138); }); @@ -123,7 +123,7 @@ describe('AccountRestrictionTransaction', () => { AddressRestrictionFlag.AllowIncomingAddress, [address], [], - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); expect(addressRestrictionTransaction.maxFee.higher).to.be.equal(0); @@ -137,7 +137,7 @@ describe('AccountRestrictionTransaction', () => { AddressRestrictionFlag.AllowIncomingAddress, [address], [], - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, new UInt64([1, 0]), ); @@ -152,7 +152,7 @@ describe('AccountRestrictionTransaction', () => { AddressRestrictionFlag.AllowIncomingAddress, [address], [], - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const signedTransaction = addressRestrictionTransaction.signWith(account, generationHash); @@ -169,7 +169,7 @@ describe('AccountRestrictionTransaction', () => { MosaicRestrictionFlag.AllowMosaic, [mosaicId], [], - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const signedTransaction = mosaicRestrictionTransaction.signWith(account, generationHash); @@ -184,7 +184,7 @@ describe('AccountRestrictionTransaction', () => { OperationRestrictionFlag.AllowOutgoingTransactionType, [operation], [], - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const signedTransaction = operationRestrictionTransaction.signWith(account, generationHash); @@ -199,7 +199,7 @@ describe('AccountRestrictionTransaction', () => { AddressRestrictionFlag.AllowOutgoingAddress, [address], [], - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); let signedTransaction = addressRestrictionTransaction.signWith(account, generationHash); @@ -213,7 +213,7 @@ describe('AccountRestrictionTransaction', () => { AddressRestrictionFlag.BlockOutgoingAddress, [address], [], - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); signedTransaction = addressRestrictionTransaction.signWith(account, generationHash); @@ -230,7 +230,7 @@ describe('AccountRestrictionTransaction', () => { OperationRestrictionFlag.AllowOutgoingTransactionType, [operation], [], - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); let signedTransaction = operationRestrictionTransaction.signWith(account, generationHash); @@ -242,7 +242,7 @@ describe('AccountRestrictionTransaction', () => { OperationRestrictionFlag.BlockOutgoingTransactionType, [operation], [], - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); signedTransaction = operationRestrictionTransaction.signWith(account, generationHash); @@ -257,7 +257,7 @@ describe('AccountRestrictionTransaction', () => { AddressRestrictionFlag.AllowOutgoingAddress, [address], [], - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); let canNotify = tx.shouldNotifyAccount(address, []); expect(canNotify).to.be.true; @@ -273,7 +273,7 @@ describe('AccountRestrictionTransaction', () => { AddressRestrictionFlag.AllowOutgoingAddress, [], [address], - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); let canNotifyDeletion = txDeletion.shouldNotifyAccount(address, []); expect(canNotifyDeletion).to.be.true; @@ -293,7 +293,7 @@ describe('AccountRestrictionTransaction', () => { AddressRestrictionFlag.AllowOutgoingAddress, [alias], [], - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); let canNotify = tx.shouldNotifyAccount(account.address, [alias]); expect(canNotify).to.be.true; @@ -309,7 +309,7 @@ describe('AccountRestrictionTransaction', () => { AddressRestrictionFlag.AllowOutgoingAddress, [], [alias], - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); let canNotifyDeletion = txDeletion.shouldNotifyAccount(account.address, [alias]); expect(canNotifyDeletion).to.be.true; diff --git a/test/model/transaction/AddressAliasTransaction.spec.ts b/test/model/transaction/AddressAliasTransaction.spec.ts index 707d70c5d1..8e2923ff76 100644 --- a/test/model/transaction/AddressAliasTransaction.spec.ts +++ b/test/model/transaction/AddressAliasTransaction.spec.ts @@ -44,7 +44,7 @@ describe('AddressAliasTransaction', () => { AliasAction.Link, namespaceId, address, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); expect(addressAliasTransaction.maxFee.higher).to.be.equal(0); @@ -59,7 +59,7 @@ describe('AddressAliasTransaction', () => { AliasAction.Link, namespaceId, address, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, new UInt64([1, 0]), ); @@ -75,7 +75,7 @@ describe('AddressAliasTransaction', () => { AliasAction.Link, namespaceId, address, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); expect(addressAliasTransaction.aliasAction).to.be.equal(AliasAction.Link); @@ -98,7 +98,7 @@ describe('AddressAliasTransaction', () => { AliasAction.Link, namespaceId, address, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ) as AddressAliasTransaction; expect(addressAliasTransaction.aliasAction).to.be.equal(AliasAction.Link); @@ -122,7 +122,7 @@ describe('AddressAliasTransaction', () => { AliasAction.Link, namespaceId, address, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); expect(Convert.hexToUint8(addressAliasTransaction.serialize()).length).to.be.equal(addressAliasTransaction.size); expect(addressAliasTransaction.size).to.be.equal(161); @@ -136,7 +136,7 @@ describe('AddressAliasTransaction', () => { AliasAction.Link, namespaceId, address, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); expect(Convert.hexToUint8(addressAliasTransaction.serialize()).length).to.be.equal(addressAliasTransaction.size); expect(addressAliasTransaction.size).to.be.equal(161); @@ -152,7 +152,7 @@ describe('AddressAliasTransaction', () => { AliasAction.Link, namespaceId, address, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ).setMaxFee(2); expect(addressAliasTransaction.maxFee.compact()).to.be.equal(322); }); @@ -165,7 +165,7 @@ describe('AddressAliasTransaction', () => { AliasAction.Link, namespaceId, address, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); let canNotify = tx.shouldNotifyAccount(address); diff --git a/test/model/transaction/AggregateTransaction.spec.ts b/test/model/transaction/AggregateTransaction.spec.ts index 829ac08dc1..75656985e6 100644 --- a/test/model/transaction/AggregateTransaction.spec.ts +++ b/test/model/transaction/AggregateTransaction.spec.ts @@ -85,13 +85,13 @@ describe('AggregateTransaction', () => { Address.createFromRawAddress('SATNE7Q5BITMUTRRN6IB4I7FLSDRDWZA34I2PMQ'), [], PlainMessage.create('test-message'), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const aggregateTransaction = AggregateTransaction.createComplete( Deadline.create(epochAdjustment), [transferTransaction.toAggregate(account.publicAccount)], - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, [], ); @@ -105,13 +105,13 @@ describe('AggregateTransaction', () => { Address.createFromRawAddress('SATNE7Q5BITMUTRRN6IB4I7FLSDRDWZA34I2PMQ'), [], PlainMessage.create('test-message'), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const aggregateTransaction = AggregateTransaction.createComplete( Deadline.create(epochAdjustment), [transferTransaction.toAggregate(account.publicAccount)], - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, [], new UInt64([1, 0]), ); @@ -126,13 +126,13 @@ describe('AggregateTransaction', () => { Address.createFromRawAddress('SATNE7Q5BITMUTRRN6IB4I7FLSDRDWZA34I2PMQ'), [], PlainMessage.create('test-message'), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const aggregateTransaction = AggregateTransaction.createComplete( Deadline.create(epochAdjustment), [transferTransaction.toAggregate(account.publicAccount)], - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, [], ); @@ -148,13 +148,13 @@ describe('AggregateTransaction', () => { Deadline.create(epochAdjustment), 'root-test-namespace', UInt64.fromUint(1000), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const aggregateTransaction = AggregateTransaction.createComplete( Deadline.create(epochAdjustment), [registerNamespaceTransaction.toAggregate(account.publicAccount)], - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, [], ); @@ -175,13 +175,13 @@ describe('AggregateTransaction', () => { MosaicFlags.create(true, true, true), 3, UInt64.fromUint(1000), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const aggregateTransaction = AggregateTransaction.createComplete( Deadline.create(epochAdjustment), [mosaicDefinitionTransaction.toAggregate(account.publicAccount)], - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, [], ); @@ -201,13 +201,13 @@ describe('AggregateTransaction', () => { mosaicId, MosaicSupplyChangeAction.Increase, UInt64.fromUint(10), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const aggregateTransaction = AggregateTransaction.createComplete( Deadline.create(epochAdjustment), [mosaicSupplyChangeTransaction.toAggregate(account.publicAccount)], - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, [], ); @@ -226,16 +226,16 @@ describe('AggregateTransaction', () => { 2, 1, [ - Address.createFromPublicKey('B0F93CBEE49EEB9953C6F3985B15A4F238E205584D8F924C621CBE4D7AC6EC24', NetworkType.MIJIN_TEST), - Address.createFromPublicKey('B1B5581FC81A6970DEE418D2C2978F2724228B7B36C5C6DF71B0162BB04778B4', NetworkType.MIJIN_TEST), + Address.createFromPublicKey('B0F93CBEE49EEB9953C6F3985B15A4F238E205584D8F924C621CBE4D7AC6EC24', NetworkType.PRIVATE_TEST), + Address.createFromPublicKey('B1B5581FC81A6970DEE418D2C2978F2724228B7B36C5C6DF71B0162BB04778B4', NetworkType.PRIVATE_TEST), ], [], - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const aggregateTransaction = AggregateTransaction.createComplete( Deadline.create(epochAdjustment), [modifyMultisigAccountTransaction.toAggregate(account.publicAccount)], - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, [], ); @@ -254,12 +254,12 @@ describe('AggregateTransaction', () => { Address.createFromRawAddress('SATNE7Q5BITMUTRRN6IB4I7FLSDRDWZA34I2PMQ'), [], PlainMessage.create('test-message'), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const aggregateTransaction = AggregateTransaction.createComplete( Deadline.create(epochAdjustment), [transferTransaction.toAggregate(MultisigAccount.publicAccount)], - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, [], ); const signedTransaction = CosignatoryAccount.signTransactionWithCosignatories( @@ -282,13 +282,13 @@ describe('AggregateTransaction', () => { Address.createFromRawAddress('SATNE7Q5BITMUTRRN6IB4I7FLSDRDWZA34I2PMQ'), [], PlainMessage.create('test-message'), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const aggregateTransaction = AggregateTransaction.createBonded( Deadline.create(epochAdjustment, 2, ChronoUnit.MINUTES), [transferTransaction.toAggregate(account.publicAccount)], - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, [], ); @@ -363,7 +363,7 @@ describe('AggregateTransaction', () => { aggregateTransaction.signedByAccount( PublicAccount.createFromPublicKey( 'A5F82EC8EBB341427B6785C8111906CD0DF18838FB11B51CE0E18B5E79DFF630', - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ), ), ).to.be.equal(true); @@ -371,7 +371,7 @@ describe('AggregateTransaction', () => { aggregateTransaction.signedByAccount( PublicAccount.createFromPublicKey( '7681ED5023141D9CDCF184E5A7B60B7D466739918ED5DA30F7E71EA7B86EFF2D', - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ), ), ).to.be.equal(true); @@ -379,7 +379,7 @@ describe('AggregateTransaction', () => { aggregateTransaction.signedByAccount( PublicAccount.createFromPublicKey( 'B4F12E7C9F6946091E2CB8B6D3A12B50D17CCBBF646386EA27CE2946A7423DCF', - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ), ), ).to.be.equal(false); @@ -392,13 +392,18 @@ describe('AggregateTransaction', () => { }); it("should have type 0x4141 when it's complete", () => { - const aggregateTransaction = AggregateTransaction.createComplete(Deadline.create(epochAdjustment), [], NetworkType.MIJIN_TEST, []); + const aggregateTransaction = AggregateTransaction.createComplete( + Deadline.create(epochAdjustment), + [], + NetworkType.PRIVATE_TEST, + [], + ); expect(aggregateTransaction.type).to.be.equal(0x4141); }); it("should have type 0x4241 when it's bonded", () => { - const aggregateTransaction = AggregateTransaction.createBonded(Deadline.create(epochAdjustment), [], NetworkType.MIJIN_TEST); + const aggregateTransaction = AggregateTransaction.createBonded(Deadline.create(epochAdjustment), [], NetworkType.PRIVATE_TEST); expect(aggregateTransaction.type).to.be.equal(0x4241); }); @@ -409,13 +414,13 @@ describe('AggregateTransaction', () => { Address.createFromRawAddress('SATNE7Q5BITMUTRRN6IB4I7FLSDRDWZA34I2PMQ'), [], PlainMessage.create('test-message'), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const aggregateTransaction = AggregateTransaction.createComplete( Deadline.create(epochAdjustment), [transferTransaction.toAggregate(account.publicAccount)], - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, [], ); @@ -423,7 +428,7 @@ describe('AggregateTransaction', () => { AggregateTransaction.createComplete( Deadline.create(epochAdjustment), [aggregateTransaction.toAggregate(account.publicAccount)], - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, [], ); }).to.throw(Error, 'Inner transaction cannot be an aggregated transaction.'); @@ -442,21 +447,21 @@ describe('AggregateTransaction', () => { accountBob.address, [], PlainMessage.create('a to b'), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const BtoATx = TransferTransaction.create( Deadline.create(epochAdjustment), accountAlice.address, [], PlainMessage.create('b to a'), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const CtoATx = TransferTransaction.create( Deadline.create(epochAdjustment), accountAlice.address, [], PlainMessage.create('c to a'), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); // 01. Alice creates the aggregated tx and sign it, Then payload send to Bob & Carol @@ -467,7 +472,7 @@ describe('AggregateTransaction', () => { BtoATx.toAggregate(accountBob.publicAccount), CtoATx.toAggregate(accountCarol.publicAccount), ], - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, [], ); @@ -512,19 +517,19 @@ describe('AggregateTransaction', () => { account.address, [], PlainMessage.create('a to b'), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const transferTx2 = TransferTransaction.create( Deadline.create(epochAdjustment), account.address, [], PlainMessage.create('b to a'), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); let aggregateTransaction = AggregateTransaction.createComplete( Deadline.create(epochAdjustment), [transferTx1.toAggregate(account.publicAccount)], - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, [], ); @@ -543,12 +548,12 @@ describe('AggregateTransaction', () => { account.address, [], PlainMessage.create('a to b'), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); let aggregateTransaction = AggregateTransaction.createComplete( Deadline.create(epochAdjustment), [transferTx1.toAggregate(account.publicAccount)], - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, [], ); @@ -559,7 +564,7 @@ describe('AggregateTransaction', () => { const signedTransaction = aggregateTransaction.signWith(account, generationHash); const cosignature = new AggregateTransactionCosignature( signedTransaction.payload, - PublicAccount.createFromPublicKey(signedTransaction.signerPublicKey, NetworkType.MIJIN_TEST), + PublicAccount.createFromPublicKey(signedTransaction.signerPublicKey, NetworkType.PRIVATE_TEST), ); aggregateTransaction = aggregateTransaction.addCosignatures([cosignature]); @@ -575,12 +580,12 @@ describe('AggregateTransaction', () => { Address.createFromRawAddress('SATNE7Q5BITMUTRRN6IB4I7FLSDRDWZA34I2PMQ'), [NetworkCurrencyLocal.createRelative(100)], PlainMessage.create('NEM'), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const aggregateTransaction = AggregateTransaction.createBonded( Deadline.create(epochAdjustment), [transaction.toAggregate(account.publicAccount)], - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, [], ); expect(Convert.hexToUint8(aggregateTransaction.serialize()).length).to.be.equal(aggregateTransaction.size); @@ -592,12 +597,12 @@ describe('AggregateTransaction', () => { Address.createFromRawAddress('SATNE7Q5BITMUTRRN6IB4I7FLSDRDWZA34I2PMQ'), [NetworkCurrencyLocal.createRelative(100)], PlainMessage.create('NEM'), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const aggregateTransaction = AggregateTransaction.createBonded( Deadline.create(epochAdjustment), [transaction.toAggregate(account.publicAccount)], - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, [], ); expect(aggregateTransaction.size).to.be.equal(272); @@ -612,13 +617,13 @@ describe('AggregateTransaction', () => { unresolvedAddress, [new Mosaic(unresolvedMosaicId, UInt64.fromUint(1))], PlainMessage.create('test-message'), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const aggregateTransaction = AggregateTransaction.createComplete( Deadline.create(epochAdjustment), [transferTransaction.toAggregate(account.publicAccount)], - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, [], ).setMaxFeeForAggregate(2, 10); expect(aggregateTransaction.maxFee.compact()).to.be.equal(560 + 960 * 2); @@ -633,14 +638,14 @@ describe('AggregateTransaction', () => { unresolvedAddress, [new Mosaic(unresolvedMosaicId, UInt64.fromUint(1))], PlainMessage.create('test-message'), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); expect(() => { AggregateTransaction.createComplete( Deadline.create(epochAdjustment), [transferTransaction.toAggregate(account.publicAccount)], - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, [], ).setMaxFee(2); }).to.throw(); @@ -648,7 +653,7 @@ describe('AggregateTransaction', () => { it('Test resolveAlias can resolve', () => { const transferTransaction = new TransferTransaction( - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, 1, Deadline.createFromDTO('1'), UInt64.fromUint(0), @@ -661,7 +666,7 @@ describe('AggregateTransaction', () => { ); const aggregateTransaction = new AggregateTransaction( - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, TransactionType.AGGREGATE_COMPLETE, 1, Deadline.createFromDTO('1'), @@ -688,12 +693,12 @@ describe('AggregateTransaction', () => { account.address, [new Mosaic(unresolvedMosaicId, UInt64.fromUint(1))], PlainMessage.create('test-message'), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const tx = AggregateTransaction.createComplete( Deadline.create(epochAdjustment), [transferTransaction.toAggregate(account.publicAccount)], - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, [], ); let canNotify = tx.shouldNotifyAccount(account.address, []); @@ -712,12 +717,12 @@ describe('AggregateTransaction', () => { unresolvedAddress, [new Mosaic(unresolvedMosaicId, UInt64.fromUint(1))], PlainMessage.create('test-message'), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const tx = AggregateTransaction.createComplete( Deadline.create(epochAdjustment), [transferTransaction.toAggregate(account.publicAccount)], - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, [], ); let canNotify = tx.shouldNotifyAccount(Address.createFromRawAddress('SATNE7Q5BITMUTRRN6IB4I7FLSDRDWZA34I2PMQ'), [ diff --git a/test/model/transaction/CosignatureTransaction.spec.ts b/test/model/transaction/CosignatureTransaction.spec.ts index aabaaf5bf4..76d552f7a9 100644 --- a/test/model/transaction/CosignatureTransaction.spec.ts +++ b/test/model/transaction/CosignatureTransaction.spec.ts @@ -112,7 +112,7 @@ describe('CosignatureTransaction', () => { account.address, [], PlainMessage.create('a to b'), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ).serialize(); const signedTx = CosignatureTransaction.signTransactionPayload(account, txPayload, generationHash); @@ -128,13 +128,13 @@ describe('CosignatureTransaction', () => { account.address, [], PlainMessage.create('a to b'), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const aggregate = AggregateTransaction.createComplete( Deadline.create(epochAdjustment), [tx.toAggregate(account.publicAccount)], - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, [], ); const txHash = '9801508C58666C746F471538E43002B85B1CD542F9874B2861183919BA8787B6'; @@ -155,13 +155,13 @@ describe('CosignatureTransaction', () => { account.address, [], PlainMessage.create('a to b'), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const aggregate = AggregateTransaction.createComplete( Deadline.create(epochAdjustment), [tx.toAggregate(account.publicAccount)], - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, [], ); const cosignTx = new CosignatureTransaction(aggregate); diff --git a/test/model/transaction/HashLockTransaction.spec.ts b/test/model/transaction/HashLockTransaction.spec.ts index b361138e11..e43cf1fe14 100644 --- a/test/model/transaction/HashLockTransaction.spec.ts +++ b/test/model/transaction/HashLockTransaction.spec.ts @@ -29,14 +29,14 @@ describe('HashLockTransaction', () => { const generationHash = '57F7DA205008026C776CB6AED843393F04CD458E0AA2D9F1D5F31A402072B2D6'; const epochAdjustment = Duration.ofSeconds(1573430400); it('creation with an aggregate bonded tx', () => { - const aggregateTransaction = AggregateTransaction.createBonded(Deadline.create(epochAdjustment), [], NetworkType.MIJIN_TEST, []); + const aggregateTransaction = AggregateTransaction.createBonded(Deadline.create(epochAdjustment), [], NetworkType.PRIVATE_TEST, []); const signedTransaction = account.sign(aggregateTransaction, generationHash); const transaction = HashLockTransaction.create( Deadline.create(epochAdjustment), NetworkCurrencyLocal.createRelative(10), UInt64.fromUint(10), signedTransaction, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); expect(transaction.mosaic.id).to.be.equal(NetworkCurrencyLocal.NAMESPACE_ID); expect(transaction.mosaic.amount.compact()).to.be.equal(10000000); @@ -45,7 +45,12 @@ describe('HashLockTransaction', () => { }); it('should throw exception if it is not a aggregate bonded tx', () => { - const aggregateTransaction = AggregateTransaction.createComplete(Deadline.create(epochAdjustment), [], NetworkType.MIJIN_TEST, []); + const aggregateTransaction = AggregateTransaction.createComplete( + Deadline.create(epochAdjustment), + [], + NetworkType.PRIVATE_TEST, + [], + ); const signedTransaction = account.sign(aggregateTransaction, generationHash); expect(() => { HashLockTransaction.create( @@ -53,20 +58,20 @@ describe('HashLockTransaction', () => { NetworkCurrencyLocal.createRelative(10), UInt64.fromUint(10), signedTransaction, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); }).to.throw(Error); }); it('Notify Account', () => { - const aggregateTransaction = AggregateTransaction.createBonded(Deadline.create(epochAdjustment), [], NetworkType.MIJIN_TEST, []); + const aggregateTransaction = AggregateTransaction.createBonded(Deadline.create(epochAdjustment), [], NetworkType.PRIVATE_TEST, []); const signedTransaction = account.sign(aggregateTransaction, generationHash); const tx = HashLockTransaction.create( Deadline.create(epochAdjustment), NetworkCurrencyLocal.createRelative(10), UInt64.fromUint(10), signedTransaction, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); Object.assign(tx, { signer: account.publicAccount }); diff --git a/test/model/transaction/LockFundsTransaction.spec.ts b/test/model/transaction/LockFundsTransaction.spec.ts index d36ea5104f..df11b7d171 100644 --- a/test/model/transaction/LockFundsTransaction.spec.ts +++ b/test/model/transaction/LockFundsTransaction.spec.ts @@ -56,14 +56,14 @@ describe('LockFundsTransaction', () => { }); it('should default maxFee field be set to 0', () => { - const aggregateTransaction = AggregateTransaction.createBonded(Deadline.create(epochAdjustment), [], NetworkType.MIJIN_TEST, []); + const aggregateTransaction = AggregateTransaction.createBonded(Deadline.create(epochAdjustment), [], NetworkType.PRIVATE_TEST, []); const signedTransaction = account.sign(aggregateTransaction, generationHash); const lockFundsTransaction = LockFundsTransaction.create( Deadline.create(epochAdjustment), NetworkCurrencyLocal.createRelative(10), UInt64.fromUint(10), signedTransaction, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); expect(lockFundsTransaction.maxFee.higher).to.be.equal(0); @@ -72,14 +72,14 @@ describe('LockFundsTransaction', () => { }); it('should filled maxFee override transaction maxFee', () => { - const aggregateTransaction = AggregateTransaction.createBonded(Deadline.create(epochAdjustment), [], NetworkType.MIJIN_TEST, []); + const aggregateTransaction = AggregateTransaction.createBonded(Deadline.create(epochAdjustment), [], NetworkType.PRIVATE_TEST, []); const signedTransaction = account.sign(aggregateTransaction, generationHash); const lockFundsTransaction = LockFundsTransaction.create( Deadline.create(epochAdjustment), NetworkCurrencyLocal.createRelative(10), UInt64.fromUint(10), signedTransaction, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, new UInt64([1, 0]), ); @@ -88,14 +88,14 @@ describe('LockFundsTransaction', () => { }); it('creation with an aggregate bonded tx', () => { - const aggregateTransaction = AggregateTransaction.createBonded(Deadline.create(epochAdjustment), [], NetworkType.MIJIN_TEST, []); + const aggregateTransaction = AggregateTransaction.createBonded(Deadline.create(epochAdjustment), [], NetworkType.PRIVATE_TEST, []); const signedTransaction = account.sign(aggregateTransaction, generationHash); const transaction = LockFundsTransaction.create( Deadline.create(epochAdjustment), NetworkCurrencyLocal.createRelative(10), UInt64.fromUint(10), signedTransaction, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); deepEqual(transaction.mosaic.id.id, NetworkCurrencyLocal.NAMESPACE_ID.id); expect(transaction.mosaic.amount.compact()).to.be.equal(10000000); @@ -103,7 +103,12 @@ describe('LockFundsTransaction', () => { }); it('should throw exception if it is not a aggregate bonded tx', () => { - const aggregateTransaction = AggregateTransaction.createComplete(Deadline.create(epochAdjustment), [], NetworkType.MIJIN_TEST, []); + const aggregateTransaction = AggregateTransaction.createComplete( + Deadline.create(epochAdjustment), + [], + NetworkType.PRIVATE_TEST, + [], + ); const signedTransaction = account.sign(aggregateTransaction, generationHash); expect(() => { LockFundsTransaction.create( @@ -111,20 +116,20 @@ describe('LockFundsTransaction', () => { NetworkCurrencyLocal.createRelative(10), UInt64.fromUint(10), signedTransaction, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); }).to.throw(Error); }); it('should create and sign LockFundsTransaction', () => { - const aggregateTransaction = AggregateTransaction.createBonded(Deadline.create(epochAdjustment), [], NetworkType.MIJIN_TEST, []); + const aggregateTransaction = AggregateTransaction.createBonded(Deadline.create(epochAdjustment), [], NetworkType.PRIVATE_TEST, []); const signedTransaction = account.sign(aggregateTransaction, generationHash); const lockFundsTransaction = LockFundsTransaction.create( Deadline.create(epochAdjustment), NetworkCurrencyLocal.createRelative(10), UInt64.fromUint(10), signedTransaction, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const signedTx = lockFundsTransaction.signWith(account, generationHash); @@ -138,7 +143,7 @@ describe('LockFundsTransaction', () => { const aggregateTransaction = AggregateTransaction.createBonded( Deadline.create(epochAdjustment), [], - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, [], ); const signedTransaction = account.sign(aggregateTransaction, generationHash); @@ -147,7 +152,7 @@ describe('LockFundsTransaction', () => { NetworkCurrencyLocal.createRelative(10), UInt64.fromUint(10), signedTransaction, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); expect(lockFundsTransaction.size).to.be.equal(184); }); @@ -156,7 +161,7 @@ describe('LockFundsTransaction', () => { const aggregateTransaction = AggregateTransaction.createBonded( Deadline.create(epochAdjustment), [], - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, [], ); const signedTransaction = account.sign(aggregateTransaction, generationHash); @@ -165,7 +170,7 @@ describe('LockFundsTransaction', () => { NetworkCurrencyLocal.createRelative(10), UInt64.fromUint(10), signedTransaction, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); expect(lockFundsTransaction.size).to.be.equal(184); expect(lockFundsTransaction.setPayloadSize(10).size).to.be.equal(10); @@ -173,14 +178,14 @@ describe('LockFundsTransaction', () => { }); it('Test set maxFee using multiplier', () => { - const aggregateTransaction = AggregateTransaction.createBonded(Deadline.create(epochAdjustment), [], NetworkType.MIJIN_TEST, []); + const aggregateTransaction = AggregateTransaction.createBonded(Deadline.create(epochAdjustment), [], NetworkType.PRIVATE_TEST, []); const signedTransaction = account.sign(aggregateTransaction, generationHash); const lockFundsTransaction = LockFundsTransaction.create( Deadline.create(epochAdjustment), NetworkCurrencyLocal.createRelative(10), UInt64.fromUint(10), signedTransaction, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ).setMaxFee(2); expect(lockFundsTransaction.maxFee.compact()).to.be.equal(368); @@ -189,10 +194,10 @@ describe('LockFundsTransaction', () => { }); it('Test resolveAlias can resolve', () => { - const aggregateTransaction = AggregateTransaction.createBonded(Deadline.create(epochAdjustment), [], NetworkType.MIJIN_TEST, []); + const aggregateTransaction = AggregateTransaction.createBonded(Deadline.create(epochAdjustment), [], NetworkType.PRIVATE_TEST, []); const signedTransaction = account.sign(aggregateTransaction, generationHash); const transaction = new LockFundsTransaction( - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, 1, Deadline.createFromDTO('1'), UInt64.fromUint(0), @@ -211,14 +216,14 @@ describe('LockFundsTransaction', () => { }); it('Notify Account', () => { - const aggregateTransaction = AggregateTransaction.createBonded(Deadline.create(epochAdjustment), [], NetworkType.MIJIN_TEST, []); + const aggregateTransaction = AggregateTransaction.createBonded(Deadline.create(epochAdjustment), [], NetworkType.PRIVATE_TEST, []); const signedTransaction = account.sign(aggregateTransaction, generationHash); const tx = LockFundsTransaction.create( Deadline.create(epochAdjustment), NetworkCurrencyLocal.createRelative(10), UInt64.fromUint(10), signedTransaction, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); Object.assign(tx, { signer: account.publicAccount }); diff --git a/test/model/transaction/MosaicAddressRestrictionTransaction.spec.ts b/test/model/transaction/MosaicAddressRestrictionTransaction.spec.ts index c4ce9023ba..ddff2a4e6d 100644 --- a/test/model/transaction/MosaicAddressRestrictionTransaction.spec.ts +++ b/test/model/transaction/MosaicAddressRestrictionTransaction.spec.ts @@ -66,7 +66,7 @@ describe('MosaicAddressRestrictionTransaction', () => { UInt64.fromUint(1), account.address, UInt64.fromUint(8), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, UInt64.fromUint(9), ); expect(mosaicAddressRestrictionTransaction.mosaicId.toHex()).to.be.equal(mosaicId.toHex()); @@ -90,7 +90,7 @@ describe('MosaicAddressRestrictionTransaction', () => { UInt64.fromUint(1), account.address, UInt64.fromUint(8), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, UInt64.fromUint(9), ); expect(mosaicAddressRestrictionTransaction.mosaicId.toHex()).to.be.equal(namespacId.toHex()); @@ -115,7 +115,7 @@ describe('MosaicAddressRestrictionTransaction', () => { UInt64.fromUint(1), namespacId, UInt64.fromUint(8), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, UInt64.fromUint(9), ); expect(mosaicAddressRestrictionTransaction.mosaicId.toHex()).to.be.equal(mosaicId.toHex()); @@ -138,7 +138,7 @@ describe('MosaicAddressRestrictionTransaction', () => { UInt64.fromUint(1), new NamespaceId('nem.owner'), UInt64.fromUint(8), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, UInt64.fromUint(9), ); @@ -159,7 +159,7 @@ describe('MosaicAddressRestrictionTransaction', () => { UInt64.fromUint(1), new NamespaceId('nem.owner'), UInt64.fromUint(8), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, UInt64.fromUint(9), ).setMaxFee(2); expect(transaction.maxFee.compact()).to.be.equal(368); @@ -170,7 +170,7 @@ describe('MosaicAddressRestrictionTransaction', () => { it('Test resolveAlias can resolve', () => { const transaction = new MosaicAddressRestrictionTransaction( - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, 1, Deadline.createFromDTO('1'), UInt64.fromUint(0), diff --git a/test/model/transaction/MosaicAliasTransaction.spec.ts b/test/model/transaction/MosaicAliasTransaction.spec.ts index 787b8c9aeb..46dcabfdce 100644 --- a/test/model/transaction/MosaicAliasTransaction.spec.ts +++ b/test/model/transaction/MosaicAliasTransaction.spec.ts @@ -47,7 +47,7 @@ describe('MosaicAliasTransaction', () => { AliasAction.Link, namespaceId, mosaicId, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); expect(mosaicAliasTransaction.maxFee.higher).to.be.equal(0); @@ -62,7 +62,7 @@ describe('MosaicAliasTransaction', () => { AliasAction.Link, namespaceId, mosaicId, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, new UInt64([1, 0]), ); @@ -78,7 +78,7 @@ describe('MosaicAliasTransaction', () => { AliasAction.Link, namespaceId, mosaicId, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); expect(mosaicAliasTransaction.aliasAction).to.be.equal(AliasAction.Link); @@ -102,7 +102,7 @@ describe('MosaicAliasTransaction', () => { AliasAction.Link, namespaceId, mosaicId, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ) as MosaicAliasTransaction; expect(mosaicAliasTransaction.aliasAction).to.be.equal(AliasAction.Link); @@ -127,7 +127,7 @@ describe('MosaicAliasTransaction', () => { AliasAction.Link, namespaceId, mosaicId, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); expect(mosaicAliasTransaction.size).to.be.equal(145); expect(Convert.hexToUint8(mosaicAliasTransaction.serialize()).length).to.be.equal(mosaicAliasTransaction.size); @@ -140,7 +140,7 @@ describe('MosaicAliasTransaction', () => { AliasAction.Link, namespaceId, mosaicId, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); expect(mosaicAliasTransaction.size).to.be.equal(145); expect(Convert.hexToUint8(mosaicAliasTransaction.serialize()).length).to.be.equal(mosaicAliasTransaction.size); @@ -156,7 +156,7 @@ describe('MosaicAliasTransaction', () => { AliasAction.Link, namespaceId, mosaicId, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ).setMaxFee(2); expect(mosaicAliasTransaction.maxFee.compact()).to.be.equal(290); @@ -172,7 +172,7 @@ describe('MosaicAliasTransaction', () => { AliasAction.Link, namespaceId, mosaicId, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const resolved = mosaicAliasTransaction.resolveAliases(); deepEqual(mosaicAliasTransaction, resolved); @@ -186,7 +186,7 @@ describe('MosaicAliasTransaction', () => { AliasAction.Link, namespaceId, mosaicId, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); Object.assign(mosaicAliasTransaction, { signer: account.publicAccount }); @@ -206,7 +206,7 @@ describe('MosaicAliasTransaction', () => { AliasAction.Link, namespaceId, mosaicId, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); Object.assign(tx, { signer: account.publicAccount }); diff --git a/test/model/transaction/MosaicDefinitionTransaction.spec.ts b/test/model/transaction/MosaicDefinitionTransaction.spec.ts index 1b1e6ecef3..9b7f28bbf7 100644 --- a/test/model/transaction/MosaicDefinitionTransaction.spec.ts +++ b/test/model/transaction/MosaicDefinitionTransaction.spec.ts @@ -43,7 +43,7 @@ describe('MosaicDefinitionTransaction', () => { MosaicFlags.create(true, true, true), 3, UInt64.fromUint(1000), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); expect(mosaicDefinitionTransaction.maxFee.higher).to.be.equal(0); @@ -58,7 +58,7 @@ describe('MosaicDefinitionTransaction', () => { MosaicFlags.create(true, true, true), 3, UInt64.fromUint(1000), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, new UInt64([1, 0]), ); @@ -74,7 +74,7 @@ describe('MosaicDefinitionTransaction', () => { MosaicFlags.create(true, true, true), 3, UInt64.fromUint(1000), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); expect(mosaicDefinitionTransaction.duration!.lower).to.be.equal(1000); @@ -99,7 +99,7 @@ describe('MosaicDefinitionTransaction', () => { MosaicFlags.create(false, false, false), 3, UInt64.fromUint(1000), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); expect(mosaicDefinitionTransaction.duration!.lower).to.be.equal(1000); @@ -125,7 +125,7 @@ describe('MosaicDefinitionTransaction', () => { MosaicFlags.create(true, true, false), 3, UInt64.fromUint(1000), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); expect(mosaicDefinitionTransaction.size).to.be.equal(150); expect(Convert.hexToUint8(mosaicDefinitionTransaction.serialize()).length).to.be.equal(mosaicDefinitionTransaction.size); @@ -138,7 +138,7 @@ describe('MosaicDefinitionTransaction', () => { MosaicFlags.create(true, true, false), 3, UInt64.fromUint(1000), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); expect(mosaicDefinitionTransaction.size).to.be.equal(150); expect(Convert.hexToUint8(mosaicDefinitionTransaction.serialize()).length).to.be.equal(mosaicDefinitionTransaction.size); @@ -154,7 +154,7 @@ describe('MosaicDefinitionTransaction', () => { MosaicFlags.create(false, false, false), 3, UInt64.fromUint(0), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); expect(mosaicDefinitionTransaction.divisibility).to.be.equal(3); @@ -177,7 +177,7 @@ describe('MosaicDefinitionTransaction', () => { MosaicFlags.create(false, false, false), 3, UInt64.fromUint(0), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ).setMaxFee(2); expect(mosaicDefinitionTransaction.maxFee.compact()).to.be.equal(300); @@ -193,7 +193,7 @@ describe('MosaicDefinitionTransaction', () => { MosaicFlags.create(false, false, false), 3, UInt64.fromUint(0), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); Object.assign(tx, { signer: account.publicAccount }); diff --git a/test/model/transaction/MosaicGlobalRestrictionTransaction.spec.ts b/test/model/transaction/MosaicGlobalRestrictionTransaction.spec.ts index fd468036cb..344fc02e86 100644 --- a/test/model/transaction/MosaicGlobalRestrictionTransaction.spec.ts +++ b/test/model/transaction/MosaicGlobalRestrictionTransaction.spec.ts @@ -64,7 +64,7 @@ describe('MosaicGlobalRestrictionTransaction', () => { MosaicRestrictionType.EQ, UInt64.fromUint(8), MosaicRestrictionType.GE, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, referenceMosaicId, ); @@ -94,7 +94,7 @@ describe('MosaicGlobalRestrictionTransaction', () => { MosaicRestrictionType.EQ, UInt64.fromUint(8), MosaicRestrictionType.GE, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, referenceMosaicId, ); @@ -128,7 +128,7 @@ describe('MosaicGlobalRestrictionTransaction', () => { MosaicRestrictionType.EQ, UInt64.fromUint(8), MosaicRestrictionType.GE, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, namespacId, ); @@ -158,7 +158,7 @@ describe('MosaicGlobalRestrictionTransaction', () => { MosaicRestrictionType.EQ, UInt64.fromUint(8), MosaicRestrictionType.GE, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, referenceMosaicId, ).setMaxFee(2); expect(mosaicGlobalRestrictionTransaction.maxFee.compact()).to.be.equal(340); @@ -169,7 +169,7 @@ describe('MosaicGlobalRestrictionTransaction', () => { it('Test resolveAlias can resolve', () => { const mosaicGlobalRestrictionTransaction = new MosaicGlobalRestrictionTransaction( - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, 1, Deadline.createFromDTO('1'), UInt64.fromUint(0), @@ -204,7 +204,7 @@ describe('MosaicGlobalRestrictionTransaction', () => { MosaicRestrictionType.EQ, UInt64.fromUint(8), MosaicRestrictionType.GE, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, referenceMosaicId, ); diff --git a/test/model/transaction/MosaicMetadataTransaction.spec.ts b/test/model/transaction/MosaicMetadataTransaction.spec.ts index f9ef79a171..38e48680fa 100644 --- a/test/model/transaction/MosaicMetadataTransaction.spec.ts +++ b/test/model/transaction/MosaicMetadataTransaction.spec.ts @@ -63,7 +63,7 @@ describe('MosaicMetadataTransaction', () => { new MosaicId([2262289484, 3405110546]), 1, Convert.uint8ToUtf8(new Uint8Array(10)), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); expect(mosaicMetadataTransaction.maxFee.higher).to.be.equal(0); @@ -78,7 +78,7 @@ describe('MosaicMetadataTransaction', () => { new MosaicId([2262289484, 3405110546]), 1, Convert.uint8ToUtf8(new Uint8Array(10)), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, new UInt64([1, 0]), ); @@ -94,7 +94,7 @@ describe('MosaicMetadataTransaction', () => { new MosaicId([2262289484, 3405110546]), 1, Convert.uint8ToUtf8(new Uint8Array(10)), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const signedTransaction = mosaicMetadataTransaction.signWith(account, generationHash); @@ -113,7 +113,7 @@ describe('MosaicMetadataTransaction', () => { namespacId, 1, Convert.uint8ToUtf8(new Uint8Array(10)), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const signedTransaction = mosaicMetadataTransaction.signWith(account, generationHash); @@ -132,7 +132,7 @@ describe('MosaicMetadataTransaction', () => { new MosaicId([2262289484, 3405110546]), 1, Convert.uint8ToUtf8(new Uint8Array(10)), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); expect(mosaicMetadataTransaction.size).to.be.equal(182); expect(Convert.hexToUint8(mosaicMetadataTransaction.serialize()).length).to.be.equal(mosaicMetadataTransaction.size); @@ -146,7 +146,7 @@ describe('MosaicMetadataTransaction', () => { new MosaicId([2262289484, 3405110546]), 1, Convert.uint8ToUtf8(new Uint8Array(10)), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); expect(mosaicMetadataTransaction.size).to.be.equal(182); expect(Convert.hexToUint8(mosaicMetadataTransaction.serialize()).length).to.be.equal(mosaicMetadataTransaction.size); @@ -162,7 +162,7 @@ describe('MosaicMetadataTransaction', () => { new MosaicId([2262289484, 3405110546]), 1, Convert.uint8ToUtf8(new Uint8Array(10)), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ).setMaxFee(2); expect(mosaicMetadataTransaction.maxFee.compact()).to.be.equal(364); @@ -172,7 +172,7 @@ describe('MosaicMetadataTransaction', () => { it('Test resolveAlias can resolve', () => { const mosaicMetadataTransaction = new MosaicMetadataTransaction( - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, 1, Deadline.createFromDTO('1'), UInt64.fromUint(0), @@ -200,7 +200,7 @@ describe('MosaicMetadataTransaction', () => { new MosaicId([2262289484, 3405110546]), 1, Convert.uint8ToUtf8(new Uint8Array(10)), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); Object.assign(mosaicMetadataTransaction, { signer: account.publicAccount }); @@ -220,7 +220,7 @@ describe('MosaicMetadataTransaction', () => { new MosaicId([2262289484, 3405110546]), 1, Convert.uint8ToUtf8(new Uint8Array(10)), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); let canNotify = tx.shouldNotifyAccount(account.address, []); expect(canNotify).to.be.true; @@ -242,7 +242,7 @@ describe('MosaicMetadataTransaction', () => { new MosaicId([2262289484, 3405110546]), 1, Convert.uint8ToUtf8(new Uint8Array(10)), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); let canNotify = tx.shouldNotifyAccount(account.address, [alias]); expect(canNotify).to.be.true; diff --git a/test/model/transaction/MosaicSupplyChangeTransaction.spec.ts b/test/model/transaction/MosaicSupplyChangeTransaction.spec.ts index e69dfec814..027c9053c3 100644 --- a/test/model/transaction/MosaicSupplyChangeTransaction.spec.ts +++ b/test/model/transaction/MosaicSupplyChangeTransaction.spec.ts @@ -60,7 +60,7 @@ describe('MosaicSupplyChangeTransaction', () => { mosaicId, MosaicSupplyChangeAction.Increase, UInt64.fromUint(10), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); expect(mosaicSupplyChangeTransaction.maxFee.higher).to.be.equal(0); @@ -74,7 +74,7 @@ describe('MosaicSupplyChangeTransaction', () => { mosaicId, MosaicSupplyChangeAction.Increase, UInt64.fromUint(10), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, new UInt64([1, 0]), ); @@ -89,7 +89,7 @@ describe('MosaicSupplyChangeTransaction', () => { mosaicId, MosaicSupplyChangeAction.Increase, UInt64.fromUint(10), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); expect(mosaicSupplyChangeTransaction.action).to.be.equal(MosaicSupplyChangeAction.Increase); @@ -113,7 +113,7 @@ describe('MosaicSupplyChangeTransaction', () => { mosaicId, MosaicSupplyChangeAction.Increase, UInt64.fromUint(10), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); expect(mosaicSupplyChangeTransaction.size).to.be.equal(145); expect(Convert.hexToUint8(mosaicSupplyChangeTransaction.serialize()).length).to.be.equal(mosaicSupplyChangeTransaction.size); @@ -125,7 +125,7 @@ describe('MosaicSupplyChangeTransaction', () => { mosaicId, MosaicSupplyChangeAction.Increase, UInt64.fromUint(10), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); expect(mosaicSupplyChangeTransaction.size).to.be.equal(145); expect(Convert.hexToUint8(mosaicSupplyChangeTransaction.serialize()).length).to.be.equal(mosaicSupplyChangeTransaction.size); @@ -140,7 +140,7 @@ describe('MosaicSupplyChangeTransaction', () => { mosaicId, MosaicSupplyChangeAction.Increase, UInt64.fromUint(10), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ).setMaxFee(2); expect(mosaicSupplyChangeTransaction.maxFee.compact()).to.be.equal(290); const signedTransaction = mosaicSupplyChangeTransaction.signWith(account, generationHash); @@ -149,7 +149,7 @@ describe('MosaicSupplyChangeTransaction', () => { it('Test resolveAlias can resolve', () => { const mosaicSupplyChangeTransaction = new MosaicSupplyChangeTransaction( - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, 1, Deadline.createFromDTO('1'), UInt64.fromUint(0), @@ -173,7 +173,7 @@ describe('MosaicSupplyChangeTransaction', () => { new MosaicId([2262289484, 3405110546]), MosaicSupplyChangeAction.Increase, UInt64.fromUint(10), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); Object.assign(tx, { signer: account.publicAccount }); diff --git a/test/model/transaction/MultisigAccountModificationTransaction.spec.ts b/test/model/transaction/MultisigAccountModificationTransaction.spec.ts index 5a817d2912..623a7c562c 100644 --- a/test/model/transaction/MultisigAccountModificationTransaction.spec.ts +++ b/test/model/transaction/MultisigAccountModificationTransaction.spec.ts @@ -31,11 +31,11 @@ describe('MultisigAccountModificationTransaction', () => { const generationHash = '57F7DA205008026C776CB6AED843393F04CD458E0AA2D9F1D5F31A402072B2D6'; const address1 = Address.createFromPublicKey( 'B0F93CBEE49EEB9953C6F3985B15A4F238E205584D8F924C621CBE4D7AC6EC24', - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const address2 = Address.createFromPublicKey( 'B1B5581FC81A6970DEE418D2C2978F2724228B7B36C5C6DF71B0162BB04778B4', - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const epochAdjustment = Duration.ofSeconds(1573430400); before(() => { @@ -49,7 +49,7 @@ describe('MultisigAccountModificationTransaction', () => { 1, [address1, address2], [], - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); expect(modifyMultisigAccountTransaction.maxFee.higher).to.be.equal(0); @@ -63,7 +63,7 @@ describe('MultisigAccountModificationTransaction', () => { 1, [address1, address2], [], - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, new UInt64([1, 0]), ); @@ -78,7 +78,7 @@ describe('MultisigAccountModificationTransaction', () => { 1, [address1, address2], [], - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); expect(modifyMultisigAccountTransaction.minApprovalDelta).to.be.equal(2); @@ -103,7 +103,7 @@ describe('MultisigAccountModificationTransaction', () => { 1, [address1], [], - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); expect(modifyMultisigAccountTransaction.size).to.be.equal(160); expect(Convert.hexToUint8(modifyMultisigAccountTransaction.serialize()).length).to.be.equal( @@ -117,7 +117,7 @@ describe('MultisigAccountModificationTransaction', () => { 1, [address1], [], - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); expect(modifyMultisigAccountTransaction.size).to.be.equal(160); expect(Convert.hexToUint8(modifyMultisigAccountTransaction.serialize()).length).to.be.equal( @@ -134,7 +134,7 @@ describe('MultisigAccountModificationTransaction', () => { 1, [address1], [], - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ).setMaxFee(2); expect(modifyMultisigAccountTransaction.maxFee.compact()).to.be.equal(320); @@ -149,7 +149,7 @@ describe('MultisigAccountModificationTransaction', () => { 1, [address1], [], - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); let canNotify = txAddition.shouldNotifyAccount(address1, []); @@ -167,7 +167,7 @@ describe('MultisigAccountModificationTransaction', () => { 1, [], [address1], - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); let canNotifyDeletion = txDeletion.shouldNotifyAccount(address1, []); @@ -189,7 +189,7 @@ describe('MultisigAccountModificationTransaction', () => { 1, [alias], [], - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); let canNotify = txAddition.shouldNotifyAccount(address1, [alias]); @@ -210,7 +210,7 @@ describe('MultisigAccountModificationTransaction', () => { 1, [], [alias], - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); let canNotifyDeletion = txDeletion.shouldNotifyAccount(address1, [alias]); diff --git a/test/model/transaction/MultisigCosignatoryModification.spec.ts b/test/model/transaction/MultisigCosignatoryModification.spec.ts index 47f24f0872..b2014b0171 100644 --- a/test/model/transaction/MultisigCosignatoryModification.spec.ts +++ b/test/model/transaction/MultisigCosignatoryModification.spec.ts @@ -24,7 +24,7 @@ describe('MultisigCosignatoryModification', () => { it('should create Add MultisigCosignatoryModification', () => { const multisigCosignatoryModification = new MultisigCosignatoryModification( CosignatoryModificationAction.Add, - PublicAccount.createFromPublicKey('C52C211CF935C61D65F26B253AA260416F018C3D21E4D184A7671F403C849BBB', NetworkType.MIJIN_TEST), + PublicAccount.createFromPublicKey('C52C211CF935C61D65F26B253AA260416F018C3D21E4D184A7671F403C849BBB', NetworkType.PRIVATE_TEST), ); expect(multisigCosignatoryModification.cosignatoryPublicAccount.publicKey).to.be.equal( 'C52C211CF935C61D65F26B253AA260416F018C3D21E4D184A7671F403C849BBB', @@ -35,7 +35,7 @@ describe('MultisigCosignatoryModification', () => { it('should create Add MultisigCosignatoryModification and get toDTO correctly', () => { const multisigCosignatoryModification = new MultisigCosignatoryModification( CosignatoryModificationAction.Add, - PublicAccount.createFromPublicKey('C52C211CF935C61D65F26B253AA260416F018C3D21E4D184A7671F403C849BBB', NetworkType.MIJIN_TEST), + PublicAccount.createFromPublicKey('C52C211CF935C61D65F26B253AA260416F018C3D21E4D184A7671F403C849BBB', NetworkType.PRIVATE_TEST), ).toDTO(); expect(multisigCosignatoryModification.cosignatoryPublicKey).to.be.equal( 'C52C211CF935C61D65F26B253AA260416F018C3D21E4D184A7671F403C849BBB', @@ -46,7 +46,7 @@ describe('MultisigCosignatoryModification', () => { it('should create Remove MultisigCosignatoryModification', () => { const multisigCosignatoryModification = new MultisigCosignatoryModification( CosignatoryModificationAction.Remove, - PublicAccount.createFromPublicKey('C52C211CF935C61D65F26B253AA260416F018C3D21E4D184A7671F403C849BBB', NetworkType.MIJIN_TEST), + PublicAccount.createFromPublicKey('C52C211CF935C61D65F26B253AA260416F018C3D21E4D184A7671F403C849BBB', NetworkType.PRIVATE_TEST), ); expect(multisigCosignatoryModification.cosignatoryPublicAccount.publicKey).to.be.equal( 'C52C211CF935C61D65F26B253AA260416F018C3D21E4D184A7671F403C849BBB', @@ -57,7 +57,7 @@ describe('MultisigCosignatoryModification', () => { it('should create Remove MultisigCosignatoryModification and get toDTO correctly', () => { const multisigCosignatoryModification = new MultisigCosignatoryModification( CosignatoryModificationAction.Remove, - PublicAccount.createFromPublicKey('C52C211CF935C61D65F26B253AA260416F018C3D21E4D184A7671F403C849BBB', NetworkType.MIJIN_TEST), + PublicAccount.createFromPublicKey('C52C211CF935C61D65F26B253AA260416F018C3D21E4D184A7671F403C849BBB', NetworkType.PRIVATE_TEST), ).toDTO(); expect(multisigCosignatoryModification.cosignatoryPublicKey).to.be.equal( 'C52C211CF935C61D65F26B253AA260416F018C3D21E4D184A7671F403C849BBB', diff --git a/test/model/transaction/NamespaceMetadataTransaction.spec.ts b/test/model/transaction/NamespaceMetadataTransaction.spec.ts index e366bee763..1854a6251a 100644 --- a/test/model/transaction/NamespaceMetadataTransaction.spec.ts +++ b/test/model/transaction/NamespaceMetadataTransaction.spec.ts @@ -45,7 +45,7 @@ describe('NamespaceMetadataTransaction', () => { new NamespaceId([2262289484, 3405110546]), 1, Convert.uint8ToUtf8(new Uint8Array(10)), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); expect(namespaceMetadataTransaction.maxFee.higher).to.be.equal(0); @@ -60,7 +60,7 @@ describe('NamespaceMetadataTransaction', () => { new NamespaceId([2262289484, 3405110546]), 1, Convert.uint8ToUtf8(new Uint8Array(10)), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, new UInt64([1, 0]), ); @@ -76,7 +76,7 @@ describe('NamespaceMetadataTransaction', () => { new NamespaceId([2262289484, 3405110546]), 1, Convert.uint8ToUtf8(new Uint8Array(10)), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const signedTransaction = namespaceMetadataTransaction.signWith(account, generationHash); @@ -95,7 +95,7 @@ describe('NamespaceMetadataTransaction', () => { new NamespaceId([2262289484, 3405110546]), 1, Convert.uint8ToUtf8(new Uint8Array(10)), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); expect(namespaceMetadataTransaction.size).to.be.equal(182); expect(Convert.hexToUint8(namespaceMetadataTransaction.serialize()).length).to.be.equal(namespaceMetadataTransaction.size); @@ -109,7 +109,7 @@ describe('NamespaceMetadataTransaction', () => { new NamespaceId([2262289484, 3405110546]), 1, Convert.uint8ToUtf8(new Uint8Array(10)), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); expect(namespaceMetadataTransaction.size).to.be.equal(182); expect(Convert.hexToUint8(namespaceMetadataTransaction.serialize()).length).to.be.equal(namespaceMetadataTransaction.size); @@ -125,7 +125,7 @@ describe('NamespaceMetadataTransaction', () => { new NamespaceId([2262289484, 3405110546]), 1, Convert.uint8ToUtf8(new Uint8Array(10)), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ).setMaxFee(2); expect(namespaceMetadataTransaction.maxFee.compact()).to.be.equal(364); @@ -141,7 +141,7 @@ describe('NamespaceMetadataTransaction', () => { new NamespaceId([2262289484, 3405110546]), 1, Convert.uint8ToUtf8(new Uint8Array(10)), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); Object.assign(namespaceMetadataTransaction, { signer: account.publicAccount }); @@ -161,7 +161,7 @@ describe('NamespaceMetadataTransaction', () => { new NamespaceId([2262289484, 3405110546]), 1, Convert.uint8ToUtf8(new Uint8Array(10)), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const resolved = namespaceMetadataTransaction.resolveAliases(); @@ -177,7 +177,7 @@ describe('NamespaceMetadataTransaction', () => { new NamespaceId([2262289484, 3405110546]), 1, Convert.uint8ToUtf8(new Uint8Array(10)), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); let canNotify = tx.shouldNotifyAccount(account.address, []); expect(canNotify).to.be.true; @@ -199,7 +199,7 @@ describe('NamespaceMetadataTransaction', () => { new NamespaceId([2262289484, 3405110546]), 1, Convert.uint8ToUtf8(new Uint8Array(10)), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); let canNotify = tx.shouldNotifyAccount(account.address, [alias]); expect(canNotify).to.be.true; diff --git a/test/model/transaction/NamespaceRegistrationTransaction.spec.ts b/test/model/transaction/NamespaceRegistrationTransaction.spec.ts index 244e35014f..29b7927e88 100644 --- a/test/model/transaction/NamespaceRegistrationTransaction.spec.ts +++ b/test/model/transaction/NamespaceRegistrationTransaction.spec.ts @@ -38,7 +38,7 @@ describe('NamespaceRegistrationTransaction', () => { Deadline.create(epochAdjustment), 'root-test-namespace', UInt64.fromUint(1000), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); expect(registerNamespaceTransaction.maxFee.higher).to.be.equal(0); @@ -50,7 +50,7 @@ describe('NamespaceRegistrationTransaction', () => { Deadline.create(epochAdjustment), 'root-test-namespace', UInt64.fromUint(1000), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, new UInt64([1, 0]), ); @@ -63,7 +63,7 @@ describe('NamespaceRegistrationTransaction', () => { Deadline.create(epochAdjustment), 'root-test-namespace', UInt64.fromUint(1000), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); expect(registerNamespaceTransaction.duration!.lower).to.be.equal(1000); @@ -81,7 +81,7 @@ describe('NamespaceRegistrationTransaction', () => { Deadline.create(epochAdjustment), 'root-test-namespace', 'parent-test-namespace', - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const signedTransaction = registerNamespaceTransaction.signWith(account, generationHash); @@ -96,7 +96,7 @@ describe('NamespaceRegistrationTransaction', () => { Deadline.create(epochAdjustment), 'root-test-namespace', new NamespaceId([929036875, 2226345261]), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const signedTransaction = registerNamespaceTransaction.signWith(account, generationHash); @@ -112,7 +112,7 @@ describe('NamespaceRegistrationTransaction', () => { Deadline.create(epochAdjustment), 'root-test-namespace', UInt64.fromUint(1000), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); expect(registerNamespaceTransaction.size).to.be.equal(165); expect(Convert.hexToUint8(registerNamespaceTransaction.serialize()).length).to.be.equal(registerNamespaceTransaction.size); @@ -122,7 +122,7 @@ describe('NamespaceRegistrationTransaction', () => { Deadline.create(epochAdjustment), 'root-test-namespace', UInt64.fromUint(1000), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); expect(registerNamespaceTransaction.size).to.be.equal(165); expect(Convert.hexToUint8(registerNamespaceTransaction.serialize()).length).to.be.equal(registerNamespaceTransaction.size); @@ -135,7 +135,7 @@ describe('NamespaceRegistrationTransaction', () => { Deadline.create(epochAdjustment), 'root-test-namespace', UInt64.fromUint(1000), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ).setMaxFee(2); expect(registerNamespaceTransaction.maxFee.compact()).to.be.equal(330); @@ -148,7 +148,7 @@ describe('NamespaceRegistrationTransaction', () => { Deadline.create(epochAdjustment), 'root-test-namespace', UInt64.fromUint(1000), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); Object.assign(tx, { signer: account.publicAccount }); diff --git a/test/model/transaction/NodeKeyLinkTransaction.spec.ts b/test/model/transaction/NodeKeyLinkTransaction.spec.ts index f93711619f..78def9fd9e 100644 --- a/test/model/transaction/NodeKeyLinkTransaction.spec.ts +++ b/test/model/transaction/NodeKeyLinkTransaction.spec.ts @@ -39,7 +39,7 @@ describe('NodeKeyLinkTransaction', () => { Deadline.create(epochAdjustment), account.publicKey, LinkAction.Link, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); expect(nodeKeyLinkTransaction.maxFee.higher).to.be.equal(0); @@ -51,7 +51,7 @@ describe('NodeKeyLinkTransaction', () => { Deadline.create(epochAdjustment), account.publicKey, LinkAction.Link, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, new UInt64([1, 0]), ); @@ -64,7 +64,7 @@ describe('NodeKeyLinkTransaction', () => { Deadline.create(epochAdjustment), account.publicKey, LinkAction.Link, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); expect(nodeKeyLinkTransaction.linkAction).to.be.equal(1); @@ -82,7 +82,7 @@ describe('NodeKeyLinkTransaction', () => { Deadline.create(epochAdjustment), account.publicKey, LinkAction.Unlink, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); expect(nodeKeyLinkTransaction.linkAction).to.be.equal(0); @@ -101,7 +101,7 @@ describe('NodeKeyLinkTransaction', () => { Deadline.create(epochAdjustment), account.publicKey, LinkAction.Unlink, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); expect(Convert.hexToUint8(nodeKeyLinkTransaction.serialize()).length).to.be.equal(nodeKeyLinkTransaction.size); expect(nodeKeyLinkTransaction.size).to.be.equal(161); @@ -111,7 +111,7 @@ describe('NodeKeyLinkTransaction', () => { Deadline.create(epochAdjustment), account.publicKey, LinkAction.Unlink, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); expect(Convert.hexToUint8(nodeKeyLinkTransaction.serialize()).length).to.be.equal(nodeKeyLinkTransaction.size); expect(nodeKeyLinkTransaction.size).to.be.equal(161); @@ -124,7 +124,7 @@ describe('NodeKeyLinkTransaction', () => { Deadline.create(epochAdjustment), account.publicKey, LinkAction.Unlink, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ).setMaxFee(2); expect(nodeKeyLinkTransaction.maxFee.compact()).to.be.equal(322); @@ -137,7 +137,7 @@ describe('NodeKeyLinkTransaction', () => { Deadline.create(epochAdjustment), account.publicKey, LinkAction.Unlink, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); let canNotify = tx.shouldNotifyAccount(account.address); expect(canNotify).to.be.true; diff --git a/test/model/transaction/PersistentDelegationRequestTransaction.spec.ts b/test/model/transaction/PersistentDelegationRequestTransaction.spec.ts index 6445821b0d..10c737519f 100644 --- a/test/model/transaction/PersistentDelegationRequestTransaction.spec.ts +++ b/test/model/transaction/PersistentDelegationRequestTransaction.spec.ts @@ -44,7 +44,7 @@ describe('PersistentDelegationRequestTransaction', () => { delegatedPrivateKey, vrfPrivateKey, recipientPublicKey, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); expect(persistentDelegationRequestTransaction.maxFee.higher).to.be.equal(0); @@ -57,7 +57,7 @@ describe('PersistentDelegationRequestTransaction', () => { delegatedPrivateKey, vrfPrivateKey, recipientPublicKey, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, new UInt64([1, 0]), ); @@ -71,7 +71,7 @@ describe('PersistentDelegationRequestTransaction', () => { delegatedPrivateKey, vrfPrivateKey, recipientPublicKey, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); expect(persistentDelegationRequestTransaction.message.payload.length).to.be.equal(248 + messageMarker.length); @@ -98,7 +98,7 @@ describe('PersistentDelegationRequestTransaction', () => { 'abc', vrfPrivateKey, recipientPublicKey, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, new UInt64([1, 0]), ); }).to.throw(); diff --git a/test/model/transaction/SecretLockTransaction.spec.ts b/test/model/transaction/SecretLockTransaction.spec.ts index b39d968bd9..4e9b0fbc2d 100644 --- a/test/model/transaction/SecretLockTransaction.spec.ts +++ b/test/model/transaction/SecretLockTransaction.spec.ts @@ -73,7 +73,7 @@ describe('SecretLockTransaction', () => { LockHashAlgorithm.Op_Sha3_256, sha3_256.create().update(convert.hexToUint8(proof)).hex(), recipientAddress, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); expect(secretLockTransaction.maxFee.higher).to.be.equal(0); @@ -90,7 +90,7 @@ describe('SecretLockTransaction', () => { LockHashAlgorithm.Op_Sha3_256, sha3_256.create().update(convert.hexToUint8(proof)).hex(), recipientAddress, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, new UInt64([1, 0]), ); @@ -108,7 +108,7 @@ describe('SecretLockTransaction', () => { LockHashAlgorithm.Op_Sha3_256, sha3_256.create().update(convert.hexToUint8(proof)).hex(), recipientAddress, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); deepEqual(secretLockTransaction.mosaic.id.id, NetworkCurrencyLocal.NAMESPACE_ID.id); expect(secretLockTransaction.mosaic.amount.equals(UInt64.fromUint(10))).to.be.equal(true); @@ -128,7 +128,7 @@ describe('SecretLockTransaction', () => { LockHashAlgorithm.Op_Sha3_256, sha3_256.create().update(convert.hexToUint8(proof)).hex(), recipientAddress, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const signedTx = secretLockTransaction.signWith(account, generationHash); expect(signedTx.payload.substring(256, signedTx.payload.length)).to.be.equal( @@ -147,7 +147,7 @@ describe('SecretLockTransaction', () => { LockHashAlgorithm.Op_Sha3_256, 'non valid hash', recipientAddress, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); }).to.throw(Error); }); @@ -162,7 +162,7 @@ describe('SecretLockTransaction', () => { LockHashAlgorithm.Op_Hash_160, CryptoJS.RIPEMD160(CryptoJS.SHA256(proof).toString(CryptoJS.enc.Hex)).toString(CryptoJS.enc.Hex), recipientAddress, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); deepEqual(secretLockTransaction.mosaic.id.id, NetworkCurrencyLocal.NAMESPACE_ID.id); expect(secretLockTransaction.mosaic.amount.equals(UInt64.fromUint(10))).to.be.equal(true); @@ -182,7 +182,7 @@ describe('SecretLockTransaction', () => { LockHashAlgorithm.Op_Hash_160, 'non valid hash', recipientAddress, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); }).to.throw(Error); }); @@ -196,7 +196,7 @@ describe('SecretLockTransaction', () => { LockHashAlgorithm.Op_Hash_256, CryptoJS.SHA256(CryptoJS.SHA256(proof).toString(CryptoJS.enc.Hex)).toString(CryptoJS.enc.Hex), recipientAddress, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); deepEqual(secretLockTransaction.mosaic.id.id, NetworkCurrencyLocal.NAMESPACE_ID.id); expect(secretLockTransaction.mosaic.amount.equals(UInt64.fromUint(10))).to.be.equal(true); @@ -216,7 +216,7 @@ describe('SecretLockTransaction', () => { LockHashAlgorithm.Op_Hash_256, 'non valid hash', recipientAddress, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); }).to.throw(Error); }); @@ -232,7 +232,7 @@ describe('SecretLockTransaction', () => { LockHashAlgorithm.Op_Hash_256, CryptoJS.SHA256(CryptoJS.SHA256(proof).toString(CryptoJS.enc.Hex)).toString(CryptoJS.enc.Hex), recipientAddress, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); expect(secretLockTransaction.size).to.be.equal(209); expect(Convert.hexToUint8(secretLockTransaction.serialize()).length).to.be.equal(secretLockTransaction.size); @@ -248,7 +248,7 @@ describe('SecretLockTransaction', () => { LockHashAlgorithm.Op_Hash_256, CryptoJS.SHA256(CryptoJS.SHA256(proof).toString(CryptoJS.enc.Hex)).toString(CryptoJS.enc.Hex), recipientAddress, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); expect(secretLockTransaction.size).to.be.equal(209); expect(Convert.hexToUint8(secretLockTransaction.serialize()).length).to.be.equal(secretLockTransaction.size); @@ -266,7 +266,7 @@ describe('SecretLockTransaction', () => { LockHashAlgorithm.Op_Sha3_256, sha3_256.create().update(convert.hexToUint8(proof)).hex(), recipientAddress, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); deepEqual(secretLockTransaction.mosaic.id.id, NetworkCurrencyLocal.NAMESPACE_ID.id); expect(secretLockTransaction.mosaic.amount.equals(UInt64.fromUint(10))).to.be.equal(true); @@ -286,7 +286,7 @@ describe('SecretLockTransaction', () => { LockHashAlgorithm.Op_Sha3_256, sha3_256.create().update(convert.hexToUint8(proof)).hex(), recipientAddress, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ).setMaxFee(2); expect(secretLockTransaction.maxFee.compact()).to.be.equal(418); const signedTransaction = secretLockTransaction.signWith(account, generationHash); @@ -296,7 +296,7 @@ describe('SecretLockTransaction', () => { it('Test resolveAlias can resolve', () => { const proof = 'B778A39A3663719DFC5E48C9D78431B1E45C2AF9DF538782BF199C189DABEAC7'; const secretLockTransaction = new SecretLockTransaction( - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, 1, Deadline.createFromDTO('1'), UInt64.fromUint(0), @@ -328,7 +328,7 @@ describe('SecretLockTransaction', () => { LockHashAlgorithm.Op_Sha3_256, sha3_256.create().update(convert.hexToUint8(proof)).hex(), recipientAddress, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); let canNotify = tx.shouldNotifyAccount(recipientAddress, []); expect(canNotify).to.be.true; @@ -350,7 +350,7 @@ describe('SecretLockTransaction', () => { LockHashAlgorithm.Op_Sha3_256, sha3_256.create().update(convert.hexToUint8(proof)).hex(), account.address, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ).shouldNotifyAccount(account.address, [namespaceId]); expect(canNotify).to.be.true; }); diff --git a/test/model/transaction/SecretProofTransaction.spec.ts b/test/model/transaction/SecretProofTransaction.spec.ts index a1c37a0834..89d826d71f 100644 --- a/test/model/transaction/SecretProofTransaction.spec.ts +++ b/test/model/transaction/SecretProofTransaction.spec.ts @@ -63,7 +63,7 @@ describe('SecretProofTransaction', () => { sha3_256.create().update(convert.hexToUint8(proof)).hex(), account.address, proof, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); expect(secretProofTransaction.maxFee.higher).to.be.equal(0); @@ -78,7 +78,7 @@ describe('SecretProofTransaction', () => { sha3_256.create().update(convert.hexToUint8(proof)).hex(), account.address, proof, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, new UInt64([1, 0]), ); @@ -94,7 +94,7 @@ describe('SecretProofTransaction', () => { sha3_256.create().update(convert.hexToUint8(proof)).hex(), account.address, proof, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); expect(secretProofTransaction.hashAlgorithm).to.be.equal(0); expect(secretProofTransaction.secret).to.be.equal('9b3155b37159da50aa52d5967c509b410f5a36a3b1e31ecb5ac76675d79b4a5e'); @@ -110,7 +110,7 @@ describe('SecretProofTransaction', () => { 'non valid hash', account.address, proof, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); }).to.throw(Error); }); @@ -123,7 +123,7 @@ describe('SecretProofTransaction', () => { CryptoJS.RIPEMD160(CryptoJS.SHA256(proof).toString(CryptoJS.enc.Hex)).toString(CryptoJS.enc.Hex), account.address, proof, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); expect(secretProofTransaction.hashAlgorithm).to.be.equal(1); expect(secretProofTransaction.secret).to.be.equal('3fc43d717d824302e3821de8129ea2f7786912e5'); @@ -139,7 +139,7 @@ describe('SecretProofTransaction', () => { 'non valid hash', account.address, proof, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); }).to.throw(Error); }); @@ -152,7 +152,7 @@ describe('SecretProofTransaction', () => { CryptoJS.SHA256(CryptoJS.SHA256(proof).toString(CryptoJS.enc.Hex)).toString(CryptoJS.enc.Hex), account.address, proof, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); expect(secretProofTransaction.hashAlgorithm).to.be.equal(2); expect(secretProofTransaction.secret).to.be.equal('c346f5ecf5bcfa54ab14fad815c8239bdeb051df8835d212dba2af59f688a00e'); @@ -168,7 +168,7 @@ describe('SecretProofTransaction', () => { 'non valid hash', account.address, proof, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); }).to.throw(Error); }); @@ -182,7 +182,7 @@ describe('SecretProofTransaction', () => { CryptoJS.SHA256(CryptoJS.SHA256(proof).toString(CryptoJS.enc.Hex)).toString(CryptoJS.enc.Hex), account.address, proof, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); expect(secretProofTransaction.size).to.be.equal(219); expect(Convert.hexToUint8(secretProofTransaction.serialize()).length).to.be.equal(secretProofTransaction.size); @@ -197,7 +197,7 @@ describe('SecretProofTransaction', () => { sha3_256.create().update(convert.hexToUint8(proof)).hex(), account.address, proof, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const signedTx = secretProofTransaction.signWith(account, generationHash); @@ -216,7 +216,7 @@ describe('SecretProofTransaction', () => { sha3_256.create().update(convert.hexToUint8(proof)).hex(), recipientAddress, proof, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); expect(secretProofTransaction.hashAlgorithm).to.be.equal(0); expect(secretProofTransaction.secret).to.be.equal('9b3155b37159da50aa52d5967c509b410f5a36a3b1e31ecb5ac76675d79b4a5e'); @@ -232,7 +232,7 @@ describe('SecretProofTransaction', () => { sha3_256.create().update(convert.hexToUint8(proof)).hex(), account.address, proof, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ).setMaxFee(2); expect(secretProofTransaction.maxFee.compact()).to.be.equal(438); const signedTransaction = secretProofTransaction.signWith(account, generationHash); @@ -242,7 +242,7 @@ describe('SecretProofTransaction', () => { it('Test resolveAlias can resolve', () => { const proof = 'B778A39A3663719DFC5E48C9D78431B1E45C2AF9DF538782BF199C189DABEAC7'; const transferTransaction = new SecretProofTransaction( - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, 1, Deadline.create(epochAdjustment), UInt64.fromUint(0), @@ -264,7 +264,7 @@ describe('SecretProofTransaction', () => { it('should create EmbeddedTransactionBuilder', () => { const proof = 'B778A39A3663719DFC5E48C9D78431B1E45C2AF9DF538782BF199C189DABEAC7'; const secretProofTransaction = new SecretProofTransaction( - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, 1, Deadline.create(epochAdjustment), UInt64.fromUint(0), @@ -293,7 +293,7 @@ describe('SecretProofTransaction', () => { sha3_256.create().update(convert.hexToUint8(proof)).hex(), account.address, proof, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const secretBytes = secretProofTransaction.getSecretByte(); expect(secretBytes).not.to.be.undefined; @@ -308,7 +308,7 @@ describe('SecretProofTransaction', () => { sha3_256.create().update(convert.hexToUint8(proof)).hex(), account.address, proof, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); let canNotify = tx.shouldNotifyAccount(account.address, []); expect(canNotify).to.be.true; @@ -329,7 +329,7 @@ describe('SecretProofTransaction', () => { sha3_256.create().update(convert.hexToUint8(proof)).hex(), account.address, proof, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ).shouldNotifyAccount(account.address, [namespaceId]); expect(canNotify).to.be.true; }); diff --git a/test/model/transaction/SignedTransaction.spec.ts b/test/model/transaction/SignedTransaction.spec.ts index b5dbb57468..decf958ebf 100644 --- a/test/model/transaction/SignedTransaction.spec.ts +++ b/test/model/transaction/SignedTransaction.spec.ts @@ -32,7 +32,7 @@ describe('SignedTransaction', () => { '07901DA8A8AFE1DFB76D1A079B8E785C1186BAF2C5B98227B62BDE2C77D79481', 'C2F93346E27CE6AD1A9F8F5E3066F8326593A406BDF357ACB041E2F9AB402EFE', TransactionType.TRANSFER, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); expect(signedTransaction.type).to.be.equal(TransactionType.TRANSFER); }); @@ -48,7 +48,7 @@ describe('SignedTransaction', () => { '231AA7700DC158CFC85606E0E2AC80F409923C6F3A845577C7D8D7A51A99E883', 'C2F93346E27CE6AD1A9F8F5E3066F8326593A406BDF357ACB041E2F9AB402EFE', TransactionType.AGGREGATE_COMPLETE, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); expect(signedTransaction.type).to.be.equal(TransactionType.AGGREGATE_COMPLETE); }); @@ -60,7 +60,7 @@ describe('SignedTransaction', () => { ].forEach((item) => { it("throws exception if string hasn't 64 character long", () => { expect(() => { - new SignedTransaction('', item, publicKey, TransactionType.AGGREGATE_BONDED, NetworkType.MIJIN_TEST); + new SignedTransaction('', item, publicKey, TransactionType.AGGREGATE_BONDED, NetworkType.PRIVATE_TEST); }).to.throw(Error); }); }); diff --git a/test/model/transaction/Transaction.spec.ts b/test/model/transaction/Transaction.spec.ts index c4a983f095..000e0e42a1 100644 --- a/test/model/transaction/Transaction.spec.ts +++ b/test/model/transaction/Transaction.spec.ts @@ -75,7 +75,7 @@ describe('Transaction', () => { it('should return true when there is no Transaction Info', () => { const transaction = new FakeTransaction( TransactionType.TRANSFER, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, 1, Deadline.create(epochAdjustment), UInt64.fromUint(0), @@ -91,7 +91,7 @@ describe('Transaction', () => { it('should return true when height is 0', () => { const transaction = new FakeTransaction( TransactionType.TRANSFER, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, 1, Deadline.create(epochAdjustment), UInt64.fromUint(0), @@ -105,7 +105,7 @@ describe('Transaction', () => { it('should return false when height is not 0', () => { const transaction = new FakeTransaction( TransactionType.TRANSFER, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, 1, Deadline.create(epochAdjustment), UInt64.fromUint(0), @@ -121,7 +121,7 @@ describe('Transaction', () => { it('should return true when height is not 0', () => { const transaction = new FakeTransaction( TransactionType.TRANSFER, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, 1, Deadline.create(epochAdjustment), UInt64.fromUint(0), @@ -137,7 +137,7 @@ describe('Transaction', () => { it('should return false when height is 0 and hash and markehash are different', () => { const transaction = new FakeTransaction( TransactionType.TRANSFER, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, 1, Deadline.create(epochAdjustment), UInt64.fromUint(0), @@ -153,7 +153,7 @@ describe('Transaction', () => { it('should throw an error if the transaction is announced', () => { const transaction = new FakeTransaction( TransactionType.TRANSFER, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, 1, Deadline.create(epochAdjustment), UInt64.fromUint(0), @@ -168,7 +168,7 @@ describe('Transaction', () => { it('should return a new transaction', () => { const transaction = new FakeTransaction( TransactionType.TRANSFER, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, 1, Deadline.create(epochAdjustment), UInt64.fromUint(0), @@ -182,7 +182,7 @@ describe('Transaction', () => { it('should overide deadline properly', () => { const transaction = new FakeTransaction( TransactionType.TRANSFER, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, 1, Deadline.create(epochAdjustment), UInt64.fromUint(0), @@ -204,7 +204,7 @@ describe('Transaction', () => { it('should throw exception when adding an aggregated transaction as inner transaction', () => { const transaction = new FakeTransaction( TransactionType.TRANSFER, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, 1, Deadline.create(epochAdjustment), UInt64.fromUint(0), @@ -215,7 +215,7 @@ describe('Transaction', () => { const aggregateTransaction = AggregateTransaction.createComplete( Deadline.create(epochAdjustment), [transaction.toAggregate(account.publicAccount)], - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, [], ); @@ -232,7 +232,7 @@ describe('Transaction', () => { Address.createFromRawAddress('SATNE7Q5BITMUTRRN6IB4I7FLSDRDWZA34I2PMQ'), [], PlainMessage.create('test-message'), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const serialized = transaction.serialize(); @@ -246,7 +246,7 @@ describe('Transaction', () => { it('should return version in hex format', () => { const transaction = new FakeTransaction( TransactionType.TRANSFER, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, 1, Deadline.create(epochAdjustment), UInt64.fromUint(0), @@ -343,7 +343,7 @@ describe('Transaction', () => { expect(hash1).to.equal(hash2); }); - it('create correct SHA3 transaction hash given network type MIJIN or MIJIN_TEST', () => { + it('create correct SHA3 transaction hash given network type PRIVATE or PRIVATE_TEST', () => { const hash1 = Transaction.createTransactionHash(knownPayload, generationHashBytes); const hash2 = Transaction.createTransactionHash(knownPayload, generationHashBytes); @@ -383,7 +383,7 @@ describe('Transaction', () => { Address.createFromRawAddress('SATNE7Q5BITMUTRRN6IB4I7FLSDRDWZA34I2PMQ'), [], PlainMessage.create('test-message'), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ) as Transaction; expect(tx.isSigned(account.address)).to.be.false; diff --git a/test/model/transaction/TransferTransaction.spec.ts b/test/model/transaction/TransferTransaction.spec.ts index 0fdab15185..d4b55de25b 100644 --- a/test/model/transaction/TransferTransaction.spec.ts +++ b/test/model/transaction/TransferTransaction.spec.ts @@ -79,7 +79,7 @@ describe('TransferTransaction', () => { Address.createFromRawAddress('SATNE7Q5BITMUTRRN6IB4I7FLSDRDWZA34I2PMQ'), [], PlainMessage.create('test-message'), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); expect(transferTransaction.maxFee.higher).to.be.equal(0); @@ -92,7 +92,7 @@ describe('TransferTransaction', () => { Address.createFromRawAddress('SATNE7Q5BITMUTRRN6IB4I7FLSDRDWZA34I2PMQ'), [], PlainMessage.create('test-message'), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, new UInt64([1, 0]), ); @@ -106,7 +106,7 @@ describe('TransferTransaction', () => { Address.createFromRawAddress('SATNE7Q5BITMUTRRN6IB4I7FLSDRDWZA34I2PMQ'), [], PlainMessage.create('test-message'), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); expect(transferTransaction.message.payload).to.be.equal('test-message'); @@ -127,7 +127,7 @@ describe('TransferTransaction', () => { Address.createFromRawAddress('SATNE7Q5BITMUTRRN6IB4I7FLSDRDWZA34I2PMQ'), [], EmptyMessage, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); expect(transferTransaction.message.payload).to.be.equal(''); @@ -148,7 +148,7 @@ describe('TransferTransaction', () => { Address.createFromRawAddress('SATNE7Q5BITMUTRRN6IB4I7FLSDRDWZA34I2PMQ'), [NetworkCurrencyLocal.createRelative(100)], PlainMessage.create('test-message'), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); expect(transferTransaction.message.payload).to.be.equal('test-message'); @@ -171,7 +171,7 @@ describe('TransferTransaction', () => { addressAlias, [NetworkCurrencyLocal.createRelative(100)], PlainMessage.create('test-message'), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); expect(transferTransaction.message.payload).to.be.equal('test-message'); @@ -194,7 +194,7 @@ describe('TransferTransaction', () => { Address.createFromRawAddress('SATNE7Q5BITMUTRRN6IB4I7FLSDRDWZA34I2PMQ'), [NetworkCurrencyLocal.createRelative(100)], PlainMessage.create('test-message'), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); // test recipientToString with Address recipient @@ -211,7 +211,7 @@ describe('TransferTransaction', () => { new NamespaceId('nem.owner'), [NetworkCurrencyLocal.createRelative(100)], PlainMessage.create('test-message'), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); // test recipientToString with NamespaceId recipient @@ -229,7 +229,7 @@ describe('TransferTransaction', () => { Address.createFromRawAddress('SATNE7Q5BITMUTRRN6IB4I7FLSDRDWZA34I2PMQ'), [NetworkCurrencyLocal.createRelative(100)], PlainMessage.create('NEM'), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); expect(Convert.hexToUint8(transaction.serialize()).length).to.be.equal(transaction.size); expect(transaction.size).to.be.equal(180); @@ -241,7 +241,7 @@ describe('TransferTransaction', () => { Address.createFromRawAddress('SATNE7Q5BITMUTRRN6IB4I7FLSDRDWZA34I2PMQ'), [NetworkCurrencyLocal.createRelative(100)], PlainMessage.create('NEM'), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); expect(Convert.hexToUint8(transaction.serialize()).length).to.be.equal(transaction.size); expect(transaction.size).to.be.equal(180); @@ -255,7 +255,7 @@ describe('TransferTransaction', () => { Address.createFromRawAddress('SATNE7Q5BITMUTRRN6IB4I7FLSDRDWZA34I2PMQ'), [NetworkCurrencyLocal.createRelative(100)], PlainMessage.create('test-message'), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); expect(transferTransaction.message.payload).to.be.equal('test-message'); @@ -276,8 +276,8 @@ describe('TransferTransaction', () => { Deadline.create(epochAdjustment), Address.createFromRawAddress('SATNE7Q5BITMUTRRN6IB4I7FLSDRDWZA34I2PMQ'), [], - PersistentHarvestingDelegationMessage.create(delegatedPrivateKey, vrfPrivateKey, recipientPublicKey, NetworkType.MIJIN_TEST), - NetworkType.MIJIN_TEST, + PersistentHarvestingDelegationMessage.create(delegatedPrivateKey, vrfPrivateKey, recipientPublicKey, NetworkType.PRIVATE_TEST), + NetworkType.PRIVATE_TEST, ); expect(transferTransaction.message.type).to.be.equal(MessageType.PersistentHarvestingDelegationMessage); @@ -288,8 +288,8 @@ describe('TransferTransaction', () => { Deadline.create(epochAdjustment), Address.createFromRawAddress('SATNE7Q5BITMUTRRN6IB4I7FLSDRDWZA34I2PMQ'), [], - PersistentHarvestingDelegationMessage.create(delegatedPrivateKey, vrfPrivateKey, recipientPublicKey, NetworkType.MIJIN_TEST), - NetworkType.MIJIN_TEST, + PersistentHarvestingDelegationMessage.create(delegatedPrivateKey, vrfPrivateKey, recipientPublicKey, NetworkType.PRIVATE_TEST), + NetworkType.PRIVATE_TEST, ); expect(transferTransaction.message.payload.length).to.be.equal(248 + messageMarker.length); expect(transferTransaction.message.payload.includes(messageMarker)).to.be.true; @@ -313,9 +313,9 @@ describe('TransferTransaction', () => { delegatedPrivateKey, vrfPrivateKey, recipientPublicKey, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); }).to.throw(Error, 'PersistentDelegationRequestTransaction should be created without Mosaic'); }); @@ -326,8 +326,8 @@ describe('TransferTransaction', () => { Deadline.create(epochAdjustment), Address.createFromRawAddress('SATNE7Q5BITMUTRRN6IB4I7FLSDRDWZA34I2PMQ'), [NetworkCurrencyLocal.createRelative(100)], - PersistentHarvestingDelegationMessage.create('abc', vrfPrivateKey, recipientPublicKey, NetworkType.MIJIN_TEST), - NetworkType.MIJIN_TEST, + PersistentHarvestingDelegationMessage.create('abc', vrfPrivateKey, recipientPublicKey, NetworkType.PRIVATE_TEST), + NetworkType.PRIVATE_TEST, ); }).to.throw(); }); @@ -342,9 +342,9 @@ describe('TransferTransaction', () => { delegatedPrivateKey, vrfPrivateKey, recipientPublicKey, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); }).to.throw(); }); @@ -360,7 +360,7 @@ describe('TransferTransaction', () => { Address.createFromRawAddress('SATNE7Q5BITMUTRRN6IB4I7FLSDRDWZA34I2PMQ'), mosaics, PlainMessage.create('NEM'), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); expect(transferTransaction.mosaics[0].id.id.compact()).to.be.equal(200); @@ -389,7 +389,7 @@ describe('TransferTransaction', () => { Address.createFromRawAddress('SATNE7Q5BITMUTRRN6IB4I7FLSDRDWZA34I2PMQ'), mosaics, PlainMessage.create('NEM'), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); expect(transferTransaction.mosaics[0].id.toHex()).to.be.equal('D525AD41D95FCF29'); @@ -410,7 +410,7 @@ describe('TransferTransaction', () => { namespaceId, [NetworkCurrencyLocal.createAbsolute(1)], PlainMessage.create('test-message'), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const payload = transferTransaction.serialize(); const newTransaction = CreateTransactionFromPayload(payload) as TransferTransaction; @@ -425,7 +425,7 @@ describe('TransferTransaction', () => { Address.createFromRawAddress('SATNE7Q5BITMUTRRN6IB4I7FLSDRDWZA34I2PMQ'), [NetworkCurrencyLocal.createAbsolute(1)], PlainMessage.create('test-message'), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ).setMaxFee(2); expect(transferTransaction.maxFee.compact()).to.be.equal(378); @@ -439,14 +439,14 @@ describe('TransferTransaction', () => { Address.createFromRawAddress('SATNE7Q5BITMUTRRN6IB4I7FLSDRDWZA34I2PMQ'), [NetworkCurrencyLocal.createAbsolute(1)], PlainMessage.create('test-message'), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); expect(() => { AggregateTransaction.createComplete( Deadline.create(epochAdjustment), [transferTransaction.toAggregate(account.publicAccount)], - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, [], ).setMaxFee(2); }).to.throw(); @@ -454,7 +454,7 @@ describe('TransferTransaction', () => { it('Test resolveAlias can resolve', () => { const transferTransaction = new TransferTransaction( - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, 1, Deadline.createFromDTO('1'), UInt64.fromUint(0), @@ -481,7 +481,7 @@ describe('TransferTransaction', () => { address, [NetworkCurrencyLocal.createAbsolute(1)], PlainMessage.create('test-message'), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); let canNotify = tx.shouldNotifyAccount(address, []); expect(canNotify).to.be.true; @@ -501,7 +501,7 @@ describe('TransferTransaction', () => { namespaceId, [NetworkCurrencyLocal.createAbsolute(1)], PlainMessage.create('test-message'), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ).shouldNotifyAccount(address, [namespaceId]); expect(canNotify).to.be.true; }); diff --git a/test/model/transaction/VotingKeyLinkTransaction.spec.ts b/test/model/transaction/VotingKeyLinkTransaction.spec.ts index 66268b5415..ffee921400 100644 --- a/test/model/transaction/VotingKeyLinkTransaction.spec.ts +++ b/test/model/transaction/VotingKeyLinkTransaction.spec.ts @@ -45,7 +45,7 @@ describe('VotingKeyLinkTransaction', () => { startEpoch, endEpoch, LinkAction.Link, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); expect(votingKeyLinkTransaction.maxFee.higher).to.be.equal(0); @@ -61,7 +61,7 @@ describe('VotingKeyLinkTransaction', () => { startEpoch, endEpoch, LinkAction.Link, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, new UInt64([1, 0]), ); @@ -78,7 +78,7 @@ describe('VotingKeyLinkTransaction', () => { startEpoch, endEpoch, LinkAction.Link, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); expect(votingKeyLinkTransaction.linkAction).to.be.equal(1); @@ -100,7 +100,7 @@ describe('VotingKeyLinkTransaction', () => { startEpoch, endEpoch, LinkAction.Unlink, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); expect(votingKeyLinkTransaction.linkAction).to.be.equal(0); @@ -123,7 +123,7 @@ describe('VotingKeyLinkTransaction', () => { startEpoch, endEpoch, LinkAction.Unlink, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); expect(Convert.hexToUint8(votingKeyLinkTransaction.serialize()).length).to.be.equal(votingKeyLinkTransaction.size); expect(votingKeyLinkTransaction.size).to.be.equal(185); @@ -137,7 +137,7 @@ describe('VotingKeyLinkTransaction', () => { startEpoch, endEpoch, LinkAction.Unlink, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ).setMaxFee(2); expect(votingKeyLinkTransaction.maxFee.compact()).to.be.equal(370); @@ -152,7 +152,7 @@ describe('VotingKeyLinkTransaction', () => { startEpoch, endEpoch, LinkAction.Unlink, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); let canNotify = tx.shouldNotifyAccount(account.address); expect(canNotify).to.be.true; diff --git a/test/model/transaction/VrfKeyLinkTransaction.spec.ts b/test/model/transaction/VrfKeyLinkTransaction.spec.ts index d623afa913..0c25e86371 100644 --- a/test/model/transaction/VrfKeyLinkTransaction.spec.ts +++ b/test/model/transaction/VrfKeyLinkTransaction.spec.ts @@ -39,7 +39,7 @@ describe('VrfKeyLinkTransaction', () => { Deadline.create(epochAdjustment), account.publicKey, LinkAction.Link, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); expect(vrfKeyLinkTransaction.maxFee.higher).to.be.equal(0); @@ -51,7 +51,7 @@ describe('VrfKeyLinkTransaction', () => { Deadline.create(epochAdjustment), account.publicKey, LinkAction.Link, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, new UInt64([1, 0]), ); @@ -64,7 +64,7 @@ describe('VrfKeyLinkTransaction', () => { Deadline.create(epochAdjustment), account.publicKey, LinkAction.Link, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); expect(vrfKeyLinkTransaction.linkAction).to.be.equal(1); @@ -82,7 +82,7 @@ describe('VrfKeyLinkTransaction', () => { Deadline.create(epochAdjustment), account.publicKey, LinkAction.Unlink, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); expect(vrfKeyLinkTransaction.linkAction).to.be.equal(0); @@ -101,7 +101,7 @@ describe('VrfKeyLinkTransaction', () => { Deadline.create(epochAdjustment), account.publicKey, LinkAction.Unlink, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); expect(Convert.hexToUint8(vrfKeyLinkTransaction.serialize()).length).to.be.equal(vrfKeyLinkTransaction.size); expect(vrfKeyLinkTransaction.size).to.be.equal(161); @@ -113,7 +113,7 @@ describe('VrfKeyLinkTransaction', () => { Deadline.create(epochAdjustment), account.publicKey, LinkAction.Unlink, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ).setMaxFee(2); expect(vrfKeyLinkTransaction.maxFee.compact()).to.be.equal(322); @@ -126,7 +126,7 @@ describe('VrfKeyLinkTransaction', () => { Deadline.create(epochAdjustment), account.publicKey, LinkAction.Unlink, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); let canNotify = tx.shouldNotifyAccount(account.address); expect(canNotify).to.be.true; diff --git a/test/model/wallet/SimpleWallet.spec.ts b/test/model/wallet/SimpleWallet.spec.ts index 1a4475696d..ae72a40149 100644 --- a/test/model/wallet/SimpleWallet.spec.ts +++ b/test/model/wallet/SimpleWallet.spec.ts @@ -22,30 +22,40 @@ import { SimpleWallet } from '../../../src/model/wallet/SimpleWallet'; describe('SimpleWallet', () => { it('should create a new simple wallet', () => { - const simpleWallet = SimpleWallet.create('wallet-name', new Password('password'), NetworkType.MIJIN_TEST); + const simpleWallet = SimpleWallet.create('wallet-name', new Password('password'), NetworkType.PRIVATE_TEST); expect(simpleWallet.name).to.be.equal('wallet-name'); - expect(simpleWallet.networkType).to.be.equal(NetworkType.MIJIN_TEST); + expect(simpleWallet.networkType).to.be.equal(NetworkType.PRIVATE_TEST); expect(simpleWallet.schema).to.be.equal('simple_v2'); }); it('should create a new wallet with privateKey', () => { const privateKey = '5149a02ca2b2610138376717daaff8477f1639796aa108b7eee83e99e585b250'; - const account = Account.createFromPrivateKey(privateKey, NetworkType.MIJIN_TEST); - const simpleWallet = SimpleWallet.createFromPrivateKey('wallet-name', new Password('password'), privateKey, NetworkType.MIJIN_TEST); + const account = Account.createFromPrivateKey(privateKey, NetworkType.PRIVATE_TEST); + const simpleWallet = SimpleWallet.createFromPrivateKey( + 'wallet-name', + new Password('password'), + privateKey, + NetworkType.PRIVATE_TEST, + ); expect(simpleWallet.name).to.be.equal('wallet-name'); - expect(simpleWallet.networkType).to.be.equal(NetworkType.MIJIN_TEST); + expect(simpleWallet.networkType).to.be.equal(NetworkType.PRIVATE_TEST); expect(simpleWallet.address.plain()).to.be.equal(account.address.plain()); }); it('should open a new simple wallet', () => { - const simpleWallet = SimpleWallet.create('wallet-name', new Password('password'), NetworkType.MIJIN_TEST); + const simpleWallet = SimpleWallet.create('wallet-name', new Password('password'), NetworkType.PRIVATE_TEST); const account = simpleWallet.open(new Password('password')); expect(account.address.plain()).to.be.equal(simpleWallet.address.plain()); }); it('should open a new simple wallet created from private key', () => { const privateKey = '5149a02ca2b2610138376717daaff8477f1639796aa108b7eee83e99e585b250'; - const simpleWallet = SimpleWallet.createFromPrivateKey('wallet-name', new Password('password'), privateKey, NetworkType.MIJIN_TEST); + const simpleWallet = SimpleWallet.createFromPrivateKey( + 'wallet-name', + new Password('password'), + privateKey, + NetworkType.PRIVATE_TEST, + ); const account = simpleWallet.open(new Password('password')); expect(simpleWallet.address.plain()).to.be.equal(account.address.plain()); }); @@ -53,7 +63,7 @@ describe('SimpleWallet', () => { it('should open a simple wallet from a simple wallet without prototype', () => { const privateKey = '5149a02ca2b2610138376717daaff8477f1639796aa108b7eee83e99e585b250'; const password = new Password('password'); - const simpleWallet = SimpleWallet.createFromPrivateKey('wallet-name', password, privateKey, NetworkType.MIJIN_TEST); + const simpleWallet = SimpleWallet.createFromPrivateKey('wallet-name', password, privateKey, NetworkType.PRIVATE_TEST); const account = simpleWallet.open(new Password('password')); const simpleWalletNoProto = JSON.parse(JSON.stringify(simpleWallet)); const simpleWallet2 = SimpleWallet.createFromDTO(simpleWalletNoProto); @@ -64,7 +74,7 @@ describe('SimpleWallet', () => { it('should create a simple wallet DTO', () => { const privateKey = '5149a02ca2b2610138376717daaff8477f1639796aa108b7eee83e99e585b250'; const password = new Password('password'); - const simpleWallet = SimpleWallet.createFromPrivateKey('wallet-name', password, privateKey, NetworkType.MIJIN_TEST); + const simpleWallet = SimpleWallet.createFromPrivateKey('wallet-name', password, privateKey, NetworkType.PRIVATE_TEST); const simpleWalletDTO = simpleWallet.toDTO(); expect(simpleWalletDTO).to.deep.equal(JSON.parse(JSON.stringify(simpleWallet))); }); diff --git a/test/service/AggregateTransactionService.spec.ts b/test/service/AggregateTransactionService.spec.ts index b49a93307c..b6daafb614 100644 --- a/test/service/AggregateTransactionService.spec.ts +++ b/test/service/AggregateTransactionService.spec.ts @@ -62,33 +62,33 @@ describe('AggregateTransactionService', () => { const account1 = Account.createFromPrivateKey( '82DB2528834C9926F0FCCE042466B24A266F5B685CB66D2869AF6648C043E950', - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const multisig1 = Account.createFromPrivateKey( '8B0622C2CCFC5CCC5A74B500163E3C68F3AD3643DB12932FC931143EAC67280D', - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const multisig2 = Account.createFromPrivateKey( '22A1D67F8519D1A45BD7116600BB6E857786E816FE0B45E4C5B9FFF3D64BC177', - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const multisig3 = Account.createFromPrivateKey( '5E7812AB0E709ABC45466034E1A209099F6A12C4698748A63CDCAA9B0DDE1DBD', - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const account2 = Account.createFromPrivateKey( 'A4D410270E01CECDCDEADCDE32EC79C8D9CDEA4DCD426CB1EB666EFEF148FBCE', - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const account3 = Account.createFromPrivateKey( '336AB45EE65A6AFFC0E7ADC5342F91E34BACA0B901A1D9C876FA25A1E590077E', - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const account4 = Account.createFromPrivateKey( '4D8B3756592532753344E11E2B7541317BCCFBBCF4444274CDBF359D2C4AE0F1', - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const generationHash = '57F7DA205008026C776CB6AED843393F04CD458E0AA2D9F1D5F31A402072B2D6'; const epochAdjustment = Duration.ofSeconds(1573430400); @@ -193,13 +193,13 @@ describe('AggregateTransactionService', () => { Address.createFromRawAddress('SATNE7Q5BITMUTRRN6IB4I7FLSDRDWZA34I2PMQ'), [], PlainMessage.create('test-message'), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const aggregateTransaction = AggregateTransaction.createComplete( Deadline.create(epochAdjustment), [transferTransaction.toAggregate(multisig2.publicAccount)], - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, [], ); @@ -226,13 +226,13 @@ describe('AggregateTransactionService', () => { Address.createFromRawAddress('SATNE7Q5BITMUTRRN6IB4I7FLSDRDWZA34I2PMQ'), [], PlainMessage.create('test-message'), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const aggregateTransaction = AggregateTransaction.createComplete( Deadline.create(epochAdjustment), [transferTransaction.toAggregate(multisig2.publicAccount)], - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, [], ); @@ -259,13 +259,13 @@ describe('AggregateTransactionService', () => { Address.createFromRawAddress('SATNE7Q5BITMUTRRN6IB4I7FLSDRDWZA34I2PMQ'), [], PlainMessage.create('test-message'), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const aggregateTransaction = AggregateTransaction.createComplete( Deadline.create(epochAdjustment), [transferTransaction.toAggregate(multisig2.publicAccount)], - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, [], ); @@ -293,7 +293,7 @@ describe('AggregateTransactionService', () => { account2.address, [], PlainMessage.create('test-message'), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const transferTransaction2 = TransferTransaction.create( @@ -301,13 +301,13 @@ describe('AggregateTransactionService', () => { account2.address, [], PlainMessage.create('test-message'), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const aggregateTransaction = AggregateTransaction.createComplete( Deadline.create(epochAdjustment), [transferTransaction.toAggregate(multisig2.publicAccount), transferTransaction2.toAggregate(account4.publicAccount)], - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, [], ); const signedTransaction = aggregateTransaction.signTransactionWithCosignatories(account1, [account4], generationHash); @@ -334,7 +334,7 @@ describe('AggregateTransactionService', () => { account2.address, [], PlainMessage.create('test-message'), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const transferTransaction2 = TransferTransaction.create( @@ -342,13 +342,13 @@ describe('AggregateTransactionService', () => { account2.address, [], PlainMessage.create('test-message'), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const aggregateTransaction = AggregateTransaction.createComplete( Deadline.create(epochAdjustment), [transferTransaction.toAggregate(multisig2.publicAccount), transferTransaction2.toAggregate(account4.publicAccount)], - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, [], ); const signedTransaction = aggregateTransaction.signTransactionWithCosignatories(account1, [account4, account2], generationHash); @@ -373,13 +373,13 @@ describe('AggregateTransactionService', () => { 1, [], [account1.address], - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const aggregateTransaction = AggregateTransaction.createComplete( Deadline.create(epochAdjustment), [modifyMultisigTransaction.toAggregate(multisig2.publicAccount)], - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, [], ); const signedTransaction = aggregateTransaction.signWith(account2, generationHash); @@ -403,13 +403,13 @@ describe('AggregateTransactionService', () => { Address.createFromRawAddress('SATNE7Q5BITMUTRRN6IB4I7FLSDRDWZA34I2PMQ'), [], PlainMessage.create('test-message'), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const aggregateTransaction = AggregateTransaction.createComplete( Deadline.create(epochAdjustment), [transferTransaction.toAggregate(account4.publicAccount)], - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, [], ); @@ -435,13 +435,13 @@ describe('AggregateTransactionService', () => { Address.createFromRawAddress('SATNE7Q5BITMUTRRN6IB4I7FLSDRDWZA34I2PMQ'), [], PlainMessage.create('test-message'), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const aggregateTransaction = AggregateTransaction.createComplete( Deadline.create(epochAdjustment), [transferTransaction.toAggregate(account4.publicAccount)], - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, [], ); @@ -473,7 +473,7 @@ describe('AggregateTransactionService', () => { account1.address, [], PlainMessage.create('test-message'), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const transferTransaction2 = TransferTransaction.create( @@ -481,13 +481,13 @@ describe('AggregateTransactionService', () => { account4.address, [], PlainMessage.create('test-message'), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const aggregateTransaction = AggregateTransaction.createComplete( Deadline.create(epochAdjustment), [transferTransaction.toAggregate(account4.publicAccount), transferTransaction2.toAggregate(account1.publicAccount)], - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, [], ); @@ -518,7 +518,7 @@ describe('AggregateTransactionService', () => { account1.address, [], PlainMessage.create('test-message'), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const transferTransaction2 = TransferTransaction.create( @@ -526,13 +526,13 @@ describe('AggregateTransactionService', () => { account4.address, [], PlainMessage.create('test-message'), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const aggregateTransaction = AggregateTransaction.createComplete( Deadline.create(epochAdjustment), [transferTransaction.toAggregate(account4.publicAccount), transferTransaction2.toAggregate(account1.publicAccount)], - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, [], ); @@ -556,13 +556,13 @@ describe('AggregateTransactionService', () => { account4.address, [], PlainMessage.create('test-message'), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const aggregateTransaction = AggregateTransaction.createComplete( Deadline.create(epochAdjustment), [transferTransaction.toAggregate(multisig3.publicAccount)], - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, [], ); @@ -586,13 +586,13 @@ describe('AggregateTransactionService', () => { account4.address, [], PlainMessage.create('test-message'), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const aggregateTransaction = AggregateTransaction.createComplete( Deadline.create(epochAdjustment), [transferTransaction.toAggregate(multisig3.publicAccount)], - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, [], ); diff --git a/test/service/BlockService.spec.ts b/test/service/BlockService.spec.ts index 12d194fe83..3d0fcaa94c 100644 --- a/test/service/BlockService.spec.ts +++ b/test/service/BlockService.spec.ts @@ -55,7 +55,7 @@ describe('BlockService', () => { 1, 'signature', account.publicAccount, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, 0, 0, UInt64.fromUint(1), @@ -84,7 +84,7 @@ describe('BlockService', () => { 1, 'signature', account.publicAccount, - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, 0, 0, UInt64.fromUint(1), diff --git a/test/service/MetadataTransactionservice.spec.ts b/test/service/MetadataTransactionservice.spec.ts index 907ea7e41a..a23568374b 100644 --- a/test/service/MetadataTransactionservice.spec.ts +++ b/test/service/MetadataTransactionservice.spec.ts @@ -114,7 +114,7 @@ describe('MetadataTransactionService', () => { metadataTransactionService .createAccountMetadataTransaction( Deadline.create(epochAdjustment), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, account.address, key, value + deltaValue, @@ -137,7 +137,7 @@ describe('MetadataTransactionService', () => { metadataTransactionService .createMosaicMetadataTransaction( Deadline.create(epochAdjustment), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, account.address, new MosaicId(targetIdHex), key, @@ -162,7 +162,7 @@ describe('MetadataTransactionService', () => { metadataTransactionService .createNamespaceMetadataTransaction( Deadline.create(epochAdjustment), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, account.address, NamespaceId.createFromEncoded(targetIdHex), key, @@ -197,7 +197,7 @@ describe('MetadataTransactionService', () => { expect(() => { metadataTransactionService.createAccountMetadataTransaction( Deadline.create(epochAdjustment), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, account.address, key, value + deltaValue, @@ -221,7 +221,7 @@ describe('MetadataTransactionService', () => { expect(() => { metadataTransactionService.createMosaicMetadataTransaction( Deadline.create(epochAdjustment), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, account.address, new MosaicId(targetIdHex), key, @@ -246,7 +246,7 @@ describe('MetadataTransactionService', () => { expect(() => { metadataTransactionService.createNamespaceMetadataTransaction( Deadline.create(epochAdjustment), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, account.address, NamespaceId.createFromEncoded(targetIdHex), key, diff --git a/test/service/MosaicRestrictionTransactionservice.spec.ts b/test/service/MosaicRestrictionTransactionservice.spec.ts index c177c9dfbf..cc0f7e9b3b 100644 --- a/test/service/MosaicRestrictionTransactionservice.spec.ts +++ b/test/service/MosaicRestrictionTransactionservice.spec.ts @@ -106,7 +106,7 @@ describe('MosaicRestrictionTransactionService', () => { mosaicRestrictionTransactionService .createMosaicGlobalRestrictionTransaction( Deadline.create(epochAdjustment), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, mosaicId, key, '2000', @@ -126,7 +126,7 @@ describe('MosaicRestrictionTransactionService', () => { mosaicRestrictionTransactionService .createMosaicGlobalRestrictionTransaction( Deadline.create(epochAdjustment), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, mosaicId, key, '2000', @@ -147,7 +147,7 @@ describe('MosaicRestrictionTransactionService', () => { mosaicRestrictionTransactionService .createMosaicAddressRestrictionTransaction( Deadline.create(epochAdjustment), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, mosaicId, key, account.address, @@ -166,7 +166,7 @@ describe('MosaicRestrictionTransactionService', () => { mosaicRestrictionTransactionService .createMosaicGlobalRestrictionTransaction( Deadline.create(epochAdjustment), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, unresolvedMosaicId, key, '2000', @@ -186,7 +186,7 @@ describe('MosaicRestrictionTransactionService', () => { mosaicRestrictionTransactionService .createMosaicAddressRestrictionTransaction( Deadline.create(epochAdjustment), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, unresolvedMosaicId, key, unresolvedAddress, @@ -205,7 +205,7 @@ describe('MosaicRestrictionTransactionService', () => { expect(() => { mosaicRestrictionTransactionService.createMosaicGlobalRestrictionTransaction( Deadline.create(epochAdjustment), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, unresolvedAddress, key, '2000', @@ -218,7 +218,7 @@ describe('MosaicRestrictionTransactionService', () => { expect(() => { mosaicRestrictionTransactionService.createMosaicAddressRestrictionTransaction( Deadline.create(epochAdjustment), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, mosaicId, key, unresolvedMosaicId, @@ -231,7 +231,7 @@ describe('MosaicRestrictionTransactionService', () => { expect(() => { mosaicRestrictionTransactionService.createMosaicGlobalRestrictionTransaction( Deadline.create(epochAdjustment), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, mosaicId, key, 'wrong value', @@ -242,7 +242,7 @@ describe('MosaicRestrictionTransactionService', () => { expect(() => { mosaicRestrictionTransactionService.createMosaicAddressRestrictionTransaction( Deadline.create(epochAdjustment), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, mosaicId, key, account.address, @@ -255,7 +255,7 @@ describe('MosaicRestrictionTransactionService', () => { mosaicRestrictionTransactionService .createMosaicAddressRestrictionTransaction( Deadline.create(epochAdjustment), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, mosaicIdWrongKey, invalidKey, account.address, diff --git a/test/service/NamespaceService.spec.ts b/test/service/NamespaceService.spec.ts index c22802d248..acc5ed9902 100644 --- a/test/service/NamespaceService.spec.ts +++ b/test/service/NamespaceService.spec.ts @@ -37,7 +37,7 @@ describe('NamespaceService', () => { 1, [new NamespaceId([3316183705, 3829351378])], new NamespaceId([0, 0]), - Address.createFromPublicKey('1026D70E1954775749C6811084D6450A3184D977383F0E4282CD47118AF37755', NetworkType.MIJIN_TEST), + Address.createFromPublicKey('1026D70E1954775749C6811084D6450A3184D977383F0E4282CD47118AF37755', NetworkType.PRIVATE_TEST), new UInt64([795, 0]), new UInt64([50795, 0]), new EmptyAlias(), @@ -53,7 +53,7 @@ describe('NamespaceService', () => { 2, [new NamespaceId([3316183705, 3829351378]), new NamespaceId([1781696705, 4157485863])], new NamespaceId([3316183705, 3829351378]), - Address.createFromPublicKey('1026D70E1954775749C6811084D6450A3184D977383F0E4282CD47118AF37755', NetworkType.MIJIN_TEST), + Address.createFromPublicKey('1026D70E1954775749C6811084D6450A3184D977383F0E4282CD47118AF37755', NetworkType.PRIVATE_TEST), new UInt64([795, 0]), new UInt64([50795, 0]), new EmptyAlias(), diff --git a/test/service/TransactionService.spec.ts b/test/service/TransactionService.spec.ts index caef819213..829c0c6baa 100644 --- a/test/service/TransactionService.spec.ts +++ b/test/service/TransactionService.spec.ts @@ -43,27 +43,27 @@ import { TransactionService } from '../../src/service/TransactionService'; */ describe('TransactionService', () => { const generationHash = '82DB2528834C9926F0FCCE042466B24A266F5B685CB66D2869AF6648C043E950'; - const account = Account.generateNewAccount(NetworkType.MIJIN_TEST); + const account = Account.generateNewAccount(NetworkType.PRIVATE_TEST); const epochAdjustment = Duration.ofSeconds(1573430400); const transferTransaction = TransferTransaction.create( Deadline.create(epochAdjustment, 1, ChronoUnit.HOURS), Address.createFromRawAddress('SATNE7Q5BITMUTRRN6IB4I7FLSDRDWZA34I2PMQ'), [], PlainMessage.create('test-message'), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); const aggregateCompleteTransaction = AggregateTransaction.createComplete( Deadline.create(epochAdjustment), [transferTransaction.toAggregate(account.publicAccount)], - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, [], ); const aggregateBondedTransaction = AggregateTransaction.createBonded( Deadline.create(epochAdjustment), [transferTransaction.toAggregate(account.publicAccount)], - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, [], ); @@ -72,7 +72,7 @@ describe('TransactionService', () => { new Mosaic(new NamespaceId('cat.currency'), UInt64.fromUint(10 * Math.pow(10, NetworkCurrencyLocal.DIVISIBILITY))), UInt64.fromUint(10000), account.sign(aggregateBondedTransaction, generationHash), - NetworkType.MIJIN_TEST, + NetworkType.PRIVATE_TEST, ); let transactionRepositoryMock: TransactionRepository;