Removed old flatbuffer staffs

rg911 · rg911 · commit cba64e5bbcbf · 2019-09-02T12:30:58.000+01:00
diff --git a/e2e/conf/network.conf b/e2e/conf/network.conf
@@ -51,4 +51,4 @@
         "publicKey": "FAEDB16763F22870B75BF934EA5F2792BDF109EC0C504718DDCBD92DF13C2628",
         "address": "SCNPFCWFV2FYQVMU5HMJJTMADRZ3LRXVA76F56N2"
     }
-}
+}
diff --git a/src/model/transaction/AccountAddressRestrictionTransaction.ts b/src/model/transaction/AccountAddressRestrictionTransaction.ts
@@ -15,13 +15,10 @@
  */
 
 import { Convert, RawAddress } from '../../core/format';
-import { Builder } from '../../infrastructure/builders/AccountRestrictionsAddressTransaction';
-import {VerifiableTransaction} from '../../infrastructure/builders/VerifiableTransaction';
 import { AccountAddressRestrictionModificationBuilder } from '../../infrastructure/catbuffer/AccountAddressRestrictionModificationBuilder';
 import { AccountAddressRestrictionTransactionBuilder } from '../../infrastructure/catbuffer/AccountAddressRestrictionTransactionBuilder';
 import { AmountDto } from '../../infrastructure/catbuffer/AmountDto';
 import { EmbeddedAccountAddressRestrictionTransactionBuilder } from '../../infrastructure/catbuffer/EmbeddedAccountAddressRestrictionTransactionBuilder';
-import { EntityTypeDto } from '../../infrastructure/catbuffer/EntityTypeDto';
 import { KeyDto } from '../../infrastructure/catbuffer/KeyDto';
 import { SignatureDto } from '../../infrastructure/catbuffer/SignatureDto';
 import { TimestampDto } from '../../infrastructure/catbuffer/TimestampDto';
@@ -106,20 +103,6 @@ export class AccountAddressRestrictionTransaction extends Transaction {
         return byteSize + byteRestrictionType + byteModificationCount + byteModifications;
     }
 
-    /**
-     * @internal
-     * @returns {VerifiableTransaction}
-     */
-    protected buildTransaction(): VerifiableTransaction {
-        return new Builder()
-            .addDeadline(this.deadline.toDTO())
-            .addFee(this.maxFee.toDTO())
-            .addVersion(this.versionToDTO())
-            .addRestrictionType(this.restrictionType)
-            .addModifications(this.modifications.map((modification) => modification.toDTO()))
-            .build();
-    }
-
     /**
      * @internal
      * @returns {Uint8Array}
diff --git a/src/model/transaction/AccountMosaicRestrictionTransaction.ts b/src/model/transaction/AccountMosaicRestrictionTransaction.ts
@@ -15,8 +15,6 @@
  */
 
 import { Convert } from '../../core/format';
-import { Builder } from '../../infrastructure/builders/AccountRestrictionsMosaicTransaction';
-import {VerifiableTransaction} from '../../infrastructure/builders/VerifiableTransaction';
 import { AccountMosaicRestrictionModificationBuilder } from '../../infrastructure/catbuffer/AccountMosaicRestrictionModificationBuilder';
 import { AccountMosaicRestrictionTransactionBuilder } from '../../infrastructure/catbuffer/AccountMosaicRestrictionTransactionBuilder';
 import { AmountDto } from '../../infrastructure/catbuffer/AmountDto';
@@ -105,20 +103,6 @@ export class AccountMosaicRestrictionTransaction extends Transaction {
         return byteSize + byteRestrictionType + byteModificationCount + byteModifications;
     }
 
