Changed abstract setMaxFee to public. Removed from child class

rg911 · rg911 · commit 9aa7bc23d941 · 2019-12-08T14:53:50.000Z
diff --git a/src/model/transaction/AccountAddressRestrictionTransaction.ts b/src/model/transaction/AccountAddressRestrictionTransaction.ts
@@ -209,13 +209,4 @@ export class AccountAddressRestrictionTransaction extends Transaction {
                         transactionInfo.index, aggregateTransactionIndex)),
             });
     }
-
-    /**
-     * Set transaction maxFee using fee multiplier
-     * @param feeMultiplier The fee multiplier
-     * @returns {AccountAddressRestrictionTransaction}
-     */
-    public setMaxFee(feeMultiplier: number): AccountAddressRestrictionTransaction {
-        return Object.assign({__proto__: Object.getPrototypeOf(this)}, this, {maxFee: UInt64.fromUint(this.size * feeMultiplier)});
-    }
 }
diff --git a/src/model/transaction/AccountLinkTransaction.ts b/src/model/transaction/AccountLinkTransaction.ts
@@ -171,13 +171,4 @@ export class AccountLinkTransaction extends Transaction {
     resolveAliases(): AccountLinkTransaction {
         return this;
     }
-
-    /**
-     * Set transaction maxFee using fee multiplier
-     * @param feeMultiplier The fee multiplier
-     * @returns {AccountLinkTransaction}
-     */
-    public setMaxFee(feeMultiplier: number): AccountLinkTransaction {
-        return Object.assign({__proto__: Object.getPrototypeOf(this)}, this, {maxFee: UInt64.fromUint(this.size * feeMultiplier)});
-    }
 }
diff --git a/src/model/transaction/AccountMetadataTransaction.ts b/src/model/transaction/AccountMetadataTransaction.ts
@@ -201,13 +201,4 @@ export class AccountMetadataTransaction extends Transaction {
     resolveAliases(): AccountMetadataTransaction {
         return this;
     }
-
-    /**
-     * Set transaction maxFee using fee multiplier
-     * @param feeMultiplier The fee multiplier
-     * @returns {AccountMetadataTransaction}
-     */
-    public setMaxFee(feeMultiplier: number): AccountMetadataTransaction {
-        return Object.assign({__proto__: Object.getPrototypeOf(this)}, this, {maxFee: UInt64.fromUint(this.size * feeMultiplier)});
-    }
 }
diff --git a/src/model/transaction/AccountMosaicRestrictionTransaction.ts b/src/model/transaction/AccountMosaicRestrictionTransaction.ts
@@ -209,13 +209,4 @@ export class AccountMosaicRestrictionTransaction extends Transaction {
                         transactionInfo.index, aggregateTransactionIndex)),
             });
     }
-
-    /**
-     * Set transaction maxFee using fee multiplier
-     * @param feeMultiplier The fee multiplier
-     * @returns {AccountMosaicRestrictionTransaction}
-     */
-    public setMaxFee(feeMultiplier: number): AccountMosaicRestrictionTransaction {
-        return Object.assign({__proto__: Object.getPrototypeOf(this)}, this, {maxFee: UInt64.fromUint(this.size * feeMultiplier)});
-    }
 }
diff --git a/src/model/transaction/AccountOperationRestrictionTransaction.ts b/src/model/transaction/AccountOperationRestrictionTransaction.ts
@@ -182,13 +182,4 @@ export class AccountOperationRestrictionTransaction extends Transaction {
     resolveAliases(): AccountOperationRestrictionTransaction {
         return this;
     }
-
-    /**
-     * Set transaction maxFee using fee multiplier
-     * @param feeMultiplier The fee multiplier
-     * @returns {AccountOperationRestrictionTransaction}
-     */
-    public setMaxFee(feeMultiplier: number): AccountOperationRestrictionTransaction {
-        return Object.assign({__proto__: Object.getPrototypeOf(this)}, this, {maxFee: UInt64.fromUint(this.size * feeMultiplier)});
-    }
 }
