Merge pull request #1168 from mintlayer/feature/refactor-wallet-sync

Feature/refactor wallet sync

Author: TheQuantumPhysicist

test/functional/test_framework/wallet_cli_controller.py

@@ -69,7 +69,19 @@ async def _read_available_output(self) -> str:
         try:
             output = await asyncio.wait_for(self.process.stdout.read(ONE_MB), timeout=READ_TIMEOUT_SEC)
             self.wallet_commands_file.write(output)
-            return output.decode().strip()
+            result = output.decode().strip()
+
+            try:
+                while True:
+                    output = await asyncio.wait_for(self.process.stdout.read(ONE_MB), timeout=0.1)
+                    if not output:
+                        break
+                    self.wallet_commands_file.write(output)
+                    result += output.decode().strip()
+            except:
+                pass
+
+            return result
         except:
             self.wallet_commands_file.write(b"read from stdout timedout\n")
             return ''

test/functional/test_runner.py

@@ -125,12 +125,12 @@ class UnicodeOnWindowsError(ValueError):
     'p2p_relay_transactions.py',
     'feature_db_reinit.py',
     'feature_lmdb_backend_test.py',
-    # 'wallet_submit_tx.py',
-    # 'wallet_select_utxos.py',
-    # 'wallet_recover_accounts.py',
-    # 'wallet_get_address_usage.py',
-    # 'wallet_tokens.py',
-    # 'wallet_nfts.py',
+    'wallet_submit_tx.py',
+    'wallet_select_utxos.py',
+    'wallet_recover_accounts.py',
+    'wallet_get_address_usage.py',
+    'wallet_tokens.py',
+    'wallet_nfts.py',
     'mempool_basic_reorg.py',
     'mempool_eviction.py',
     'mempool_ibd.py',

test/functional/wallet_get_address_usage.py

@@ -129,7 +129,9 @@ async def async_test(self):
 +-------+----------------------------------------------+--------------------------------+
 | 6     | rmt1q8lrw5tzgmwjnsc26v8qfu8k2jmddpmhwqz6kwt7 | No                             |
 +-------+----------------------------------------------+--------------------------------+"""
-            assert expected_output == await wallet.get_addresses_usage()
+            output = await wallet.get_addresses_usage()
+            for (line, expected_line) in zip(output.split(), expected_output.split()):
+                assert line == expected_line
 
 
 if __name__ == '__main__':

test/functional/wallet_recover_accounts.py

@@ -135,10 +135,6 @@ async def async_test(self):
             assert mnemonic is not None
             assert "Successfully closed the wallet" in await wallet.close_wallet()
             assert "New wallet created successfully" in await wallet.recover_wallet(mnemonic)
-            # check that balance is 0 and accounts are not present
-            assert "Coins amount: 0" in await wallet.get_balance()
-            for idx in range(num_accounts):
-                assert f"Account not found for index: {idx+1}" in await wallet.select_account(idx+1)
 
             # sync and check that accounts are now present and with correct balances
             assert "Success" in await wallet.sync()