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

inlineCallbacks fix

Browse source
This commit is contained in:
Lex Berezhny 2018-10-08 22:44:00 -04:00
parent f06098978c
commit 9525b87224
2 changed files with 21 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
lbrynet/daemon/Daemon.py
View file

@ -1506,6 +1506,7 @@ class Daemon(AuthJSONRPCServer):
) )
@requires(WALLET_COMPONENT) @requires(WALLET_COMPONENT)
@defer.inlineCallbacks
def jsonrpc_address_list(self, account_id=None, offset=None, limit=None): def jsonrpc_address_list(self, account_id=None, offset=None, limit=None):
""" """
List account addresses List account addresses
@ -1529,12 +1530,12 @@ class Daemon(AuthJSONRPCServer):
'limit': limit 'limit': limit
} }
return { return {
"list": self.ledger.db.get_addresses(**constraints), "list": (yield self.ledger.db.get_addresses(**constraints)),
"size": self.ledger.db.get_addresses_count(**constraints), "size": (yield self.ledger.db.get_addresses_count(**constraints)),
"offset": offset, "offset": offset,
"limit": limit "limit": limit
} }
return account.get_addresses() return (yield account.get_addresses())
@requires(WALLET_COMPONENT) @requires(WALLET_COMPONENT)
def jsonrpc_address_unused(self, account_id=None): def jsonrpc_address_unused(self, account_id=None):
@ -2050,6 +2051,7 @@ class Daemon(AuthJSONRPCServer):
} }
@requires(WALLET_COMPONENT) @requires(WALLET_COMPONENT)
@defer.inlineCallbacks
def jsonrpc_channel_list(self, account_id=None, offset=None, limit=None): def jsonrpc_channel_list(self, account_id=None, offset=None, limit=None):
""" """
Get certificate claim infos for channels that can be published to Get certificate claim infos for channels that can be published to
@ -2074,12 +2076,12 @@ class Daemon(AuthJSONRPCServer):
'limit': limit 'limit': limit
} }
return { return {
"list": self.ledger.db.get_channels(**constraints), "list": (yield self.ledger.db.get_channels(**constraints)),
"size": self.ledger.db.get_channels_count(**constraints), "size": (yield self.ledger.db.get_channels_count(**constraints)),
"offset": offset, "offset": offset,
"limit": limit "limit": limit
} }
return account.get_channels() return (yield account.get_channels())
@requires(WALLET_COMPONENT) @requires(WALLET_COMPONENT)
@defer.inlineCallbacks @defer.inlineCallbacks
@ -2474,6 +2476,7 @@ class Daemon(AuthJSONRPCServer):
) )
@requires(WALLET_COMPONENT) @requires(WALLET_COMPONENT)
@defer.inlineCallbacks
def jsonrpc_claim_list_mine(self, account_id=None, offset=None, limit=None): def jsonrpc_claim_list_mine(self, account_id=None, offset=None, limit=None):
""" """
List my name claims List my name claims
@ -2516,12 +2519,12 @@ class Daemon(AuthJSONRPCServer):
'limit': limit 'limit': limit
} }
return { return {
"list": self.ledger.db.get_claims(**constraints), "list": (yield self.ledger.db.get_claims(**constraints)),
"size": self.ledger.db.get_claims_count(**constraints), "size": (yield self.ledger.db.get_claims_count(**constraints)),
"offset": offset, "offset": offset,
"limit": limit "limit": limit
} }
return account.get_claims() return (yield account.get_claims())
@requires(WALLET_COMPONENT) @requires(WALLET_COMPONENT)
@defer.inlineCallbacks @defer.inlineCallbacks
@ -2719,14 +2722,14 @@ class Daemon(AuthJSONRPCServer):
'limit': limit 'limit': limit
} }
return { return {
"list": self.wallet_manager.get_history( "list": (yield self.wallet_manager.get_history(
account=account, **constraints), account=account, **constraints)),
"size": self.ledger.db.get_transactions_count( "size": (yield self.ledger.db.get_transactions_count(
account=account, **constraints), account=account, **constraints)),
"offset": offset, "offset": offset,
"limit": limit "limit": limit
} }
return self.wallet_manager.get_history(account) return (yield self.wallet_manager.get_history(account))
@requires(WALLET_COMPONENT) @requires(WALLET_COMPONENT)
def jsonrpc_transaction_show(self, txid): def jsonrpc_transaction_show(self, txid):
@ -2782,12 +2785,12 @@ class Daemon(AuthJSONRPCServer):
'limit': limit 'limit': limit
} }
return { return {
"list": self.ledger.db.get_utxos(**constraints), "list": (yield self.ledger.db.get_utxos(**constraints)),
"size": self.ledger.db.get_utxo_count(**constraints), "size": (yield self.ledger.db.get_utxo_count(**constraints)),
"offset": offset, "offset": offset,
"limit": limit "limit": limit
} }
return account.get_utxos() return (yield account.get_utxos())
@requires(WALLET_COMPONENT) @requires(WALLET_COMPONENT)
def jsonrpc_block_show(self, blockhash=None, height=None): def jsonrpc_block_show(self, blockhash=None, height=None):

2
lbrynet/wallet/manager.py
View file

@ -290,7 +290,7 @@ class LbryWalletManager(BaseWalletManager):
@defer.inlineCallbacks @defer.inlineCallbacks
def get_history(account: BaseAccount, **constraints): def get_history(account: BaseAccount, **constraints):
headers = account.ledger.headers headers = account.ledger.headers
txs = (yield account.get_transactions(account=account, **constraints)) txs = (yield account.get_transactions(**constraints))
history = [] history = []
for tx in txs: for tx in txs:
ts = headers[tx.height]['timestamp'] ts = headers[tx.height]['timestamp']