diff --git a/src/model/transaction/AddressAliasTransaction.ts b/src/model/transaction/AddressAliasTransaction.ts
@@ -194,13 +194,4 @@ export class AddressAliasTransaction extends Transaction {
     resolveAliases(): AddressAliasTransaction {
         return this;
     }
-
-    /**
-     * Set transaction maxFee using fee multiplier
-     * @param feeMultiplier The fee multiplier
-     * @returns {AddressAliasTransaction}
-     */
-    public setMaxFee(feeMultiplier: number): AddressAliasTransaction {
-        return Object.assign({__proto__: Object.getPrototypeOf(this)}, this, {maxFee: UInt64.fromUint(this.size * feeMultiplier)});
-    }
 }
diff --git a/src/model/transaction/AggregateTransaction.ts b/src/model/transaction/AggregateTransaction.ts
@@ -411,13 +411,4 @@ export class AggregateTransaction extends Transaction {
         {innerTransactions: this.innerTransactions.map((tx) => tx.resolveAliases(statement, transactionInfo.index))
             .sort((a, b) => a.transactionInfo!.index - b.transactionInfo!.index)});
     }
-
-    /**
-     * Set transaction maxFee using fee multiplier
-     * @param feeMultiplier The fee multiplier
-     * @returns {AggregateTransaction}
-     */
-    public setMaxFee(feeMultiplier: number): AggregateTransaction {
-        return Object.assign({__proto__: Object.getPrototypeOf(this)}, this, {maxFee: UInt64.fromUint(this.size * feeMultiplier)});
-    }
 }
diff --git a/src/model/transaction/LockFundsTransaction.ts b/src/model/transaction/LockFundsTransaction.ts
@@ -217,13 +217,4 @@ export class LockFundsTransaction extends Transaction {
                 mosaic: statement.resolveMosaic(this.mosaic, transactionInfo.height.toString(),
                 transactionInfo.index, aggregateTransactionIndex)});
     }
-
-    /**
-     * Set transaction maxFee using fee multiplier
-     * @param feeMultiplier The fee multiplier
-     * @returns {LockFundsTransaction}
-     */
-    public setMaxFee(feeMultiplier: number): LockFundsTransaction {
-        return Object.assign({__proto__: Object.getPrototypeOf(this)}, this, {maxFee: UInt64.fromUint(this.size * feeMultiplier)});
-    }
 }
diff --git a/src/model/transaction/MosaicAddressRestrictionTransaction.ts b/src/model/transaction/MosaicAddressRestrictionTransaction.ts
@@ -250,13 +250,4 @@ export class MosaicAddressRestrictionTransaction extends Transaction {
                     targetAddress: statement.resolveAddress(this.targetAddress,
                     transactionInfo.height.toString(), transactionInfo.index, aggregateTransactionIndex)});
     }
-
-    /**
-     * Set transaction maxFee using fee multiplier
-     * @param feeMultiplier The fee multiplier
-     * @returns {MosaicAddressRestrictionTransaction}
-     */
-    public setMaxFee(feeMultiplier: number): MosaicAddressRestrictionTransaction {
-        return Object.assign({__proto__: Object.getPrototypeOf(this)}, this, {maxFee: UInt64.fromUint(this.size * feeMultiplier)});
-    }
 }
diff --git a/src/model/transaction/MosaicAliasTransaction.ts b/src/model/transaction/MosaicAliasTransaction.ts
@@ -186,13 +186,4 @@ export class MosaicAliasTransaction extends Transaction {
     resolveAliases(): MosaicAliasTransaction {
         return this;
     }
-
-    /**
-     * Set transaction maxFee using fee multiplier
-     * @param feeMultiplier The fee multiplier
-     * @returns {MosaicAliasTransaction}
-     */
-    public setMaxFee(feeMultiplier: number): MosaicAliasTransaction {
-        return Object.assign({__proto__: Object.getPrototypeOf(this)}, this, {maxFee: UInt64.fromUint(this.size * feeMultiplier)});
-    }
 }
