From f7308beee91a4f46bf6ec16a3e18ec6a4c51cd88 Mon Sep 17 00:00:00 2001 From: Job Evers Date: Mon, 2 Jan 2017 19:15:25 -0600 Subject: [PATCH] upgrade txJson-RCP to 0.5 The older version we were running didn't support jsonrpc v2 for error codes, which both the command line client and ui client were expecting. --- lbrynet/lbrynet_daemon/auth/server.py | 1 + packaging/windows/init.ps1 | 2 +- requirements.txt | 2 +- setup.py | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lbrynet/lbrynet_daemon/auth/server.py b/lbrynet/lbrynet_daemon/auth/server.py index 7779fd9d2..8e8d29c19 100644 --- a/lbrynet/lbrynet_daemon/auth/server.py +++ b/lbrynet/lbrynet_daemon/auth/server.py @@ -94,6 +94,7 @@ class AuthJSONRPCServer(AuthorizedBase): isLeaf = True OK = 200 UNAUTHORIZED = 401 + # TODO: codes should follow jsonrpc spec: http://www.jsonrpc.org/specification#error_object NOT_FOUND = 8001 FAILURE = 8002 diff --git a/packaging/windows/init.ps1 b/packaging/windows/init.ps1 index eb4e27d98..c8f07d83e 100644 --- a/packaging/windows/init.ps1 +++ b/packaging/windows/init.ps1 @@ -83,7 +83,7 @@ C:\Python27\Scripts\pip.exe install simplejson==3.8.2 C:\Python27\Scripts\pip.exe install slowaes==0.1a1 -C:\Python27\Scripts\pip.exe install txJSON-RPC==0.3.1 +C:\Python27\Scripts\pip.exe install txJSON-RPC==0.5 C:\Python27\Scripts\pip.exe install unqlite==0.5.3 diff --git a/requirements.txt b/requirements.txt index b04512181..a133e65db 100644 --- a/requirements.txt +++ b/requirements.txt @@ -23,7 +23,7 @@ seccure==0.3.1.3 simplejson==3.8.2 six>=1.9.0 slowaes==0.1a1 -txJSON-RPC==0.3.1 +txJSON-RPC==0.5 wsgiref==0.1.2 zope.interface==4.1.3 base58==0.2.2 diff --git a/setup.py b/setup.py index f065cebd7..8b2969104 100644 --- a/setup.py +++ b/setup.py @@ -56,7 +56,7 @@ requires = [ 'simplejson==3.8.2', 'six>=1.9.0', 'slowaes==0.1a1', - 'txJSON-RPC==0.3.1', + 'txJSON-RPC==0.5', 'wsgiref==0.1.2', 'zope.interface==4.1.3', 'base58==0.2.2',