Fixes #41 added alias without renaming current LockFundsTransaction class

Author: Steven Liu

e2e/infrastructure/TransactionHttp.spec.ts

@@ -34,7 +34,7 @@ import {CosignatureSignedTransaction} from '../../src/model/transaction/Cosignat
 import {CosignatureTransaction} from '../../src/model/transaction/CosignatureTransaction';
 import {Deadline} from '../../src/model/transaction/Deadline';
 import {HashType} from '../../src/model/transaction/HashType';
-import {HashLockTransaction} from '../../src/model/transaction/LockFundsTransaction';
+import {LockFundsTransaction} from '../../src/model/transaction/LockFundsTransaction';
 import {ModifyMultisigAccountTransaction} from '../../src/model/transaction/ModifyMultisigAccountTransaction';
 import {MosaicDefinitionTransaction} from '../../src/model/transaction/MosaicDefinitionTransaction';
 import {MosaicSupplyChangeTransaction} from '../../src/model/transaction/MosaicSupplyChangeTransaction';

src/infrastructure/transaction/CreateTransactionFromDTO.ts

@@ -26,7 +26,7 @@ import {AggregateTransaction} from '../../model/transaction/AggregateTransaction
 import {AggregateTransactionCosignature} from '../../model/transaction/AggregateTransactionCosignature';
 import {AggregateTransactionInfo} from '../../model/transaction/AggregateTransactionInfo';
 import {Deadline} from '../../model/transaction/Deadline';
-import {HashLockTransaction} from '../../model/transaction/LockFundsTransaction';
+import {LockFundsTransaction} from '../../model/transaction/LockFundsTransaction';
 import {ModifyMultisigAccountTransaction} from '../../model/transaction/ModifyMultisigAccountTransaction';
 import {MosaicAliasTransaction} from '../../model/transaction/MosaicAliasTransaction';
 import {MosaicDefinitionTransaction} from '../../model/transaction/MosaicDefinitionTransaction';
@@ -188,7 +188,7 @@ const CreateStandaloneTransactionFromDTO = (transactionDTO, transactionInfo): Tr
         );
     } else if (transactionDTO.type === TransactionType.LOCK) {
         const networkType = extractNetworkType(transactionDTO.version);
-        return new HashLockTransaction(
+        return new LockFundsTransaction(
             networkType,
             extractTransactionVersion(transactionDTO.version),
             Deadline.createFromDTO(transactionDTO.deadline),

src/model/model.ts

@@ -64,6 +64,7 @@ export * from './transaction/AliasTransaction';
 export * from './transaction/CosignatureSignedTransaction';
 export * from './transaction/CosignatureTransaction';
 export * from './transaction/Deadline';
+export * from './transaction/HashLockTransaction';
 export * from './transaction/HashType';
 export * from './transaction/InnerTransaction';
 export * from './transaction/LockFundsTransaction';

src/model/transaction/HashLockTransaction.ts

@@ -0,0 +1,23 @@
+/*
+ * Copyright 2018 NEM
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { LockFundsTransaction } from './LockFundsTransaction';
+
+/*
+ * An alias for LockFundsTransaction class
+ */
+export class HashLockTransaction extends LockFundsTransaction {
+}

src/model/transaction/LockFundsTransaction.ts

@@ -32,7 +32,7 @@ import { TransactionVersion } from './TransactionVersion';
  *
  * @since 1.0
  */
-class LockFundsTransaction extends Transaction {
+export class LockFundsTransaction extends Transaction {
 
     /**
      * Aggregate bonded hash.
@@ -116,5 +116,3 @@ class LockFundsTransaction extends Transaction {
     }
 
 }
-
-export { LockFundsTransaction as HashLockTransaction };

test/model/transaction/HashLockTransaction.spec.ts

@@ -0,0 +1,61 @@
+/*
+ * Copyright 2018 NEM
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import {expect} from 'chai';
+import {NetworkType} from '../../../src/model/blockchain/NetworkType';
+import {XEM} from '../../../src/model/mosaic/XEM';
+import {AggregateTransaction} from '../../../src/model/transaction/AggregateTransaction';
+import {Deadline} from '../../../src/model/transaction/Deadline';
+import {HashLockTransaction} from '../../../src/model/transaction/HashLockTransaction';
+import {UInt64} from '../../../src/model/UInt64';
+import {TestingAccount} from '../../conf/conf.spec';
+
+describe('HashLockTransaction', () => {
+    const account = TestingAccount;
+    it('creation with an aggregate bonded tx', () => {
+        const aggregateTransaction = AggregateTransaction.createBonded(
+            Deadline.create(),
+            [],
+            NetworkType.MIJIN_TEST,
+            [],
+        );
+        const signedTransaction = account.sign(aggregateTransaction);
+        const transaction = HashLockTransaction.create(Deadline.create(),
+            XEM.createRelative(10),
+            UInt64.fromUint(10),
+            signedTransaction,
+            NetworkType.MIJIN_TEST);
+        expect(transaction.mosaic.id).to.be.equal(XEM.MOSAIC_ID);
+        expect(transaction.mosaic.amount.compact()).to.be.equal(10000000);
+        expect(transaction.hash).to.be.equal(signedTransaction.hash);
+    });
+
+    it('should throw exception if it is not a aggregate bonded tx', () => {
+        const aggregateTransaction = AggregateTransaction.createComplete(
+            Deadline.create(),
+            [],
+            NetworkType.MIJIN_TEST,
+            [],
+        );
+        const signedTransaction = account.sign(aggregateTransaction);
+        expect(() => {
+            HashLockTransaction.create(Deadline.create(),
+                XEM.createRelative(10),
+                UInt64.fromUint(10),
+                signedTransaction,
+                NetworkType.MIJIN_TEST);
+        }).to.throw(Error);
+    });
+});

test/model/transaction/LockFundsTransaction.spec.ts

@@ -19,7 +19,7 @@ import {NetworkType} from '../../../src/model/blockchain/NetworkType';
 import {NetworkCurrencyMosaic} from '../../../src/model/mosaic/NetworkCurrencyMosaic';
 import {AggregateTransaction} from '../../../src/model/transaction/AggregateTransaction';
 import {Deadline} from '../../../src/model/transaction/Deadline';
-import {HashLockTransaction} from '../../../src/model/transaction/LockFundsTransaction';
+import {LockFundsTransaction} from '../../../src/model/transaction/LockFundsTransaction';
 import {UInt64} from '../../../src/model/UInt64';
 import {TestingAccount} from '../../conf/conf.spec';