-    /**
-     * @internal
-     * @returns {VerifiableTransaction}
-     */
-    protected buildTransaction(): VerifiableTransaction {
-        return new Builder()
-            .addDeadline(this.deadline.toDTO())
-            .addFee(this.maxFee.toDTO())
-            .addVersion(this.versionToDTO())
-            .addRestrictionType(this.restrictionType)
-            .addModifications(this.modifications.map((modification) => modification.toDTO()))
-            .build();
-    }
-
     /**
      * @internal
      * @returns {Uint8Array}
diff --git a/src/model/transaction/AccountOperationRestrictionTransaction.ts b/src/model/transaction/AccountOperationRestrictionTransaction.ts
@@ -15,8 +15,6 @@
  */
 
 import { Convert } from '../../core/format';
-import { Builder } from '../../infrastructure/builders/AccountRestrictionsEntityTypeTransaction';
-import {VerifiableTransaction} from '../../infrastructure/builders/VerifiableTransaction';
 import { AccountOperationRestrictionModificationBuilder } from '../../infrastructure/catbuffer/AccountOperationRestrictionModificationBuilder';
 import { AccountOperationRestrictionTransactionBuilder } from '../../infrastructure/catbuffer/AccountOperationRestrictionTransactionBuilder';
 import { AmountDto } from '../../infrastructure/catbuffer/AmountDto';
@@ -104,20 +102,6 @@ export class AccountOperationRestrictionTransaction extends Transaction {
         return byteSize + byteRestrictionType + byteModificationCount + byteModifications;
     }
 
-    /**
-     * @internal
-     * @returns {VerifiableTransaction}
-     */
-    protected buildTransaction(): VerifiableTransaction {
-        return new Builder()
-            .addDeadline(this.deadline.toDTO())
-            .addFee(this.maxFee.toDTO())
-            .addVersion(this.versionToDTO())
-            .addRestrictionType(this.restrictionType)
-            .addModifications(this.modifications.map((modification) => modification.toDTO()))
-            .build();
-    }
-
     /**
      * @internal
      * @returns {Uint8Array}
diff --git a/src/model/transaction/AggregateTransaction.ts b/src/model/transaction/AggregateTransaction.ts
@@ -335,11 +335,4 @@ export class AggregateTransaction extends Transaction {
         throw new Error('Method not implemented');
     }
 
-    /**
-     * @internal
-     * @returns {Uint8Array}
-     */
-    protected generateEmbeddedBytes(): Uint8Array {
-        throw new Error('Method not implemented');
-    }
 }
diff --git a/src/model/transaction/ModifyMultisigAccountTransaction.ts b/src/model/transaction/ModifyMultisigAccountTransaction.ts
@@ -33,7 +33,6 @@ import { Transaction } from './Transaction';
 import { TransactionInfo } from './TransactionInfo';
 import { TransactionType } from './TransactionType';
 import { TransactionVersion } from './TransactionVersion';
-import { EmbeddedMultisigAccountModificationTransactionBuilder } from '../../infrastructure/catbuffer/EmbeddedMultisigAccountModificationTransactionBuilder';
 
 /**
  * Modify multisig account transactions are part of the NEM's multisig account system.
diff --git a/src/model/transaction/MosaicDefinitionTransaction.ts b/src/model/transaction/MosaicDefinitionTransaction.ts
@@ -233,23 +233,4 @@ export class MosaicDefinitionTransaction extends Transaction {
         );
         return transactionBuilder.serialize();
     }
-
-    /**
-     * @internal
-     * @returns {Uint8Array}
-     */
-    protected generateEmbeddedBytes(): Uint8Array {
-        const transactionBuilder = new EmbeddedMosaicDefinitionTransactionBuilder(
-            new KeyDto(Convert.hexToUint8(this.signer!.publicKey)),
-            this.versionToDTO(),
-            TransactionType.MOSAIC_DEFINITION.valueOf(),
-            new MosaicNonceDto(this.getMosaicNonceIntValue()),
-            new MosaicIdDto(this.mosaicId.id.toDTO()),
-            this.getMosaicFlagValue(),
-            this.mosaicProperties.divisibility,
-            new BlockDurationDto(this.mosaicProperties.duration ?
-                    this.mosaicProperties.duration.toDTO() : []),
-        );
-        return transactionBuilder.serialize();
-    }
 }
