From 8aa50aa14f6eede7b86825b020d924167b9d4d83 Mon Sep 17 00:00:00 2001
From: Lex Berezhny <lex@damoti.com>
Date: Mon, 11 Feb 2019 17:47:52 -0500
Subject: [PATCH] cleaned up resolve command

---
 lbrynet/extras/daemon/Daemon.py  | 24 +++++++++++-------------
 lbrynet/extras/wallet/manager.py |  1 -
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/lbrynet/extras/daemon/Daemon.py b/lbrynet/extras/daemon/Daemon.py
index cf735bf6c..8b238953e 100644
--- a/lbrynet/extras/daemon/Daemon.py
+++ b/lbrynet/extras/daemon/Daemon.py
@@ -1437,17 +1437,15 @@ class Daemon(metaclass=JSONRPCServerType):
         return claim_results
 
     @requires(WALLET_COMPONENT)
-    async def jsonrpc_resolve(self, force=False, uri=None, uris=None):
+    async def jsonrpc_resolve(self, url):
         """
         Get the claim that a URL refers to.
 
         Usage:
-            resolve [--force] (<uri> | --uri=<uri>) [<uris>...]
+            resolve <url>...
 
         Options:
-            --force  : (bool) force refresh and ignore cache
-            --uri=<uri>    : (str) uri to resolve
-            --uris=<uris>   : (list) uris to resolve
+            --url=<url>   : (str) one or more urls to resolve
 
         Returns:
             Dictionary of results, keyed by uri
@@ -1505,23 +1503,23 @@ class Daemon(metaclass=JSONRPCServerType):
             }
         """
 
-        uris = tuple(uris or [])
-        if uri is not None:
-            uris += (uri,)
+        urls = [url] if isinstance(url, str) else url
 
         results = {}
 
-        valid_uris = tuple()
-        for u in uris:
+        valid_urls = set()
+        for u in urls:
             try:
                 parse_lbry_uri(u)
-                valid_uris += (u,)
+                valid_urls.add(u)
             except URIParseError:
-                results[u] = {"error": "%s is not a valid uri" % u}
+                results[u] = {"error": "%s is not a valid url" % u}
+
+        resolved = await self.wallet_manager.resolve(*tuple(valid_urls))
 
-        resolved = await self.wallet_manager.resolve(*valid_uris, check_cache=not force)
         for resolved_uri in resolved:
             results[resolved_uri] = resolved[resolved_uri]
+
         return results
 
     @requires(WALLET_COMPONENT, EXCHANGE_RATE_MANAGER_COMPONENT, BLOB_COMPONENT, DATABASE_COMPONENT,
diff --git a/lbrynet/extras/wallet/manager.py b/lbrynet/extras/wallet/manager.py
index 7373ec92f..b0c6d2236 100644
--- a/lbrynet/extras/wallet/manager.py
+++ b/lbrynet/extras/wallet/manager.py
@@ -260,7 +260,6 @@ class LbryWalletManager(BaseWalletManager):
     async def resolve(self, *uris, **kwargs):
         page = kwargs.get('page', 0)
         page_size = kwargs.get('page_size', 10)
-        check_cache = kwargs.get('check_cache', False)  # TODO: put caching back (was force_refresh parameter)
         ledger: MainNetLedger = self.default_account.ledger
         results = await ledger.resolve(page, page_size, *uris)
         if 'error' not in results: