changed to use object spread opterator

rg911 · rg911 · commit 8b0be1980a32 · 2019-12-08T22:07:43.000Z
diff --git a/src/model/transaction/AccountAddressRestrictionTransaction.ts b/src/model/transaction/AccountAddressRestrictionTransaction.ts
@@ -199,14 +199,13 @@ export class AccountAddressRestrictionTransaction extends Transaction {
      */
     resolveAliases(statement: Statement, aggregateTransactionIndex: number = 0): AccountAddressRestrictionTransaction {
         const transactionInfo = this.checkTransactionHeightAndIndex();
-        return Object.assign({__proto__: Object.getPrototypeOf(this)}, this,
-            {
+        return {...Object.getPrototypeOf(this),
                 restrictionAdditions:
                     this.restrictionAdditions.map((addition) => statement.resolveAddress(addition, transactionInfo.height.toString(),
                         transactionInfo.index, aggregateTransactionIndex)),
                 restrictionDeletions:
                     this.restrictionDeletions.map((deletion) => statement.resolveAddress(deletion, transactionInfo.height.toString(),
                         transactionInfo.index, aggregateTransactionIndex)),
-            });
+            };
     }
 }
diff --git a/src/model/transaction/AccountMosaicRestrictionTransaction.ts b/src/model/transaction/AccountMosaicRestrictionTransaction.ts
@@ -199,14 +199,13 @@ export class AccountMosaicRestrictionTransaction extends Transaction {
      */
     resolveAliases(statement: Statement, aggregateTransactionIndex: number = 0): AccountMosaicRestrictionTransaction {
         const transactionInfo = this.checkTransactionHeightAndIndex();
-        return Object.assign({__proto__: Object.getPrototypeOf(this)}, this,
-            {
-                restrictionAdditions:
-                    this.restrictionAdditions.map((addition) => statement.resolveMosaicId(addition, transactionInfo.height.toString(),
-                        transactionInfo.index, aggregateTransactionIndex)),
-                restrictionDeletions:
-                    this.restrictionDeletions.map((deletion) => statement.resolveMosaicId(deletion, transactionInfo.height.toString(),
-                        transactionInfo.index, aggregateTransactionIndex)),
-            });
+        return {...Object.getPrototypeOf(this),
+            restrictionAdditions:
+                this.restrictionAdditions.map((addition) => statement.resolveMosaicId(addition, transactionInfo.height.toString(),
+                    transactionInfo.index, aggregateTransactionIndex)),
+            restrictionDeletions:
+                this.restrictionDeletions.map((deletion) => statement.resolveMosaicId(deletion, transactionInfo.height.toString(),
+                    transactionInfo.index, aggregateTransactionIndex)),
+        };
     }
 }
diff --git a/src/model/transaction/LockFundsTransaction.ts b/src/model/transaction/LockFundsTransaction.ts
@@ -212,9 +212,8 @@ export class LockFundsTransaction extends Transaction {
      */
     resolveAliases(statement: Statement, aggregateTransactionIndex: number = 0): LockFundsTransaction {
         const transactionInfo = this.checkTransactionHeightAndIndex();
-        return Object.assign({__proto__: Object.getPrototypeOf(this)}, this,
-            {
-                mosaic: statement.resolveMosaic(this.mosaic, transactionInfo.height.toString(),
-                transactionInfo.index, aggregateTransactionIndex)});
+        return {...Object.getPrototypeOf(this),
+            mosaic: statement.resolveMosaic(this.mosaic, transactionInfo.height.toString(),
+            transactionInfo.index, aggregateTransactionIndex)};
     }
 }
diff --git a/src/model/transaction/MosaicAddressRestrictionTransaction.ts b/src/model/transaction/MosaicAddressRestrictionTransaction.ts
@@ -243,11 +243,10 @@ export class MosaicAddressRestrictionTransaction extends Transaction {
      */
     resolveAliases(statement: Statement, aggregateTransactionIndex: number = 0): MosaicAddressRestrictionTransaction {
         const transactionInfo = this.checkTransactionHeightAndIndex();
-        return Object.assign({__proto__: Object.getPrototypeOf(this)}, this,
-            {
-                mosaicId: statement.resolveMosaicId(this.mosaicId, transactionInfo.height.toString(),
-                    transactionInfo.index, aggregateTransactionIndex),
-                    targetAddress: statement.resolveAddress(this.targetAddress,
-                    transactionInfo.height.toString(), transactionInfo.index, aggregateTransactionIndex)});
+        return {...Object.getPrototypeOf(this),
+            mosaicId: statement.resolveMosaicId(this.mosaicId, transactionInfo.height.toString(),
+                transactionInfo.index, aggregateTransactionIndex),
+            targetAddress: statement.resolveAddress(this.targetAddress,
+                transactionInfo.height.toString(), transactionInfo.index, aggregateTransactionIndex)};
     }
 }
diff --git a/src/model/transaction/MosaicGlobalRestrictionTransaction.ts b/src/model/transaction/MosaicGlobalRestrictionTransaction.ts
@@ -253,11 +253,10 @@ export class MosaicGlobalRestrictionTransaction extends Transaction {
      */
     resolveAliases(statement: Statement, aggregateTransactionIndex: number = 0): MosaicGlobalRestrictionTransaction {
         const transactionInfo = this.checkTransactionHeightAndIndex();
-        return Object.assign({__proto__: Object.getPrototypeOf(this)}, this,
-            {
-                mosaicId: statement.resolveMosaicId(this.mosaicId, transactionInfo.height.toString(),
-                    transactionInfo.index, aggregateTransactionIndex),
-                    referenceMosaicId: statement.resolveMosaicId(this.referenceMosaicId, transactionInfo.height.toString(),
-                    transactionInfo.index, aggregateTransactionIndex)});
+        return {...Object.getPrototypeOf(this),
+            mosaicId: statement.resolveMosaicId(this.mosaicId, transactionInfo.height.toString(),
+                transactionInfo.index, aggregateTransactionIndex),
+            referenceMosaicId: statement.resolveMosaicId(this.referenceMosaicId, transactionInfo.height.toString(),
+                transactionInfo.index, aggregateTransactionIndex)};
     }
 }
diff --git a/src/model/transaction/MosaicMetadataTransaction.ts b/src/model/transaction/MosaicMetadataTransaction.ts
@@ -219,9 +219,8 @@ export class MosaicMetadataTransaction extends Transaction {
      */
     resolveAliases(statement: Statement, aggregateTransactionIndex: number = 0): MosaicMetadataTransaction {
         const transactionInfo = this.checkTransactionHeightAndIndex();
-        return Object.assign({__proto__: Object.getPrototypeOf(this)}, this,
-            {
-                targetMosaicId: statement.resolveMosaicId(this.targetMosaicId, transactionInfo.height.toString(),
-                    transactionInfo.index, aggregateTransactionIndex)});
+        return {...Object.getPrototypeOf(this),
+            targetMosaicId: statement.resolveMosaicId(this.targetMosaicId, transactionInfo.height.toString(),
+                transactionInfo.index, aggregateTransactionIndex)};
     }
 }
diff --git a/src/model/transaction/MosaicSupplyChangeTransaction.ts b/src/model/transaction/MosaicSupplyChangeTransaction.ts
@@ -193,9 +193,8 @@ export class MosaicSupplyChangeTransaction extends Transaction {
      */
     resolveAliases(statement: Statement, aggregateTransactionIndex: number = 0): MosaicSupplyChangeTransaction {
         const transactionInfo = this.checkTransactionHeightAndIndex();
-        return Object.assign({__proto__: Object.getPrototypeOf(this)}, this,
-            {
-                mosaicId: statement.resolveMosaicId(this.mosaicId, transactionInfo.height.toString(),
-                transactionInfo.index, aggregateTransactionIndex)});
+        return {...Object.getPrototypeOf(this),
+            mosaicId: statement.resolveMosaicId(this.mosaicId, transactionInfo.height.toString(),
+                transactionInfo.index, aggregateTransactionIndex)};
     }
 }
diff --git a/src/model/transaction/SecretLockTransaction.ts b/src/model/transaction/SecretLockTransaction.ts
@@ -240,11 +240,10 @@ export class SecretLockTransaction extends Transaction {
      */
     resolveAliases(statement: Statement, aggregateTransactionIndex: number = 0): SecretLockTransaction {
         const transactionInfo = this.checkTransactionHeightAndIndex();
-        return Object.assign({__proto__: Object.getPrototypeOf(this)}, this,
-            {
-                recipientAddress: statement.resolveAddress(this.recipientAddress,
-                    transactionInfo.height.toString(), transactionInfo.index, aggregateTransactionIndex),
-                mosaic: statement.resolveMosaic(this.mosaic, transactionInfo.height.toString(),
-                    transactionInfo.index, aggregateTransactionIndex)});
+        return {...Object.getPrototypeOf(this),
+            recipientAddress: statement.resolveAddress(this.recipientAddress,
+                transactionInfo.height.toString(), transactionInfo.index, aggregateTransactionIndex),
+            mosaic: statement.resolveMosaic(this.mosaic, transactionInfo.height.toString(),
+                transactionInfo.index, aggregateTransactionIndex)};
     }
 }
diff --git a/src/model/transaction/SecretProofTransaction.ts b/src/model/transaction/SecretProofTransaction.ts
@@ -223,9 +223,8 @@ export class SecretProofTransaction extends Transaction {
      */
     resolveAliases(statement: Statement, aggregateTransactionIndex: number = 0): SecretProofTransaction {
         const transactionInfo = this.checkTransactionHeightAndIndex();
-        return Object.assign({__proto__: Object.getPrototypeOf(this)}, this,
-            {
-                recipientAddress: statement.resolveAddress(this.recipientAddress,
-                    transactionInfo.height.toString(), transactionInfo.index, aggregateTransactionIndex)});
+        return {...Object.getPrototypeOf(this),
+            recipientAddress: statement.resolveAddress(this.recipientAddress,
+                transactionInfo.height.toString(), transactionInfo.index, aggregateTransactionIndex)};
     }
 }
