[DDW-738] Refactor V2 API test setup

source/renderer/app/api/addresses/requests/getAddresses.js

@@ -1,14 +1,18 @@
 // @flow
 import type { RequestConfig } from '../../common/types';
-import type { Address } from '../types';
+import type { Addresses, GetAddressesRequestQueryParams } from '../types';
 import { request } from '../../utils/request';
 
 export const getAddresses = (
   config: RequestConfig,
-  walletId: string
-): Promise<Address[]> =>
-  request({
-    method: 'GET',
-    path: `/v2/wallets/${walletId}/addresses?state=used`,
-    ...config,
-  });
+  walletId: string,
+  queryParams?: GetAddressesRequestQueryParams
+): Promise<Addresses> =>
+  request(
+    {
+      method: 'GET',
+      path: `/v2/wallets/${walletId}/addresses`,
+      ...config,
+    },
+    queryParams
+  );

source/renderer/app/api/addresses/types.js

@@ -1,22 +1,29 @@
 // @flow
 import WalletAddress from '../../domains/WalletAddress';
 
+export type AddressState = 'used' | 'unused';
+
+export type GetAddressesRequestQueryParams = {
+  state: AddressState,
+};
+
 export type Address = {
   id: string,
-  state: 'used' | 'unused',
+  state: AddressState,
 };
 
 export type Addresses = Array<Address>;
 
+export type GetAddressesRequest = {
+  walletId: string,
+  queryParams?: GetAddressesRequestQueryParams,
+};
+
 export type GetAddressesResponse = {
   accountIndex: ?number,
   addresses: Array<WalletAddress>,
 };
 
