Merge pull request #569 from lbryio/fix_update

Remove update_metadata() function
This commit is contained in:
Alex Grin 2017-03-29 13:10:15 -04:00 committed by GitHub
commit 32e2ee8bf5
2 changed files with 2 additions and 9 deletions

View file

@ -19,7 +19,7 @@ at anytime.
* *
### Fixed ### Fixed
* * Removed update_metadata function that could cause update problems
* *
* *

View file

@ -602,12 +602,6 @@ class Wallet(object):
d = self._get_claims_for_name(name) d = self._get_claims_for_name(name)
return d return d
def update_metadata(self, new_metadata, old_metadata):
meta_for_return = old_metadata if isinstance(old_metadata, dict) else {}
for k in new_metadata:
meta_for_return[k] = new_metadata[k]
return defer.succeed(Metadata(meta_for_return))
def _process_claim_out(self, claim_out): def _process_claim_out(self, claim_out):
claim_out.pop('success') claim_out.pop('success')
claim_out['fee'] = float(claim_out['fee']) claim_out['fee'] = float(claim_out['fee'])
@ -636,10 +630,9 @@ class Wallet(object):
log.info("Updating claim") log.info("Updating claim")
if self.get_balance() < Decimal(bid) - Decimal(my_claim['amount']): if self.get_balance() < Decimal(bid) - Decimal(my_claim['amount']):
raise InsufficientFundsError() raise InsufficientFundsError()
new_metadata = yield self.update_metadata(_metadata, my_claim['value'])
old_claim_outpoint = ClaimOutpoint(my_claim['txid'], my_claim['nout']) old_claim_outpoint = ClaimOutpoint(my_claim['txid'], my_claim['nout'])
claim = yield self._send_name_claim_update(name, my_claim['claim_id'], claim = yield self._send_name_claim_update(name, my_claim['claim_id'],
old_claim_outpoint, new_metadata, bid) old_claim_outpoint, _metadata, bid)
claim['claim_id'] = my_claim['claim_id'] claim['claim_id'] = my_claim['claim_id']
else: else:
log.info("Making a new claim") log.info("Making a new claim")