diff --git a/src/model/transaction/TransferTransaction.ts b/src/model/transaction/TransferTransaction.ts
@@ -282,11 +282,9 @@ export class TransferTransaction extends Transaction {
      */
     public resolveAliases(statement: Statement, aggregateTransactionIndex: number = 0): TransferTransaction {
         const transactionInfo = this.checkTransactionHeightAndIndex();
-        return Object.assign({__proto__: Object.getPrototypeOf(this)}, this,
-            {
-                recipientAddress: statement.resolveAddress(this.recipientAddress,
+        return {...Object.getPrototypeOf(this), recipientAddress: statement.resolveAddress(this.recipientAddress,
                     transactionInfo.height.toString(), transactionInfo.index, aggregateTransactionIndex),
                 mosaics: this.mosaics.map((mosaic) => statement.resolveMosaic(mosaic, transactionInfo.height.toString(),
-                    transactionInfo.index, aggregateTransactionIndex))});
+                    transactionInfo.index, aggregateTransactionIndex))};
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -212,9 +212,8 @@ export class LockFundsTransaction extends Transaction {`
`212`	`212`	`*/`
`213`	`213`	`resolveAliases(statement: Statement, aggregateTransactionIndex: number = 0): LockFundsTransaction {`
`214`	`214`	`const transactionInfo = this.checkTransactionHeightAndIndex();`
`215`		`- return Object.assign({__proto__: Object.getPrototypeOf(this)}, this,`
`216`		`- {`
`217`		`- mosaic: statement.resolveMosaic(this.mosaic, transactionInfo.height.toString(),`
`218`		`- transactionInfo.index, aggregateTransactionIndex)});`
	`215`	`+ return {...Object.getPrototypeOf(this),`
	`216`	`+ mosaic: statement.resolveMosaic(this.mosaic, transactionInfo.height.toString(),`
	`217`	`+ transactionInfo.index, aggregateTransactionIndex)};`
`219`	`218`	`}`
`220`	`219`	`}`
Original file line number	Diff line number	Diff line change
`@@ -219,9 +219,8 @@ export class MosaicMetadataTransaction extends Transaction {`
`219`	`219`	`*/`
`220`	`220`	`resolveAliases(statement: Statement, aggregateTransactionIndex: number = 0): MosaicMetadataTransaction {`
`221`	`221`	`const transactionInfo = this.checkTransactionHeightAndIndex();`
`222`		`- return Object.assign({__proto__: Object.getPrototypeOf(this)}, this,`
`223`		`- {`
`224`		`- targetMosaicId: statement.resolveMosaicId(this.targetMosaicId, transactionInfo.height.toString(),`
`225`		`- transactionInfo.index, aggregateTransactionIndex)});`
	`222`	`+ return {...Object.getPrototypeOf(this),`
	`223`	`+ targetMosaicId: statement.resolveMosaicId(this.targetMosaicId, transactionInfo.height.toString(),`
	`224`	`+ transactionInfo.index, aggregateTransactionIndex)};`
`226`	`225`	`}`
`227`	`226`	`}`
Original file line number	Diff line number	Diff line change
`@@ -193,9 +193,8 @@ export class MosaicSupplyChangeTransaction extends Transaction {`
`193`	`193`	`*/`
`194`	`194`	`resolveAliases(statement: Statement, aggregateTransactionIndex: number = 0): MosaicSupplyChangeTransaction {`
`195`	`195`	`const transactionInfo = this.checkTransactionHeightAndIndex();`
`196`		`- return Object.assign({__proto__: Object.getPrototypeOf(this)}, this,`
`197`		`- {`
`198`		`- mosaicId: statement.resolveMosaicId(this.mosaicId, transactionInfo.height.toString(),`
`199`		`- transactionInfo.index, aggregateTransactionIndex)});`
	`196`	`+ return {...Object.getPrototypeOf(this),`
	`197`	`+ mosaicId: statement.resolveMosaicId(this.mosaicId, transactionInfo.height.toString(),`
	`198`	`+ transactionInfo.index, aggregateTransactionIndex)};`
`200`	`199`	`}`
`201`	`200`	`}`
Original file line number	Diff line number	Diff line change
`@@ -223,9 +223,8 @@ export class SecretProofTransaction extends Transaction {`
`223`	`223`	`*/`
`224`	`224`	`resolveAliases(statement: Statement, aggregateTransactionIndex: number = 0): SecretProofTransaction {`
`225`	`225`	`const transactionInfo = this.checkTransactionHeightAndIndex();`
`226`		`- return Object.assign({__proto__: Object.getPrototypeOf(this)}, this,`
`227`		`- {`
`228`		`- recipientAddress: statement.resolveAddress(this.recipientAddress,`
`229`		`- transactionInfo.height.toString(), transactionInfo.index, aggregateTransactionIndex)});`
	`226`	`+ return {...Object.getPrototypeOf(this),`
	`227`	`+ recipientAddress: statement.resolveAddress(this.recipientAddress,`
	`228`	`+ transactionInfo.height.toString(), transactionInfo.index, aggregateTransactionIndex)};`
`230`	`229`	`}`
`231`	`230`	`}`
Original file line number	Diff line number	Diff line change
`@@ -282,11 +282,9 @@ export class TransferTransaction extends Transaction {`
`282`	`282`	`*/`
`283`	`283`	`public resolveAliases(statement: Statement, aggregateTransactionIndex: number = 0): TransferTransaction {`
`284`	`284`	`const transactionInfo = this.checkTransactionHeightAndIndex();`
`285`		`- return Object.assign({__proto__: Object.getPrototypeOf(this)}, this,`
`286`		`- {`
`287`		`- recipientAddress: statement.resolveAddress(this.recipientAddress,`
	`285`	`+ return {...Object.getPrototypeOf(this), recipientAddress: statement.resolveAddress(this.recipientAddress,`
`288`	`286`	`transactionInfo.height.toString(), transactionInfo.index, aggregateTransactionIndex),`
`289`	`287`	`mosaics: this.mosaics.map((mosaic) => statement.resolveMosaic(mosaic, transactionInfo.height.toString(),`
`290`		`- transactionInfo.index, aggregateTransactionIndex))});`
	`288`	`+ transactionInfo.index, aggregateTransactionIndex))};`
`291`	`289`	`}`
`292`	`290`	`}`