Handle review: add feedback when there is no asset matching the arguments + use neocore.Utils.isValidPublicAddress

Signed-off-by: Guillaume George <lysandergc@gmail.com>

Author: LysanderGG

neo/Prompt/Commands/Wallet.py

@@ -275,25 +275,25 @@ def execute(self, arguments):
         from_addr = None
         watch_only = False
         do_count = False
+        wallet = PromptData.Wallet
 
-        try:
-            if arguments:
-                arguments, from_addr_str = get_from_addr(arguments)
-                if from_addr_str:
-                    from_addr = PromptData.Wallet.ToScriptHash(from_addr_str)
-
-            for item in arguments:
-                if item == '--watch':
-                    watch_only = True
-                elif item == '--count':
-                    do_count = True
-                else:
-                    asset_id = get_asset_id(PromptData.Wallet, item)
-        except Exception as e:
-            print("Invalid arguments specified")
-            return None
+        arguments, from_addr_str = PromptUtils.get_from_addr(arguments)
+        if from_addr_str:
+            if not isValidPublicAddress(from_addr_str):
+                print("Invalid address specified")
+                return None
 
-        return ShowUnspentCoins(PromptData.Wallet, asset_id, from_addr, watch_only, do_count)
+            from_addr = wallet.ToScriptHash(from_addr_str)
+
+        for item in arguments:
+            if item == '--watch':
+                watch_only = True
+            elif item == '--count':
+                do_count = True
+            else:
+                asset_id = PromptUtils.get_asset_id(wallet, item)
+
+        return ShowUnspentCoins(wallet, asset_id, from_addr, watch_only, do_count)
 
     def command_desc(self):
         p1 = ParameterDesc('asset', 'type of asset to query (NEO/GAS)', optional=True)
@@ -739,6 +739,9 @@ def ShowUnspentCoins(wallet, asset_id=None, from_addr=None, watch_only=False, do
         print('\n-----------------------------------------------')
         print(json.dumps(unspent.ToJson(), indent=4))
 
+    if not unspents:
+        print("No unspent assets matching the arguments.")
+
     return unspents
 
 

neo/Prompt/Commands/tests/test_wallet_commands.py

@@ -373,7 +373,7 @@ def test_wallet_unspent(self):
             args = ['unspent', '--from-addr=123']
             res = CommandWallet().execute(args)
             self.assertIsNone(res)
-            self.assertIn("Invalid arguments specified", mock_print.getvalue())
+            self.assertIn("Invalid address specified", mock_print.getvalue())
 
         # test wallet unspent successful
         args = ['unspent']
@@ -406,9 +406,11 @@ def test_wallet_unspent(self):
         self.assertEqual(res[0].Output.AssetId, self.GAS)
 
         # test wallet unspent with unrelated address
-        args = ['unspent', '--from-addr=AGYaEi3W6ndHPUmW7T12FFfsbQ6DWymkEm']
-        res = CommandWallet().execute(args)
-        self.assertEqual(res, [])
+        with patch('sys.stdout', new=StringIO()) as mock_print:
+            args = ['unspent', '--from-addr=AGYaEi3W6ndHPUmW7T12FFfsbQ6DWymkEm']
+            res = CommandWallet().execute(args)
+            self.assertEqual(res, [])
+            self.assertIn("No unspent assets matching the arguments", mock_print.getvalue())
 
         # test wallet unspent with address
         args = ['unspent', '--from-addr=AJQ6FoaSXDFzA6wLnyZ1nFN7SGSN2oNTc3']
@@ -419,9 +421,11 @@ def test_wallet_unspent(self):
         self.assertEqual(res[1].Output.AssetId, self.GAS)
 
         # test wallet unspent with --watch
-        args = ['unspent', '--watch']
-        res = CommandWallet().execute(args)
-        self.assertEqual(res, [])
+        with patch('sys.stdout', new=StringIO()) as mock_print:
+            args = ['unspent', '--watch']
+            res = CommandWallet().execute(args)
+            self.assertEqual(res, [])
+            self.assertIn("No unspent assets matching the arguments", mock_print.getvalue())
 
         # test wallet unspent with --count
         with patch('sys.stdout', new=StringIO()) as mock_print: