Merge branch 'KamilPiekutowski-channels_not_get_able'

* KamilPiekutowski-channels_not_get_able:
  fixed the error when trying to perform get on channels
This commit is contained in:
Alex Grintsvayg 2018-02-12 16:40:50 -05:00
commit 01a9d96f28
2 changed files with 8 additions and 2 deletions

View file

@ -11,6 +11,9 @@ at anytime.
### Security
*
*
### Fixed
* fixed `get` on channel now it returns error that informs of `get` not supporting channels
* the message that is displayed can be more descriptive, and it is open for discussion
### Fixed
* Fixed improper parsing of arguments to CLI settings_set (https://github.com/lbryio/lbry/issues/930)

View file

@ -1630,8 +1630,11 @@ class Daemon(AuthJSONRPCServer):
if not resolved or 'value' not in resolved:
if 'claim' not in resolved:
raise Exception(
"Failed to resolve stream at lbry://{}".format(uri.replace("lbry://", "")))
if 'certificate' in resolved:
raise Exception("Cannot use get on channels")
else:
raise Exception(
"Failed to resolve stream at lbry://{}".format(uri.replace("lbry://", "")))
else:
resolved = resolved['claim']
txid, nout, name = resolved['txid'], resolved['nout'], resolved['name']