diff --git a/src/model/model.ts b/src/model/model.ts index 02370bf73a..f760473578 100644 --- a/src/model/model.ts +++ b/src/model/model.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'; diff --git a/src/infrastructure/wallet/simpleWalletDTO.ts b/src/model/wallet/ISimpleWalletDTO.ts similarity index 100% rename from src/infrastructure/wallet/simpleWalletDTO.ts rename to src/model/wallet/ISimpleWalletDTO.ts diff --git a/src/model/wallet/SimpleWallet.ts b/src/model/wallet/SimpleWallet.ts index 02df387f44..892a3b7bd3 100644 --- a/src/model/wallet/SimpleWallet.ts +++ b/src/model/wallet/SimpleWallet.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,