-export type GetAddressesRequest = {
-  walletId: string,
-};
-
 export type CreateAddressRequest = {
   spendingPassword: ?string,
   accountIndex: number,

source/renderer/app/api/api.js

@@ -1,11 +1,11 @@
 // @flow
-import { split, get } from 'lodash';
+import { split, get, size } from 'lodash';
 import { action } from 'mobx';
 import BigNumber from 'bignumber.js';
 // import moment from 'moment';
 
 // domains
-import Wallet from '../domains/Wallet';
+import Wallet, { WalletDelegationStatuses } from '../domains/Wallet';
 import {
   WalletTransaction,
   transactionTypes,
@@ -14,7 +14,7 @@ import WalletAddress from '../domains/WalletAddress';
 
 // Addresses requests
 import { getAddress } from './addresses/requests/getAddress';
-import { getAddresses as getAddressesFromApi } from './addresses/requests/getAddresses';
+import { getAddresses } from './addresses/requests/getAddresses';
 import { createAddress } from './addresses/requests/createAddress';
 
 // Nodes requests
@@ -32,7 +32,6 @@ import { getTransactionFee } from './transactions/requests/getTransactionFee';
 import { createTransaction } from './transactions/requests/createTransaction';
 
 // Wallets requests
-import { resetWalletState } from './wallets/requests/resetWalletState';
 import { changeSpendingPassword } from './wallets/requests/changeSpendingPassword';
 import { deleteWallet } from './wallets/requests/deleteWallet';
 import { exportWalletAsJSON } from './wallets/requests/exportWalletAsJSON';
@@ -81,8 +80,8 @@ import type {
   Address,
   Addresses,
   GetAddressesRequest,
-  CreateAddressRequest,
   GetAddressesResponse,
+  CreateAddressRequest,
 } from './addresses/types';
 
 // Common Types
@@ -128,7 +127,6 @@ import type {
   ImportWalletFromFileRequest,
   UpdateWalletRequest,
   GetWalletUtxosRequest,
-  // WalletSyncState,
 } from './wallets/types';
 
 // Common errors
@@ -175,7 +173,7 @@ export default class AdaApi {
     try {
       const response: AdaWallets = await getWallets(this.config);
       Logger.debug('AdaApi::getWallets success', { wallets: response });
-      return response.map(data => _createWalletFromServerData(data));
+      return response.map(_createWalletFromServerData);
     } catch (error) {
       Logger.error('AdaApi::getWallets error', { error });
       throw new GenericApiError();
@@ -188,16 +186,17 @@ export default class AdaApi {
     Logger.debug('AdaApi::getAddresses called', {
       parameters: filterLogData(request),
     });
-    const { walletId } = request;
+    const { walletId, queryParams } = request;
     try {
-      const response: Addresses = await getAddressesFromApi(
+      const response: Addresses = await getAddresses(
         this.config,
-        walletId
+        walletId,
+        queryParams
       );
+
       Logger.debug('AdaApi::getAddresses success', { addresses: response });
-      const addresses = response.map(data =>
-        _createAddressFromServerData(data)
-      );
+      const addresses = response.map(_createAddressFromServerData);
+
       return new Promise(resolve => resolve({ accountIndex: 0, addresses }));
     } catch (error) {
       Logger.error('AdaApi::getAddresses error', { error });
@@ -369,12 +368,10 @@ export default class AdaApi {
     const spendingPassword = passwordString
       ? encryptPassphrase(passwordString)
       : '';
-    const assuranceLevel = 'normal';
     try {
       const walletInitData = {
         operation: 'create',
         backupPhrase: split(mnemonic, ' '),
-        assuranceLevel,
         name,
         spendingPassword,
       };
@@ -665,11 +662,9 @@ export default class AdaApi {
     const spendingPassword = passwordString
       ? encryptPassphrase(passwordString)
       : '';
-    const assuranceLevel = 'normal';
     const walletInitData = {
       operation: 'restore',
       backupPhrase: split(recoveryPhrase, ' '),
-      assuranceLevel,
       name: walletName,
       spendingPassword,
     };
@@ -801,11 +796,10 @@ export default class AdaApi {
     Logger.debug('AdaApi::updateWallet called', {
       parameters: filterLogData(request),
     });
-    const { walletId, assuranceLevel, name } = request;
+    const { walletId, name } = request;
     try {
       const wallet: AdaWallet = await updateWallet(this.config, {
         walletId,
-        assuranceLevel,
         name,
       });
       Logger.debug('AdaApi::updateWallet success', { wallet });
@@ -883,9 +877,9 @@ export default class AdaApi {
   testReset = async (): Promise<void> => {
     Logger.debug('AdaApi::testReset called');
     try {
-      const response: Promise<void> = await resetWalletState(this.config);
+      const wallets: AdaWallets = await getWallets(this.config);
+      wallets.map(wallet => deleteWallet(this.config, { walletId: wallet.id }));
       Logger.debug('AdaApi::testReset success');
-      return response;
     } catch (error) {
       Logger.error('AdaApi::testReset error', { error });
       throw new GenericApiError();
@@ -901,7 +895,7 @@ export default class AdaApi {
     }`;
     Logger.debug(`${loggerText} called`);
     try {
-      /* TODO: Uncomment once implemented
+      /* @API TODO: Uncomment once implemented
 
       const nodeInfo: NodeInfoResponse = await getNodeInfo(
         this.config,
@@ -1043,30 +1037,38 @@ export default class AdaApi {
 const _createWalletFromServerData = action(
   'AdaApi::_createWalletFromServerData',
   (data: AdaWallet) => {
-    const { id, balance, name, state, passphrase } = data;
+    const {
+      id,
+      address_pool_gap, // eslint-disable-line
+      balance,
+      name,
+      state,
+      passphrase,
+      delegation,
+    } = data;
 
+    const isDelegated =
+      delegation.status === WalletDelegationStatuses.DELEGATING;
+    const passphraseLastUpdatedAt = get(passphrase, 'last_updated_at', null);
     const walletBalance =
       balance.total.unit === 'lovelace'
         ? new BigNumber(balance.total.quantity).dividedBy(LOVELACES_PER_ADA)
         : new BigNumber(balance.total.quantity);
 
-    // TODO: Should conform to WalletSyncState, but can't match the type
-    // at the moment
-    const walletSyncState: any = {
-      tag: state.status === 'ready' ? 'synced' : 'restoring',
-    };
-
     return new Wallet({
       id,
-      amount: walletBalance,
+      addressPoolGap: address_pool_gap,
       name,
-      // NOTE: Assurance not currently returned on GET /v2/wallets
-      assurance: 'normal',
-      // TODO: Determine if hasPassword still applies
-      hasPassword: true,
-      passwordUpdateDate: new Date(passphrase.last_updated_at),
-      syncState: walletSyncState,
-      isLegacy: false,
+      amount: walletBalance,
+      hasPassword: size(passphrase) > 0,
+      passwordUpdateDate:
+        passphraseLastUpdatedAt && new Date(passphraseLastUpdatedAt),
+      syncState: state,
+      isLegacy: false, // @API TODO - legacy declaration not exist for now
+      isDelegated,
+      // @API TODO - integrate once "Stake Pools" endpoints are done
+      // inactiveStakePercentage: 0,
+      // delegatedStakePool: new StakePool(),
     });
   }
 );

source/renderer/app/api/transactions/types.js

@@ -27,8 +27,6 @@ export type PaymentDistribution = {
   amount: number,
 };
 
-export type TxnAssuranceLevel = 'low' | 'medium' | 'high';
-
 export type TransactionState = 'pending' | 'failed' | 'ok';
 
 export type TransactionFee = ResponseBase & {

source/renderer/app/api/utils/patchAdaApi.js

@@ -1,15 +1,15 @@
 // @flow
 import { get } from 'lodash';
 import AdaApi from '../api';
-import { getNodeInfo } from '../nodes/requests/getNodeInfo';
+// import { getNodeInfo } from '../nodes/requests/getNodeInfo';
 import { getNodeSettings } from '../nodes/requests/getNodeSettings';
 import { getLatestAppVersion } from '../nodes/requests/getLatestAppVersion';
 import { GenericApiError } from '../common/errors';
 import { Logger } from '../../utils/logging';
 import type { NodeInfoQueryParams } from '../nodes/requests/getNodeInfo';
 import type {
   LatestAppVersionInfoResponse,
-  NodeInfoResponse,
+  // NodeInfoResponse,
   GetNetworkStatusResponse,
   NodeSettingsResponse,
   GetNodeSettingsResponse,
@@ -33,6 +33,7 @@ export default (api: AdaApi) => {
   ): Promise<GetNetworkStatusResponse> => {
     Logger.debug('AdaApi::getNetworkStatus (PATCHED) called');
     try {
+      /* @API TODO: Uncomment once implemented
       const nodeInfo: NodeInfoResponse = await getNodeInfo(
         api.config,
         queryInfoParams
@@ -46,7 +47,13 @@ export default (api: AdaApi) => {
         subscriptionStatus,
         syncProgress,
         localBlockchainHeight,
-      } = nodeInfo;
+      } = nodeInfo; */
+
+      const blockchainHeight = { quantity: 100 };
+      const subscriptionStatus = 'subscribed';
+      const syncProgress = { quantity: 1 };
+      const localTimeInformation = { status: 'available' };
+      const localBlockchainHeight = { quantity: 100 };
 
       // extract relevant data before sending to NetworkStatusStore
       const response = {
@@ -57,8 +64,12 @@ export default (api: AdaApi) => {
         localBlockchainHeight:
           LOCAL_BLOCK_HEIGHT || localBlockchainHeight.quantity,
         localTimeInformation: {
-          status: 'available',
-          difference: LOCAL_TIME_DIFFERENCE,
+          status: localTimeInformation.status,
+          difference: get(
+            localTimeInformation,
+            'localTimeDifference.quantity',
+            LOCAL_TIME_DIFFERENCE
+          ),
         },
       };