Merge branch 'master' into hackrush_max_key

CHANGELOG.md

@@ -52,6 +52,7 @@ at anytime.
  * Linux default downloads folder changed from `~/Downloads` to `XDG_DOWNLOAD_DIR`
  * Linux folders moved from the home directory to `~/.local/share/lbry`
  * Windows folders moved from `%AppData%/Roaming` to `%AppData%/Local/lbry`
+ * Changed `claim_list_by_channel` to return the `claims_in_channel` count instead of the `claims_in_channel_pages` count
 
 ### Added
  * Add link to instructions on how to change the default peer port

docs/cli.md

@@ -191,7 +191,7 @@ Returns:
             If there was an error:
             'error': (str) error message
 
-            'claims_in_channel_pages': total number of pages with <page_size> results,
+            'claims_in_channel': the total number of results for the channel,
 
             If a page of results was requested:
             'returned_page': page number returned,

lbrynet/__init__.py

@@ -1,6 +1,6 @@
 import logging
 
-__version__ = "0.14.2"
+__version__ = "0.14.3rc1"
 version = tuple(__version__.split('.'))
 
 logging.getLogger(__name__).addHandler(logging.NullHandler())

lbrynet/daemon/Daemon.py

@@ -2019,7 +2019,7 @@ class Daemon(AuthJSONRPCServer):
                     If there was an error:
                     'error': (str) error message
 
-                    'claims_in_channel_pages': total number of pages with <page_size> results,
+                    'claims_in_channel': the total number of results for the channel,
 
                     If a page of results was requested:
                     'returned_page': page number returned,
@@ -2077,7 +2077,7 @@ class Daemon(AuthJSONRPCServer):
                 results[u] = resolved[u]
             else:
                 results[u] = {
-                        'claims_in_channel_pages': resolved[u]['claims_in_channel_pages']
+                        'claims_in_channel': resolved[u]['claims_in_channel']
                     }
                 if page:
                     results[u]['returned_page'] = page

requirements.txt

@@ -14,7 +14,7 @@ jsonrpc==1.2
 jsonrpclib==0.1.7
 jsonschema==2.5.1
 git+https://github.com/lbryio/lbryschema.git@v0.0.9#egg=lbryschema
-git+https://github.com/lbryio/lbryum.git@v3.1.4#egg=lbryum
+git+https://github.com/lbryio/lbryum.git@v3.1.5rc1#egg=lbryum
 miniupnpc==1.9
 pbkdf2==1.3
 pycrypto==2.6.1

setup.py

@@ -21,7 +21,7 @@ requires = [
     'envparse',
     'jsonrpc',
     'jsonschema',
-    'lbryum==3.1.4',
+    'lbryum==3.1.5rc1',
     'lbryschema==0.0.9',
     'miniupnpc',
     'pycrypto',