Madiator2011/lbry-sdk
1
0
Fork 0
forked from LBRYCommunity/lbry-sdk
Code Pull requests Activity

fix json bug

Browse source
This commit is contained in:
Jack 2016-08-29 14:33:56 -04:00
parent c15af0a63a
commit 1671034330
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lbrynet/core/LBRYWallet.py
View file

@ -431,10 +431,10 @@ class LBRYWallet(object):
def _claim_or_update(claim, metadata, _bid): def _claim_or_update(claim, metadata, _bid):
if not claim: if not claim:
log.info("No claim yet, making a new one") log.info("No claim yet, making a new one")
return self._send_name_claim(name, json.dumps(metadata), _bid) return self._send_name_claim(name, metadata, _bid)
if not claim['is_mine']: if not claim['is_mine']:
log.info("Making a contesting claim") log.info("Making a contesting claim")
return self._send_name_claim(name, json.dump(metadata), _bid) return self._send_name_claim(name, metadata, _bid)
else: else:
log.info("Updating over own claim") log.info("Updating over own claim")
d = self.update_metadata(metadata, claim['value']) d = self.update_metadata(metadata, claim['value'])
@ -1018,7 +1018,7 @@ class LBRYcrdWallet(LBRYWallet):
def _send_name_claim_rpc(self, name, value, amount): def _send_name_claim_rpc(self, name, value, amount):
rpc_conn = self._get_rpc_conn() rpc_conn = self._get_rpc_conn()
try: try:
return str(rpc_conn.claimname(name, value, amount)) return str(rpc_conn.claimname(name, json.dumps(value), amount))
except JSONRPCException as e: except JSONRPCException as e:
if 'message' in e.error and e.error['message'] == "Insufficient funds": if 'message' in e.error and e.error['message'] == "Insufficient funds":
raise InsufficientFundsError() raise InsufficientFundsError()
@ -1242,7 +1242,7 @@ class LBRYumWallet(LBRYWallet):
def send_claim(address): def send_claim(address):
cmd = known_commands['claimname'] cmd = known_commands['claimname']
func = getattr(self.cmd_runner, cmd.name) func = getattr(self.cmd_runner, cmd.name)
return threads.deferToThread(func, address, amount, name, val) return threads.deferToThread(func, address, amount, name, json.dumps(val))
d = self.get_new_address() d = self.get_new_address()
d.addCallback(send_claim) d.addCallback(send_claim)
d.addCallback(self._broadcast_transaction) d.addCallback(self._broadcast_transaction)
@ -1256,8 +1256,8 @@ class LBRYumWallet(LBRYWallet):
def _send_name_claim_update(self, name, claim_id, txid, value, amount): def _send_name_claim_update(self, name, claim_id, txid, value, amount):
def send_claim_update(address): def send_claim_update(address):
decoded_claim_id = claim_id.decode('hex')[::-1] decoded_claim_id = claim_id.decode('hex')[::-1]
metadata = json.dumps(Metadata(value)) metadata = json.dumps(value)
log.info("updateclaim %s %s %f %s %s '%s'", txid, address, amount, name, decoded_claim_id.encode('hex'), json.dumps(metadata)) log.info("updateclaim %s %s %f %s %s '%s'", txid, address, amount, name, decoded_claim_id.encode('hex'), metadata)
cmd = known_commands['updateclaim'] cmd = known_commands['updateclaim']
func = getattr(self.cmd_runner, cmd.name) func = getattr(self.cmd_runner, cmd.name)
return threads.deferToThread(func, txid, address, amount, name, decoded_claim_id, metadata) return threads.deferToThread(func, txid, address, amount, name, decoded_claim_id, metadata)