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

make wallet method public and move common functions back into parent wallet class

Browse source
This commit is contained in:
Jimmy Kiselak 2016-02-17 11:47:39 -05:00
parent d4193c55ae
commit 4451978af6
1 changed files with 11 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
lbrynet/core/LBRYcrdWallet.py
View file

@ -151,6 +151,12 @@ class LBRYWallet(object):
d.addBoth(set_manage_not_running) d.addBoth(set_manage_not_running)
return d return d
def get_info_exchanger(self):
return LBRYcrdAddressRequester(self)
def get_wallet_info_query_handler_factory(self):
return LBRYcrdAddressQueryHandlerFactory(self)
def reserve_points(self, identifier, amount): def reserve_points(self, identifier, amount):
""" """
Ensure a certain amount of points are available to be sent as payment, before the service is rendered Ensure a certain amount of points are available to be sent as payment, before the service is rendered
@ -266,7 +272,7 @@ class LBRYWallet(object):
return d return d
def get_stream_info_from_txid(self, name, txid): def get_stream_info_from_txid(self, name, txid):
d = self._get_claims_from_tx(txid) d = self.get_claims_from_tx(txid)
def get_claim_for_name(claims): def get_claim_for_name(claims):
for claim in claims: for claim in claims:
@ -326,7 +332,7 @@ class LBRYWallet(object):
def abandon_name(self, txid): def abandon_name(self, txid):
d1 = self.get_new_address() d1 = self.get_new_address()
d2 = self._get_claims_from_tx(txid) d2 = self.get_claims_from_tx(txid)
def get_txout_of_claim(claims): def get_txout_of_claim(claims):
for claim in claims: for claim in claims:
@ -374,7 +380,7 @@ class LBRYWallet(object):
return float(self.wallet_balance - self.total_reserved_points) return float(self.wallet_balance - self.total_reserved_points)
def _get_status_of_claim(self, txid, name, sd_hash): def _get_status_of_claim(self, txid, name, sd_hash):
d = self._get_claims_from_tx(txid) d = self.get_claims_from_tx(txid)
def get_status(claims): def get_status(claims):
if claims is None: if claims is None:
@ -465,12 +471,6 @@ class LBRYWallet(object):
######### Must be overridden ######### ######### Must be overridden #########
def get_info_exchanger(self):
return defer.fail(NotImplementedError())
def get_wallet_info_query_handler_factory(self):
return defer.fail(NotImplementedError())
def get_balance(self): def get_balance(self):
return defer.fail(NotImplementedError()) return defer.fail(NotImplementedError())
@ -510,7 +510,7 @@ class LBRYWallet(object):
def _get_value_for_name(self, name): def _get_value_for_name(self, name):
return defer.fail(NotImplementedError()) return defer.fail(NotImplementedError())
def _get_claims_from_tx(self, txid): def get_claims_from_tx(self, txid):
return defer.fail(NotImplementedError()) return defer.fail(NotImplementedError())
def _get_balance_for_address(self, address): def _get_balance_for_address(self, address):
@ -563,12 +563,6 @@ class LBRYcrdWallet(LBRYWallet):
settings["rpc_port"] = int(l[8:].rstrip('\n')) settings["rpc_port"] = int(l[8:].rstrip('\n'))
return settings return settings
def get_info_exchanger(self):
return LBRYcrdAddressRequester(self)
def get_wallet_info_query_handler_factory(self):
return LBRYcrdAddressQueryHandlerFactory(self)
def check_first_run(self): def check_first_run(self):
d = self.get_balance() d = self.get_balance()
d.addCallback(lambda bal: threads.deferToThread(self._get_num_addresses_rpc) if bal == 0 else 2) d.addCallback(lambda bal: threads.deferToThread(self._get_num_addresses_rpc) if bal == 0 else 2)
@ -600,9 +594,6 @@ class LBRYcrdWallet(LBRYWallet):
def get_nametrie(self): def get_nametrie(self):
return threads.deferToThread(self._get_nametrie_rpc) return threads.deferToThread(self._get_nametrie_rpc)
def get_claims_from_tx(self, txid):
return self._get_claims_from_tx(txid)
def start_miner(self): def start_miner(self):
d = threads.deferToThread(self._get_gen_status_rpc) d = threads.deferToThread(self._get_gen_status_rpc)
d.addCallback(lambda status: threads.deferToThread(self._set_gen_status_rpc, True) if not status d.addCallback(lambda status: threads.deferToThread(self._set_gen_status_rpc, True) if not status
@ -636,7 +627,7 @@ class LBRYcrdWallet(LBRYWallet):
def _send_abandon(self, txid, address, amount): def _send_abandon(self, txid, address, amount):
return threads.deferToThread(self._send_abandon_rpc, txid, address, amount) return threads.deferToThread(self._send_abandon_rpc, txid, address, amount)
def _get_claims_from_tx(self, txid): def get_claims_from_tx(self, txid):
return threads.deferToThread(self._get_claims_from_tx_rpc, txid) return threads.deferToThread(self._get_claims_from_tx_rpc, txid)
def _get_value_for_name(self, name): def _get_value_for_name(self, name):