diff --git a/src/model/transaction/MosaicSupplyChangeTransaction.ts b/src/model/transaction/MosaicSupplyChangeTransaction.ts
@@ -34,7 +34,6 @@ import { Transaction } from './Transaction';
 import { TransactionInfo } from './TransactionInfo';
 import { TransactionType } from './TransactionType';
 import { TransactionVersion } from './TransactionVersion';
-import { Convert } from '../../core/format';
 
 /**
  * In case a mosaic has the flag 'supplyMutable' set to true, the creator of the mosaic can change the supply,
diff --git a/src/model/transaction/TransferTransaction.ts b/src/model/transaction/TransferTransaction.ts
@@ -263,23 +263,4 @@ export class TransferTransaction extends Transaction {
         );
         return transactionBuilder.serialize();
     }
-
-    /**
-     * @internal
-     * @returns {Uint8Array}
-     */
-    protected generateEmbeddedBytes(): Uint8Array {
-        const transactionBuilder = new EmbeddedTransferTransactionBuilder(
-            new KeyDto(Convert.hexToUint8(this.signer!.publicKey)),
-            this.versionToDTO(),
-            TransactionType.TRANSFER.valueOf(),
-            new UnresolvedAddressDto(RawAddress.stringToAddress(this.recipientToString())),
-            this.getMessageBuffer(),
-            this.sortMosaics().map((mosaic) => {
-                return new UnresolvedMosaicBuilder(new UnresolvedMosaicIdDto(mosaic.id.id.toDTO()),
-                                                   new AmountDto(mosaic.amount.toDTO()));
-            }),
-        );
-        return transactionBuilder.serialize();
-    }
 }
