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

include_is_spent no longer needed

Browse source
This commit is contained in:
Lex Berezhny 2020-06-21 19:52:39 -04:00
parent 46da2584ca
commit 9198877098
4 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lbry/db/queries.py
View file

@ -217,7 +217,6 @@ def get_transactions(**constraints) -> Tuple[List[Transaction], Optional[int]]:
def _get_transactions(wallet=None, include_total=False, **constraints) -> Tuple[List[Transaction], Optional[int]]: def _get_transactions(wallet=None, include_total=False, **constraints) -> Tuple[List[Transaction], Optional[int]]:
include_is_spent = constraints.pop('include_is_spent', False)
include_is_my_input = constraints.pop('include_is_my_input', False) include_is_my_input = constraints.pop('include_is_my_input', False)
include_is_my_output = constraints.pop('include_is_my_output', False) include_is_my_output = constraints.pop('include_is_my_output', False)
@ -244,7 +243,6 @@ def _get_transactions(wallet=None, include_total=False, **constraints) -> Tuple[
get_txos( get_txos(
wallet=wallet, wallet=wallet,
tx_hash__in=txids[offset:offset + MAX_QUERY_VARIABLES], order_by='txo.tx_hash', tx_hash__in=txids[offset:offset + MAX_QUERY_VARIABLES], order_by='txo.tx_hash',
include_is_spent=include_is_spent,
include_is_my_input=include_is_my_input, include_is_my_input=include_is_my_input,
include_is_my_output=include_is_my_output, include_is_my_output=include_is_my_output,
)[0] )[0]
@ -403,7 +401,6 @@ def rows_to_txos(rows: List[dict], include_tx=True) -> List[Output]:
def get_txos(no_tx=False, include_total=False, **constraints) -> Tuple[List[Output], Optional[int]]: def get_txos(no_tx=False, include_total=False, **constraints) -> Tuple[List[Output], Optional[int]]:
wallet_account_ids = constraints.pop('wallet_account_ids', []) wallet_account_ids = constraints.pop('wallet_account_ids', [])
include_is_spent = constraints.get('include_is_spent', False)
include_is_my_input = constraints.get('include_is_my_input', False) include_is_my_input = constraints.get('include_is_my_input', False)
include_is_my_output = constraints.pop('include_is_my_output', False) include_is_my_output = constraints.pop('include_is_my_output', False)
include_received_tips = constraints.pop('include_received_tips', False) include_received_tips = constraints.pop('include_received_tips', False)
@ -475,7 +472,6 @@ def get_txos(no_tx=False, include_total=False, **constraints) -> Tuple[List[Outp
def _clean_txo_constraints_for_aggregation(constraints): def _clean_txo_constraints_for_aggregation(constraints):
constraints.pop('include_is_spent', None)
constraints.pop('include_is_my_input', None) constraints.pop('include_is_my_input', None)
constraints.pop('include_is_my_output', None) constraints.pop('include_is_my_output', None)
constraints.pop('include_received_tips', None) constraints.pop('include_received_tips', None)

1
lbry/service/api.py
View file

@ -2701,7 +2701,6 @@ class API:
accounts = wallet.accounts.get_or_all(txo_dict.pop('account_id')) accounts = wallet.accounts.get_or_all(txo_dict.pop('account_id'))
constraints = { constraints = {
'resolve': resolve, 'resolve': resolve,
'include_is_spent': True,
'include_is_my_input': True, 'include_is_my_input': True,
'include_is_my_output': True, 'include_is_my_output': True,
'include_received_tips': include_received_tips, 'include_received_tips': include_received_tips,

2
lbry/testcase.py
View file

@ -387,7 +387,7 @@ class UnitDBTestCase(AsyncioTestCase):
async def get_claims(self): async def get_claims(self):
claims = [] claims = []
sql = ( sql = (
"select claim_id from claim order by height, tx_position" "select claim_id from claim order by height"
) )
for claim in await self.db.execute_fetchall(sql): for claim in await self.db.execute_fetchall(sql):
claims.append(claim['claim_id']) claims.append(claim['claim_id'])

3
lbry/wallet/wallet.py
View file

@ -261,8 +261,7 @@ class Wallet:
async def list_transactions(self, **constraints): async def list_transactions(self, **constraints):
return txs_to_dict(await self.db.get_transactions( return txs_to_dict(await self.db.get_transactions(
include_is_my_output=True, include_is_spent=True, include_is_my_output=True, **constraints
**constraints
), self.ledger) ), self.ledger)
async def create_transaction( async def create_transaction(