From df649341cddd7a9cdf3bf4027e07ee8bf7986fb6 Mon Sep 17 00:00:00 2001 From: Lex Berezhny Date: Fri, 22 Mar 2019 03:38:54 -0400 Subject: [PATCH] json output formatting fix for Claim --- lbrynet/extras/daemon/json_response_encoder.py | 9 +++++---- tests/integration/test_sync.py | 5 ----- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/lbrynet/extras/daemon/json_response_encoder.py b/lbrynet/extras/daemon/json_response_encoder.py index 2ed139d25..535001921 100644 --- a/lbrynet/extras/daemon/json_response_encoder.py +++ b/lbrynet/extras/daemon/json_response_encoder.py @@ -25,7 +25,10 @@ class JSONResponseEncoder(JSONEncoder): if isinstance(obj, Output): return self.encode_output(obj) if isinstance(obj, Claim): - return obj.to_dict() + claim_dict = obj.to_dict() + if obj.is_stream: + claim_dict['stream']['hash'] = obj.stream.hash + return claim_dict if isinstance(obj, datetime): return obj.strftime("%Y%m%dT%H:%M:%S") if isinstance(obj, Decimal): @@ -71,9 +74,7 @@ class JSONResponseEncoder(JSONEncoder): if txo.script.is_claim_name or txo.script.is_update_claim: claim = txo.claim - output['value'] = claim.to_dict() - if claim.is_stream: - output['value']['stream']['hash'] = claim.stream.hash + output['value'] = claim if claim.is_signed: output['valid_signature'] = None if txo.channel is not None: diff --git a/tests/integration/test_sync.py b/tests/integration/test_sync.py index 899757ef5..547a7d0be 100644 --- a/tests/integration/test_sync.py +++ b/tests/integration/test_sync.py @@ -1,13 +1,8 @@ from unittest import mock -from lbrynet.schema.claim import ClaimDict - from torba.orchstr8.node import WalletNode, SPVNode from torba.testcase import AsyncioTestCase -import lbrynet.schema -lbrynet.schema.BLOCKCHAIN_NAME = 'lbrycrd_regtest' - from lbrynet.conf import Config from lbrynet.wallet import LbryWalletManager, RegTestLedger from lbrynet.extras.daemon.Daemon import Daemon