pylint fix
This commit is contained in:
parent
8ed0791b26
commit
53e0fe9a69
1 changed files with 13 additions and 13 deletions
|
@ -270,7 +270,7 @@ class BaseDatabase(SQLiteMixin):
|
||||||
@defer.inlineCallbacks
|
@defer.inlineCallbacks
|
||||||
def get_transactions(self, account, offset=0, limit=100):
|
def get_transactions(self, account, offset=0, limit=100):
|
||||||
offset, limit = min(offset, 0), max(limit, 100)
|
offset, limit = min(offset, 0), max(limit, 100)
|
||||||
tx_records = yield self.run_query(
|
tx_rows = yield self.run_query(
|
||||||
"""
|
"""
|
||||||
SELECT txid, raw, height FROM tx WHERE txid IN (
|
SELECT txid, raw, height FROM tx WHERE txid IN (
|
||||||
SELECT txo.txid FROM txo
|
SELECT txo.txid FROM txo
|
||||||
|
@ -285,20 +285,20 @@ class BaseDatabase(SQLiteMixin):
|
||||||
""", {'account': account.public_key.address, 'offset': offset, 'limit': limit}
|
""", {'account': account.public_key.address, 'offset': offset, 'limit': limit}
|
||||||
)
|
)
|
||||||
txids, txs = [], []
|
txids, txs = [], []
|
||||||
for r in tx_records:
|
for row in tx_rows:
|
||||||
txids.append(r[0])
|
txids.append(row[0])
|
||||||
txs.append(account.ledger.transaction_class(raw=r[1], height=r[2]))
|
txs.append(account.ledger.transaction_class(raw=row[1], height=row[2]))
|
||||||
|
|
||||||
txo_records = yield self.run_query(
|
txo_rows = yield self.run_query(
|
||||||
"""
|
"""
|
||||||
SELECT txoid, pubkey_address.chain
|
SELECT txoid, pubkey_address.chain
|
||||||
FROM txo JOIN pubkey_address USING (address)
|
FROM txo JOIN pubkey_address USING (address)
|
||||||
WHERE txid IN ({})
|
WHERE txid IN ({})
|
||||||
""".format(', '.join(['?']*len(txids))), txids
|
""".format(', '.join(['?']*len(txids))), txids
|
||||||
)
|
)
|
||||||
txos = dict(txo_records)
|
txos = dict(txo_rows)
|
||||||
|
|
||||||
txi_records = yield self.run_query(
|
txi_rows = yield self.run_query(
|
||||||
"""
|
"""
|
||||||
SELECT txoid, txo.amount, txo.script, txo.txid, txo.position
|
SELECT txoid, txo.amount, txo.script, txo.txid, txo.position
|
||||||
FROM txi JOIN txo USING (txoid)
|
FROM txi JOIN txo USING (txoid)
|
||||||
|
@ -307,12 +307,12 @@ class BaseDatabase(SQLiteMixin):
|
||||||
)
|
)
|
||||||
txis = {}
|
txis = {}
|
||||||
output_class = account.ledger.transaction_class.output_class
|
output_class = account.ledger.transaction_class.output_class
|
||||||
for r in txi_records:
|
for row in txi_rows:
|
||||||
txis[r[0]] = output_class(
|
txis[row[0]] = output_class(
|
||||||
r[1],
|
row[1],
|
||||||
output_class.script_class(r[2]),
|
output_class.script_class(row[2]),
|
||||||
TXRefImmutable.from_id(r[3]),
|
TXRefImmutable.from_id(row[3]),
|
||||||
position=r[4]
|
position=row[4]
|
||||||
)
|
)
|
||||||
|
|
||||||
for tx in txs:
|
for tx in txs:
|
||||||
|
|
Loading…
Reference in a new issue