diff --git a/src/model/transaction/MosaicDefinitionTransaction.ts b/src/model/transaction/MosaicDefinitionTransaction.ts
@@ -229,13 +229,4 @@ export class MosaicDefinitionTransaction extends Transaction {
     resolveAliases(): MosaicDefinitionTransaction {
         return this;
     }
-
-    /**
-     * Set transaction maxFee using fee multiplier
-     * @param feeMultiplier The fee multiplier
-     * @returns {MosaicDefinitionTransaction}
-     */
-    public setMaxFee(feeMultiplier: number): MosaicDefinitionTransaction {
-        return Object.assign({__proto__: Object.getPrototypeOf(this)}, this, {maxFee: UInt64.fromUint(this.size * feeMultiplier)});
-    }
 }
diff --git a/src/model/transaction/MosaicGlobalRestrictionTransaction.ts b/src/model/transaction/MosaicGlobalRestrictionTransaction.ts
@@ -260,13 +260,4 @@ export class MosaicGlobalRestrictionTransaction extends Transaction {
                     referenceMosaicId: statement.resolveMosaicId(this.referenceMosaicId, transactionInfo.height.toString(),
                     transactionInfo.index, aggregateTransactionIndex)});
     }
-
-    /**
-     * Set transaction maxFee using fee multiplier
-     * @param feeMultiplier The fee multiplier
-     * @returns {MosaicGlobalRestrictionTransaction}
-     */
-    public setMaxFee(feeMultiplier: number): MosaicGlobalRestrictionTransaction {
-        return Object.assign({__proto__: Object.getPrototypeOf(this)}, this, {maxFee: UInt64.fromUint(this.size * feeMultiplier)});
-    }
 }
diff --git a/src/model/transaction/MosaicMetadataTransaction.ts b/src/model/transaction/MosaicMetadataTransaction.ts
@@ -224,13 +224,4 @@ export class MosaicMetadataTransaction extends Transaction {
                 targetMosaicId: statement.resolveMosaicId(this.targetMosaicId, transactionInfo.height.toString(),
                     transactionInfo.index, aggregateTransactionIndex)});
     }
-
-    /**
-     * Set transaction maxFee using fee multiplier
-     * @param feeMultiplier The fee multiplier
-     * @returns {MosaicMetadataTransaction}
-     */
-    public setMaxFee(feeMultiplier: number): MosaicMetadataTransaction {
-        return Object.assign({__proto__: Object.getPrototypeOf(this)}, this, {maxFee: UInt64.fromUint(this.size * feeMultiplier)});
-    }
 }
diff --git a/src/model/transaction/MosaicSupplyChangeTransaction.ts b/src/model/transaction/MosaicSupplyChangeTransaction.ts
@@ -198,13 +198,4 @@ export class MosaicSupplyChangeTransaction extends Transaction {
                 mosaicId: statement.resolveMosaicId(this.mosaicId, transactionInfo.height.toString(),
                 transactionInfo.index, aggregateTransactionIndex)});
     }
-
-    /**
-     * Set transaction maxFee using fee multiplier
-     * @param feeMultiplier The fee multiplier
-     * @returns {MosaicSupplyChangeTransaction}
-     */
-    public setMaxFee(feeMultiplier: number): MosaicSupplyChangeTransaction {
-        return Object.assign({__proto__: Object.getPrototypeOf(this)}, this, {maxFee: UInt64.fromUint(this.size * feeMultiplier)});
-    }
 }
diff --git a/src/model/transaction/MultisigAccountModificationTransaction.ts b/src/model/transaction/MultisigAccountModificationTransaction.ts
@@ -220,13 +220,4 @@ export class MultisigAccountModificationTransaction extends Transaction {
     resolveAliases(): MultisigAccountModificationTransaction {
         return this;
     }
-
-    /**
-     * Set transaction maxFee using fee multiplier
-     * @param feeMultiplier The fee multiplier
-     * @returns {MultisigAccountModificationTransaction}
-     */
-    public setMaxFee(feeMultiplier: number): MultisigAccountModificationTransaction {
-        return Object.assign({__proto__: Object.getPrototypeOf(this)}, this, {maxFee: UInt64.fromUint(this.size * feeMultiplier)});
-    }
 }