diff --git a/test/model/transaction/AccountLinkTransaction.spec.ts b/test/model/transaction/AccountLinkTransaction.spec.ts
@@ -66,7 +66,7 @@ describe('AccountLinkTransaction', () => {
         expect(accountLinkTransaction.linkAction).to.be.equal(1);
         expect(accountLinkTransaction.remoteAccountKey).to.be.equal(account.publicKey);
 
-        const signedTransaction = accountLinkTransaction.signWithCatbuffer(account, generationHash);
+        const signedTransaction = accountLinkTransaction.signWith(account, generationHash);
 
         expect(signedTransaction.payload.substring(
             240,
diff --git a/test/model/transaction/AccountRestrictionTransaction.spec.ts b/test/model/transaction/AccountRestrictionTransaction.spec.ts
@@ -162,7 +162,7 @@ describe('AccountRestrictionTransaction', () => {
             NetworkType.MIJIN_TEST,
         );
 
-        const signedTransaction = addressRestrictionTransaction.signWithCatbuffer(account, generationHash);
+        const signedTransaction = addressRestrictionTransaction.signWith(account, generationHash);
 
         expect(signedTransaction.payload.substring(
             240,
@@ -213,7 +213,7 @@ describe('AccountRestrictionTransaction', () => {
             NetworkType.MIJIN_TEST,
         );
 
-        const signedTransaction = mosaicRestrictionTransaction.signWithCatbuffer(account, generationHash);
+        const signedTransaction = mosaicRestrictionTransaction.signWith(account, generationHash);
 
         expect(signedTransaction.payload.substring(
             240,
@@ -266,7 +266,7 @@ describe('AccountRestrictionTransaction', () => {
             NetworkType.MIJIN_TEST,
         );
 
-        const signedTransaction = operationRestrictionTransaction.signWithCatbuffer(account, generationHash);
+        const signedTransaction = operationRestrictionTransaction.signWith(account, generationHash);
 
         expect(signedTransaction.payload.substring(
             240,
diff --git a/test/model/transaction/AddressAliasTransaction.spec.ts b/test/model/transaction/AddressAliasTransaction.spec.ts
@@ -80,7 +80,7 @@ describe('AddressAliasTransaction', () => {
         expect(addressAliasTransaction.namespaceId.id.higher).to.be.equal(3779697293);
         expect(addressAliasTransaction.address.plain()).to.be.equal('SBILTA367K2LX2FEXG5TFWAS7GEFYAGY7QLFBYKC');
 
-        const signedTransaction = addressAliasTransaction.signWithCatbuffer(account, generationHash);
+        const signedTransaction = addressAliasTransaction.signWith(account, generationHash);
 
         expect(signedTransaction.payload.substring(
             240,
diff --git a/test/model/transaction/AggregateTransaction.spec.ts b/test/model/transaction/AggregateTransaction.spec.ts
@@ -106,7 +106,7 @@ describe('AggregateTransaction', () => {
             NetworkType.MIJIN_TEST,
             []);
 
-        const signedTransaction = aggregateTransaction.signWithCatbuffer(account, generationHash);
+        const signedTransaction = aggregateTransaction.signWith(account, generationHash);
 
         expect(signedTransaction.payload.substring(0, 8)).to.be.equal('CD000000');
         expect(signedTransaction.payload.substring(240, 256)).to.be.equal('5100000051000000');
diff --git a/test/model/transaction/ModifyMultisigAccountTransaction.spec.ts b/test/model/transaction/ModifyMultisigAccountTransaction.spec.ts
@@ -110,7 +110,7 @@ describe('ModifyMultisigAccountTransaction', () => {
         expect(modifyMultisigAccountTransaction.modifications[1].cosignatoryPublicAccount.publicKey)
             .to.be.equal('B1B5581FC81A6970DEE418D2C2978F2724228B7B36C5C6DF71B0162BB04778B4');
 
-        const signedTransaction = modifyMultisigAccountTransaction.signWithCatbuffer(account, generationHash);
+        const signedTransaction = modifyMultisigAccountTransaction.signWith(account, generationHash);
 
         expect(signedTransaction.payload.substring(
             240,
diff --git a/test/model/transaction/MosaicAddressRestrictionTransaction.spec.ts b/test/model/transaction/MosaicAddressRestrictionTransaction.spec.ts
@@ -47,7 +47,7 @@ describe('MosaicAddressRestrictionTransaction', () => {
         expect(mosaicAddressRestrictionTransaction.newRestrictionValue.toHex()).to.be.equal(UInt64.fromUint(8).toHex());
         expect(mosaicAddressRestrictionTransaction.targetAddress.plain()).to.be.equal(account.address.plain());
 
-        const signedTransaction = mosaicAddressRestrictionTransaction.signWithCatbuffer(account, generationHash);
+        const signedTransaction = mosaicAddressRestrictionTransaction.signWith(account, generationHash);
 
         expect(signedTransaction.payload.substring(
             240,
diff --git a/test/model/transaction/MosaicAliasTransaction.spec.ts b/test/model/transaction/MosaicAliasTransaction.spec.ts
@@ -80,7 +80,7 @@ describe('MosaicAliasTransaction', () => {
         expect(mosaicAliasTransaction.mosaicId.id.lower).to.be.equal(2262289484);
         expect(mosaicAliasTransaction.mosaicId.id.higher).to.be.equal(3405110546);
 
-        const signedTransaction = mosaicAliasTransaction.signWithCatbuffer(account, generationHash);
+        const signedTransaction = mosaicAliasTransaction.signWith(account, generationHash);
 
         expect(signedTransaction.payload.substring(
             240,
diff --git a/test/model/transaction/MosaicDefinitionTransaction.spec.ts b/test/model/transaction/MosaicDefinitionTransaction.spec.ts
@@ -93,7 +93,7 @@ describe('MosaicDefinitionTransaction', () => {
         expect(mosaicDefinitionTransaction.mosaicProperties.transferable).to.be.equal(true);
         expect(mosaicDefinitionTransaction.mosaicProperties.restrictable).to.be.equal(true);
 
-        const signedTransaction = mosaicDefinitionTransaction.signWithCatbuffer(account, generationHash);
+        const signedTransaction = mosaicDefinitionTransaction.signWith(account, generationHash);
 
         expect(signedTransaction.payload.substring(
             240,
diff --git a/test/model/transaction/MosaicGlobalRestrictionTransaction.spec.ts b/test/model/transaction/MosaicGlobalRestrictionTransaction.spec.ts
@@ -54,7 +54,7 @@ describe('MosaicGlobalRestrictionTransaction', () => {
         expect(mosaicGlobalRestrictionTransaction.previousRestrictionType).to.be.equal(MosaicRestrictionType.EQ);
         expect(mosaicGlobalRestrictionTransaction.newRestrictionType).to.be.equal(MosaicRestrictionType.GE);
 
-        const signedTransaction = mosaicGlobalRestrictionTransaction.signWithCatbuffer(account, generationHash);
+        const signedTransaction = mosaicGlobalRestrictionTransaction.signWith(account, generationHash);
 
         expect(signedTransaction.payload.substring(
             240,
diff --git a/test/model/transaction/RegisterNamespaceTransaction.spec.ts b/test/model/transaction/RegisterNamespaceTransaction.spec.ts
@@ -66,7 +66,7 @@ describe('RegisterNamespaceTransaction', () => {
         expect(registerNamespaceTransaction.duration!.lower).to.be.equal(1000);
         expect(registerNamespaceTransaction.duration!.higher).to.be.equal(0);
 
-        const signedTransaction = registerNamespaceTransaction.signWithCatbuffer(account, generationHash);
+        const signedTransaction = registerNamespaceTransaction.signWith(account, generationHash);
 
         expect(signedTransaction.payload.substring(
             240,
@@ -83,7 +83,7 @@ describe('RegisterNamespaceTransaction', () => {
             NetworkType.MIJIN_TEST,
         );
 
-        const signedTransaction = registerNamespaceTransaction.signWithCatbuffer(account, generationHash);
+        const signedTransaction = registerNamespaceTransaction.signWith(account, generationHash);
 
         expect(signedTransaction.payload.substring(
             240,
diff --git a/test/model/transaction/Transaction.spec.ts b/test/model/transaction/Transaction.spec.ts
@@ -241,12 +241,4 @@ class FakeTransaction extends Transaction {
     protected generateEmbeddedBytes(): Uint8Array {
         throw new Error('Not implemented');
     }
-
-    protected generateBytes(): Uint8Array {
-        throw new Error('Not implemented');
-    }
-
-    protected generateEmbeddedBytes(): Uint8Array {
-        throw new Error('Not implemented');
-    }
 }

Original file line number	Diff line number	Diff line change
`@@ -51,4 +51,4 @@`
`51`	`51`	`"publicKey": "FAEDB16763F22870B75BF934EA5F2792BDF109EC0C504718DDCBD92DF13C2628",`
`52`	`52`	`"address": "SCNPFCWFV2FYQVMU5HMJJTMADRZ3LRXVA76F56N2"`
`53`	`53`	`}`
`54`		`-}`
	`54`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -335,11 +335,4 @@ export class AggregateTransaction extends Transaction {`
`335`	`335`	`throw new Error('Method not implemented');`
`336`	`336`	`}`
`337`	`337`
`338`		`- /**`
`339`		`- * @internal`
`340`		`- * @returns {Uint8Array}`
`341`		`- */`
`342`		`- protected generateEmbeddedBytes(): Uint8Array {`
`343`		`- throw new Error('Method not implemented');`
`344`		`- }`
`345`	`338`	`}`