Merge branch '400-OpenApiGeneratedLibrary' of github.com:NEMStudios/nem2-sdk-typescript-javascript into 400-OpenApiGeneratedLibrary

Author: fboucquez

package-lock.json

@@ -126,10 +126,10 @@ export class TransactionHttp extends Http implements TransactionRepository {
      */
     private toTransactionStatus(dto: TransactionStatusDTO): TransactionStatus {
         return new TransactionStatus(
-            dto.group.toString(),
+            dto.group,
             dto.hash,
             Deadline.createFromDTO(UInt64.fromNumericString(dto.deadline).toDTO()),
-            dto.code ? dto.code.toString() : '',
+            dto.code,
             dto.height ? UInt64.fromNumericString(dto.height) : undefined);
     }
 

src/infrastructure/TransactionHttp.ts

@@ -158,6 +158,7 @@ export * from './transaction/MosaicAddressRestrictionTransaction';
 
 // Wallet
 export * from './wallet/EncryptedPrivateKey';
+export * from './wallet/ISimpleWalletDTO';
 export * from './wallet/Password';
 export * from './wallet/SimpleWallet';
 export * from './wallet/Wallet';

src/model/model.ts

@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+import { TransactionStateTypeEnum, TransactionStatusTypeEnum } from 'nem2-sdk-openapi-typescript-node-client';
 import {UInt64} from '../UInt64';
 import {Deadline} from './Deadline';
 
@@ -33,7 +34,7 @@ export class TransactionStatus {
                 /**
                  * The transaction status group "failed", "unconfirmed", "confirmed", etc...
                  */
-                public readonly group: string,
+                public readonly group: TransactionStateTypeEnum,
                 /**
                  * The transaction hash.
                  */
@@ -45,7 +46,7 @@ export class TransactionStatus {
                 /**
                  * The transaction status code being the error name in case of failure and success otherwise.
                  */
-                public readonly code?: string,
+                public readonly code?: TransactionStatusTypeEnum,
                 /**
                  * The height of the block at which it was confirmed or rejected.
                  */

src/model/transaction/TransactionStatus.ts

@@ -17,11 +17,11 @@
 import {LocalDateTime} from 'js-joda';
 import {Crypto, KeyPair, SHA3Hasher} from '../../core/crypto';
 import {Convert as convert} from '../../core/format';
-import {ISimpleWalletDTO} from '../../infrastructure/wallet/simpleWalletDTO';
 import {Account} from '../account/Account';
 import {Address} from '../account/Address';
 import {NetworkType} from '../blockchain/NetworkType';
 import {EncryptedPrivateKey} from './EncryptedPrivateKey';
+import {ISimpleWalletDTO} from './ISimpleWalletDTO';
 import {Password} from './Password';
 import {Wallet} from './Wallet';
 
@@ -109,8 +109,9 @@ export class SimpleWallet extends Wallet {
     /**
      * Instantiate a SimpleWallet from a DTO
      * @param simpleWalletDTO simple wallet without prototype
+     * @returns {SimpleWallet}
      */
-    static createFromDTO(simpleWalletDTO: ISimpleWalletDTO) {
+    static createFromDTO(simpleWalletDTO: ISimpleWalletDTO): SimpleWallet {
         return new SimpleWallet(
             simpleWalletDTO.name,
             simpleWalletDTO.network,

src/infrastructure/wallet/simpleWalletDTO.ts renamed to src/model/wallet/ISimpleWalletDTO.ts

@@ -17,6 +17,7 @@
 import { deepEqual } from 'assert';
 import { expect } from 'chai';
 import { TransactionStatusTypeEnum } from 'nem2-sdk-openapi-typescript-node-client';
+import { TransactionStateTypeEnum } from 'nem2-sdk-openapi-typescript-node-client';
 import { Deadline } from '../../../src/model/transaction/Deadline';
 import { TransactionStatus } from '../../../src/model/transaction/TransactionStatus';
 import { UInt64 } from '../../../src/model/UInt64';
@@ -25,7 +26,7 @@ describe('TransactionStatus', () => {
     it('should createComplete TransactionStatus object', () => {
         const transactionStatusDTO = {
             deadline: Deadline.createFromDTO('1'),
-            group: 'confirmed',
+            group: TransactionStateTypeEnum.Confirmed,
             hash: '18C036C20B32348D63684E09A13128A2C18F6A75650D3A5FB43853D716E5E219',
             height: new UInt64([1, 0]),
             code: TransactionStatusTypeEnum.Success,
@@ -35,7 +36,7 @@ describe('TransactionStatus', () => {
             transactionStatusDTO.group,
             transactionStatusDTO.hash,
             transactionStatusDTO.deadline,
-            transactionStatusDTO.code.toString(),
+            transactionStatusDTO.code,
             transactionStatusDTO.height,
         );