diff --git a/src/model/transaction/NamespaceMetadataTransaction.ts b/src/model/transaction/NamespaceMetadataTransaction.ts
@@ -216,13 +216,4 @@ export class NamespaceMetadataTransaction extends Transaction {
     resolveAliases(): NamespaceMetadataTransaction {
         return this;
     }
-
-    /**
-     * Set transaction maxFee using fee multiplier
-     * @param feeMultiplier The fee multiplier
-     * @returns {NamespaceMetadataTransaction}
-     */
-    public setMaxFee(feeMultiplier: number): NamespaceMetadataTransaction {
-        return Object.assign({__proto__: Object.getPrototypeOf(this)}, this, {maxFee: UInt64.fromUint(this.size * feeMultiplier)});
-    }
 }
diff --git a/src/model/transaction/NamespaceRegistrationTransaction.ts b/src/model/transaction/NamespaceRegistrationTransaction.ts
@@ -281,13 +281,4 @@ export class NamespaceRegistrationTransaction extends Transaction {
     resolveAliases(): NamespaceRegistrationTransaction {
         return this;
     }
-
-    /**
-     * Set transaction maxFee using fee multiplier
-     * @param feeMultiplier The fee multiplier
-     * @returns {NamespaceRegistrationTransaction}
-     */
-    public setMaxFee(feeMultiplier: number): NamespaceRegistrationTransaction {
-        return Object.assign({__proto__: Object.getPrototypeOf(this)}, this, {maxFee: UInt64.fromUint(this.size * feeMultiplier)});
-    }
 }
diff --git a/src/model/transaction/SecretLockTransaction.ts b/src/model/transaction/SecretLockTransaction.ts
@@ -247,13 +247,4 @@ export class SecretLockTransaction extends Transaction {
                 mosaic: statement.resolveMosaic(this.mosaic, transactionInfo.height.toString(),
                     transactionInfo.index, aggregateTransactionIndex)});
     }
-
-    /**
-     * Set transaction maxFee using fee multiplier
-     * @param feeMultiplier The fee multiplier
-     * @returns {SecretLockTransaction}
-     */
-    public setMaxFee(feeMultiplier: number): SecretLockTransaction {
-        return Object.assign({__proto__: Object.getPrototypeOf(this)}, this, {maxFee: UInt64.fromUint(this.size * feeMultiplier)});
-    }
 }
diff --git a/src/model/transaction/SecretProofTransaction.ts b/src/model/transaction/SecretProofTransaction.ts
@@ -228,13 +228,4 @@ export class SecretProofTransaction extends Transaction {
                 recipientAddress: statement.resolveAddress(this.recipientAddress,
                     transactionInfo.height.toString(), transactionInfo.index, aggregateTransactionIndex)});
     }
-
-    /**
-     * Set transaction maxFee using fee multiplier
-     * @param feeMultiplier The fee multiplier
-     * @returns {SecretProofTransaction}
-     */
-    public setMaxFee(feeMultiplier: number): SecretProofTransaction {
-        return Object.assign({__proto__: Object.getPrototypeOf(this)}, this, {maxFee: UInt64.fromUint(this.size * feeMultiplier)});
-    }
 }
diff --git a/src/model/transaction/Transaction.ts b/src/model/transaction/Transaction.ts
@@ -197,9 +197,11 @@ export abstract class Transaction {
     /**
      * Set transaction maxFee using fee multiplier
      * @param feeMultiplier The fee multiplier
-     * @returns {Transaction}
+     * @returns {TransferTransaction}
      */
-    abstract setMaxFee(feeMultiplier: number): Transaction;
+    public setMaxFee(feeMultiplier: number): Transaction {
+        return Object.assign({__proto__: Object.getPrototypeOf(this)}, this, {maxFee: UInt64.fromUint(this.size * feeMultiplier)});
+    }
 
     /**
      * @internal
diff --git a/src/model/transaction/TransferTransaction.ts b/src/model/transaction/TransferTransaction.ts
@@ -289,13 +289,4 @@ export class TransferTransaction extends Transaction {
                 mosaics: this.mosaics.map((mosaic) => statement.resolveMosaic(mosaic, transactionInfo.height.toString(),
                     transactionInfo.index, aggregateTransactionIndex))});
     }
-
-    /**
-     * Set transaction maxFee using fee multiplier
-     * @param feeMultiplier The fee multiplier
-     * @returns {TransferTransaction}
-     */
-    public setMaxFee(feeMultiplier: number): TransferTransaction {
-        return Object.assign({__proto__: Object.getPrototypeOf(this)}, this, {maxFee: UInt64.fromUint(this.size * feeMultiplier)});
-    }
 }

