LBRYCommunity/lbry-sdk
1
0
Fork 1
Code Issues Pull requests Projects Releases 282 Packages Wiki Activity

Merge remote-tracking branch 'origin/return-full-ids'

Browse source 
* origin/return-full-ids:
  Return full LBRY ID and installation ID in jsonrpc_status()
This commit is contained in:
Alex Grintsvayg 2017-04-17 09:25:36 -04:00
commit 41204f7cbe
4 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -15,7 +15,7 @@
/docs_build /docs_build
/lbry-venv /lbry-venv
.idea/.name .idea/
.coverage .coverage
.DS_Store .DS_Store

2
CHANGELOG.md
View file

@ -14,7 +14,7 @@ at anytime.
* *
### Changed ### Changed
* * Return full `lbry_id` and `installation_id` from `status`
* *
* *

4
lbrynet/lbrynet_daemon/Daemon.py
View file

@ -1061,8 +1061,8 @@ class Daemon(AuthJSONRPCServer):
best_hash = (yield self.session.wallet.get_best_blockhash()) if has_wallet else None best_hash = (yield self.session.wallet.get_best_blockhash()) if has_wallet else None
response = { response = {
'lbry_id': base58.b58encode(self.lbryid)[:SHORT_ID_LEN], 'lbry_id': base58.b58encode(self.lbryid),
'installation_id': conf.settings.get_installation_id()[:SHORT_ID_LEN], 'installation_id': conf.settings.installation_id,
'is_running': self.announced_startup, 'is_running': self.announced_startup,
'is_first_run': self.session.wallet.is_first_run if has_wallet else None, 'is_first_run': self.session.wallet.is_first_run if has_wallet else None,
'startup_status': { 'startup_status': {

1
tests/mocks.py
View file

@ -247,6 +247,7 @@ create_stream_sd_file = {
def mock_conf_settings(obj, settings={}): def mock_conf_settings(obj, settings={}):
original_settings = conf.settings original_settings = conf.settings
conf.settings = conf.Config(conf.FIXED_SETTINGS, conf.ADJUSTABLE_SETTINGS) conf.settings = conf.Config(conf.FIXED_SETTINGS, conf.ADJUSTABLE_SETTINGS)
conf.settings.installation_id = conf.settings.get_installation_id()
conf.settings.update(settings) conf.settings.update(settings)
def _reset_settings(): def _reset_settings():