Re-organize test files

lib/shared/api_database.dart

@@ -100,12 +100,16 @@ class ApiDatabase {
 
     // get account preferences taking into account corrupted localStorage
     Map<AccountPreferences, dynamic> accountPreferences;
-    accountPreferences = getUpdatedAccountInfo(AccountPreferencesParams(
-        walletIdToSet,
-        preferences,
-        walletStorage.currentWallet.masterAccount != null
+    accountPreferences = getUpdatedAccountInfo(
+      AccountPreferencesParams(
+        currentWalletId: walletIdToSet,
+        preferences: preferences,
+        accountList: walletStorage.currentWallet.masterAccount != null
             ? {0: walletStorage.currentWallet.masterAccount!}
-            : walletStorage.currentWallet.externalAccounts));
+            : walletStorage.currentWallet.externalAccounts,
+        isHdWallet: walletStorage.currentWallet.masterAccount == null,
+      ),
+    );
 
     // set new current wallet and account in local storage
     if (isNewWallet || isUpdatedWallet && currentWalletId != null) {

lib/util/account_preferences.dart

@@ -1,19 +1,23 @@
 import 'package:my_wit_wallet/shared/api_database.dart';
 import 'package:my_wit_wallet/util/storage/database/account.dart';
 
-enum AccountPreferences { address, addressIndex, addressList }
+enum AccountPreferences { address, addressIndex, addressList, isHdWallet }
 
 class AccountPreferencesParams {
   String? currentWalletId;
   Map<WalletPreferences, dynamic>? preferences;
-  Map<int, Account> externalAccounts;
+  Map<int, Account> accountList;
+  bool isHdWallet;
   AccountPreferencesParams(
-      this.currentWalletId, this.preferences, this.externalAccounts);
+      {this.currentWalletId,
+      this.preferences,
+      required this.accountList,
+      required this.isHdWallet});
 }
 
 Map<AccountPreferences, dynamic> getUpdatedAccountInfo(
     AccountPreferencesParams params) {
-  bool isHdWallet = params.externalAccounts.isNotEmpty;
+  bool isHdWallet = params.isHdWallet;
   String addressId = isHdWallet ? "0/0" : "m";
   Map<String, dynamic> addressList = {
     '${params.currentWalletId}': isHdWallet ? "0/0" : "m"
@@ -27,18 +31,17 @@ Map<AccountPreferences, dynamic> getUpdatedAccountInfo(
   int addressIndex =
       addressId.contains("/") ? int.parse(addressId.split('/').last) : 0;
 
-  bool isAddressIdxInStorage = params.externalAccounts.length > 0 &&
-      (addressIndex < params.externalAccounts.length);
+  bool isAddressIdxInStorage = params.accountList.length > 0 &&
+      (addressIndex < params.accountList.length);
   Map<String, dynamic> defaultAccountSettings = {
     ...addressList,
     '${params.currentWalletId}': isHdWallet ? "0/0" : "m",
   };
-  String? defaultAddress = params.externalAccounts[0] != null
-      ? params.externalAccounts[0]!.address
-      : null;
+  String? defaultAddress =
+      params.accountList[0] != null ? params.accountList[0]!.address : null;
   return {
     AccountPreferences.address: isAddressIdxInStorage
-        ? params.externalAccounts[addressIndex]!.address
+        ? params.accountList[addressIndex]!.address
         : defaultAddress,
     AccountPreferences.addressIndex:
         isAddressIdxInStorage ? addressIndex.toString() : "0",

test/util/account_preferences_test.dart

@@ -0,0 +1,131 @@
+import 'package:my_wit_wallet/shared/api_database.dart';
+import 'package:my_wit_wallet/util/account_preferences.dart';
+import 'package:my_wit_wallet/util/storage/database/account.dart';
+import 'package:test/test.dart';
+
+void main() {
+  Map<AccountPreferences, dynamic> accountPreferences = getUpdatedAccountInfo(
+    AccountPreferencesParams(
+        currentWalletId: '8a7cf20f',
+        preferences: {
+          WalletPreferences.addressIndex: '0/0',
+          WalletPreferences.addressList: {
+            '8a7cf20f': '0/0',
+          }
+        },
+        accountList: {
+          0: Account(
+              walletName: '8a7cf20f',
+              address: 'wit000000000000000000000000000000000000000',
+              path: 'M/3h/4919h/0h/0/1')
+        },
+        isHdWallet: true),
+  );
+  // With not existent index saved
+  Map<AccountPreferences, dynamic> accountPreferences2 =
+      getUpdatedAccountInfo(AccountPreferencesParams(
+          currentWalletId: '8a7cf20f',
+          preferences: {
+            WalletPreferences.addressIndex: '0/2',
+            WalletPreferences.addressList: {
+              '8a7cf20f': '0/2',
+            }
+          },
+          accountList: {
+            0: Account(
+                walletName: '8a7cf20f',
+                address: 'wit000000000000000000000000000000000000000',
+                path: 'M/3h/4919h/0h/0/1')
+          },
+          isHdWallet: true));
+  // With db deleted
+  Map<AccountPreferences, dynamic> accountPreferences3 =
+      getUpdatedAccountInfo(AccountPreferencesParams(
+          currentWalletId: '8a7cf20f',
+          preferences: {
+            WalletPreferences.addressIndex: '0/2',
+            WalletPreferences.addressList: {
+              '8a7cf20f': '0/2',
+            }
+          },
+          accountList: {},
+          isHdWallet: true));
+  // With deleted prefs
+  Map<AccountPreferences, dynamic> accountPreferences4 =
+      getUpdatedAccountInfo(AccountPreferencesParams(
+          currentWalletId: '8a7cf20f',
+          preferences: null,
+          accountList: {
+            0: Account(
+                walletName: '8a7cf20f',
+                address: 'wit000000000000000000000000000000000000000',
+                path: 'M/3h/4919h/0h/0/1')
+          },
+          isHdWallet: true));
+  Map<AccountPreferences, dynamic> accountPreferences5 =
+      getUpdatedAccountInfo(AccountPreferencesParams(
+          currentWalletId: '8a7cf20f',
+          preferences: null,
+          accountList: {
+            0: Account(
+                walletName: '8a7cf20f',
+                address: 'wit000000000000000000000000000000000000000',
+                path: 'M/3h/4919h/0h/0/1')
+          },
+          isHdWallet: false));
+  group(
+      'getAccountPreferences',
+      () => {
+            test(
+                'with correctly saved preferences',
+                () => {
+                      expect(accountPreferences, {
+                        AccountPreferences.address:
+                            'wit000000000000000000000000000000000000000',
+                        AccountPreferences.addressIndex: '0',
+                        AccountPreferences.addressList: {'8a7cf20f': '0/0'}
+                      }),
+                    }),
+            test(
+                'with not found address index in saved preferences',
+                () => {
+                      expect(accountPreferences2, {
+                        AccountPreferences.address:
+                            'wit000000000000000000000000000000000000000',
+                        AccountPreferences.addressIndex: '0',
+                        AccountPreferences.addressList: {'8a7cf20f': '0/0'}
+                      }),
+                    }),
+            test(
+                'with deleted db and saved preferences',
+                () => {
+                      expect(accountPreferences3, {
+                        AccountPreferences.address: null,
+                        AccountPreferences.addressIndex: '0',
+                        AccountPreferences.addressList: {
+                          '8a7cf20f': '0/0',
+                        },
+                      }),
+                    }),
+            test(
+                'with deleted preferences and saved db',
+                () => {
+                      expect(accountPreferences4, {
+                        AccountPreferences.address:
+                            'wit000000000000000000000000000000000000000',
+                        AccountPreferences.addressIndex: '0',
+                        AccountPreferences.addressList: {'8a7cf20f': '0/0'},
+                      }),
+                    }),
+            test(
+                'with deleted preferences and saved db with node address',
+                () => {
+                      expect(accountPreferences5, {
+                        AccountPreferences.address:
+                            'wit000000000000000000000000000000000000000',
+                        AccountPreferences.addressIndex: '0',
+                        AccountPreferences.addressList: {'8a7cf20f': 'm'},
+                      }),
+                    }),
+          });
+}

lib/util/transactions_list/test/get_transaction_address_test.dart → test/util/transactions_list/get_transaction_address_test.dart

@@ -41,27 +41,27 @@ void main() {
       getTransactionAddress(tolabel, inputs, outputs);
   String transactionAddressFromLabel =
       getTransactionAddress(fromlabel, inputs, outputs);
-  String transactionAddressFromSeveralAddresses =
+  String transactionAddressFromSeveralInputs =
       getTransactionAddress(fromlabel, severalInputs, outputs);
 
   group(
       'getTransactionAddress',
       () => {
             test(
-                'with to label',
+                'with \'to\' label',
                 () => {
                       expect(transactionAddressToLabel, 'wit1zl7...4wv69cw'),
                     }),
             test(
-                'with from label',
+                'with \'from\' label',
                 () => {
                       expect(transactionAddressFromLabel, 'wit1zl7...4wv69cw'),
                     }),
             test(
-                'with from label from several addresses',
+                'with \'from\' label and several inputs',
                 () => {
-                      expect(transactionAddressFromSeveralAddresses,
-                          'Several addresses'),
+                      expect(transactionAddressFromSeveralInputs,
+                          'wit1zl7...4wv69cw'),
                     })
           });
 }