Original file line number	Diff line number	Diff line change
`@@ -209,13 +209,4 @@ export class AccountAddressRestrictionTransaction extends Transaction {`
`209`	`209`	`transactionInfo.index, aggregateTransactionIndex)),`
`210`	`210`	`});`
`211`	`211`	`}`
`212`		`-`
`213`		`- /**`
`214`		`- * Set transaction maxFee using fee multiplier`
`215`		`- * @param feeMultiplier The fee multiplier`
`216`		`- * @returns {AccountAddressRestrictionTransaction}`
`217`		`- */`
`218`		`- public setMaxFee(feeMultiplier: number): AccountAddressRestrictionTransaction {`
`219`		`- return Object.assign({__proto__: Object.getPrototypeOf(this)}, this, {maxFee: UInt64.fromUint(this.size * feeMultiplier)});`
`220`		`- }`
`221`	`212`	`}`
Original file line number	Diff line number	Diff line change
`@@ -171,13 +171,4 @@ export class AccountLinkTransaction extends Transaction {`
`171`	`171`	`resolveAliases(): AccountLinkTransaction {`
`172`	`172`	`return this;`
`173`	`173`	`}`
`174`		`-`
`175`		`- /**`
`176`		`- * Set transaction maxFee using fee multiplier`
`177`		`- * @param feeMultiplier The fee multiplier`
`178`		`- * @returns {AccountLinkTransaction}`
`179`		`- */`
`180`		`- public setMaxFee(feeMultiplier: number): AccountLinkTransaction {`
`181`		`- return Object.assign({__proto__: Object.getPrototypeOf(this)}, this, {maxFee: UInt64.fromUint(this.size * feeMultiplier)});`
`182`		`- }`
`183`	`174`	`}`
Original file line number	Diff line number	Diff line change
`@@ -201,13 +201,4 @@ export class AccountMetadataTransaction extends Transaction {`
`201`	`201`	`resolveAliases(): AccountMetadataTransaction {`
`202`	`202`	`return this;`
`203`	`203`	`}`
`204`		`-`
`205`		`- /**`
`206`		`- * Set transaction maxFee using fee multiplier`
`207`		`- * @param feeMultiplier The fee multiplier`
`208`		`- * @returns {AccountMetadataTransaction}`
`209`		`- */`
`210`		`- public setMaxFee(feeMultiplier: number): AccountMetadataTransaction {`
`211`		`- return Object.assign({__proto__: Object.getPrototypeOf(this)}, this, {maxFee: UInt64.fromUint(this.size * feeMultiplier)});`
`212`		`- }`
`213`	`204`	`}`
Original file line number	Diff line number	Diff line change
`@@ -182,13 +182,4 @@ export class AccountOperationRestrictionTransaction extends Transaction {`
`182`	`182`	`resolveAliases(): AccountOperationRestrictionTransaction {`
`183`	`183`	`return this;`
`184`	`184`	`}`
`185`		`-`
`186`		`- /**`
`187`		`- * Set transaction maxFee using fee multiplier`
`188`		`- * @param feeMultiplier The fee multiplier`
`189`		`- * @returns {AccountOperationRestrictionTransaction}`
`190`		`- */`
`191`		`- public setMaxFee(feeMultiplier: number): AccountOperationRestrictionTransaction {`
`192`		`- return Object.assign({__proto__: Object.getPrototypeOf(this)}, this, {maxFee: UInt64.fromUint(this.size * feeMultiplier)});`
`193`		`- }`
`194`	`185`	`}`
Original file line number	Diff line number	Diff line change
`@@ -194,13 +194,4 @@ export class AddressAliasTransaction extends Transaction {`
`194`	`194`	`resolveAliases(): AddressAliasTransaction {`
`195`	`195`	`return this;`
`196`	`196`	`}`
`197`		`-`
`198`		`- /**`
`199`		`- * Set transaction maxFee using fee multiplier`
`200`		`- * @param feeMultiplier The fee multiplier`
`201`		`- * @returns {AddressAliasTransaction}`
`202`		`- */`
`203`		`- public setMaxFee(feeMultiplier: number): AddressAliasTransaction {`
`204`		`- return Object.assign({__proto__: Object.getPrototypeOf(this)}, this, {maxFee: UInt64.fromUint(this.size * feeMultiplier)});`
`205`		`- }`
`206`	`197`	`}`
Original file line number	Diff line number	Diff line change
`@@ -411,13 +411,4 @@ export class AggregateTransaction extends Transaction {`
`411`	`411`	`{innerTransactions: this.innerTransactions.map((tx) => tx.resolveAliases(statement, transactionInfo.index))`
`412`	`412`	`.sort((a, b) => a.transactionInfo!.index - b.transactionInfo!.index)});`
`413`	`413`	`}`
`414`		`-`
`415`		`- /**`
`416`		`- * Set transaction maxFee using fee multiplier`
`417`		`- * @param feeMultiplier The fee multiplier`
`418`		`- * @returns {AggregateTransaction}`
`419`		`- */`
`420`		`- public setMaxFee(feeMultiplier: number): AggregateTransaction {`
`421`		`- return Object.assign({__proto__: Object.getPrototypeOf(this)}, this, {maxFee: UInt64.fromUint(this.size * feeMultiplier)});`
`422`		`- }`
`423`	`414`	`}`
Original file line number	Diff line number	Diff line change
`@@ -217,13 +217,4 @@ export class LockFundsTransaction extends Transaction {`
`217`	`217`	`mosaic: statement.resolveMosaic(this.mosaic, transactionInfo.height.toString(),`
`218`	`218`	`transactionInfo.index, aggregateTransactionIndex)});`
`219`	`219`	`}`
`220`		`-`
`221`		`- /**`
`222`		`- * Set transaction maxFee using fee multiplier`
`223`		`- * @param feeMultiplier The fee multiplier`
`224`		`- * @returns {LockFundsTransaction}`
`225`		`- */`
`226`		`- public setMaxFee(feeMultiplier: number): LockFundsTransaction {`
`227`		`- return Object.assign({__proto__: Object.getPrototypeOf(this)}, this, {maxFee: UInt64.fromUint(this.size * feeMultiplier)});`
`228`		`- }`
`229`	`220`	`}`
Original file line number	Diff line number	Diff line change
`@@ -250,13 +250,4 @@ export class MosaicAddressRestrictionTransaction extends Transaction {`
`250`	`250`	`targetAddress: statement.resolveAddress(this.targetAddress,`
`251`	`251`	`transactionInfo.height.toString(), transactionInfo.index, aggregateTransactionIndex)});`
`252`	`252`	`}`
`253`		`-`
`254`		`- /**`
`255`		`- * Set transaction maxFee using fee multiplier`
`256`		`- * @param feeMultiplier The fee multiplier`
`257`		`- * @returns {MosaicAddressRestrictionTransaction}`
`258`		`- */`
`259`		`- public setMaxFee(feeMultiplier: number): MosaicAddressRestrictionTransaction {`
`260`		`- return Object.assign({__proto__: Object.getPrototypeOf(this)}, this, {maxFee: UInt64.fromUint(this.size * feeMultiplier)});`
`261`		`- }`
`262`	`253`	`}`
Original file line number	Diff line number	Diff line change
`@@ -186,13 +186,4 @@ export class MosaicAliasTransaction extends Transaction {`
`186`	`186`	`resolveAliases(): MosaicAliasTransaction {`
`187`	`187`	`return this;`
`188`	`188`	`}`
`189`		`-`
`190`		`- /**`
`191`		`- * Set transaction maxFee using fee multiplier`
`192`		`- * @param feeMultiplier The fee multiplier`
`193`		`- * @returns {MosaicAliasTransaction}`
`194`		`- */`
`195`		`- public setMaxFee(feeMultiplier: number): MosaicAliasTransaction {`
`196`		`- return Object.assign({__proto__: Object.getPrototypeOf(this)}, this, {maxFee: UInt64.fromUint(this.size * feeMultiplier)});`
`197`		`- }`
`198`	`189`	`}`