Change sql to use less code
This commit is contained in:
parent
5cc0d365c2
commit
f5789775a2
1 changed files with 12 additions and 16 deletions
|
@ -86,22 +86,18 @@ class WalletDatabase(BaseDatabase):
|
||||||
@defer.inlineCallbacks
|
@defer.inlineCallbacks
|
||||||
def get_claim(self, account, claim_id=None, txid=None, nout=None):
|
def get_claim(self, account, claim_id=None, txid=None, nout=None):
|
||||||
if claim_id is not None:
|
if claim_id is not None:
|
||||||
utxos = yield self.db.runQuery(
|
filter_sql = "claim_id=?"
|
||||||
"""
|
filter_value = (claim_id,)
|
||||||
SELECT amount, script, txo.txid, position
|
|
||||||
FROM txo JOIN tx ON tx.txid=txo.txid
|
|
||||||
WHERE claim_id=? AND (is_claim OR is_update) AND txoid NOT IN (SELECT txoid FROM txi)
|
|
||||||
ORDER BY tx.height DESC LIMIT 1;
|
|
||||||
""", (claim_id,)
|
|
||||||
)
|
|
||||||
else:
|
else:
|
||||||
|
filter_sql = "txo.txid=? AND position=?"
|
||||||
|
filter_value = (txid, nout)
|
||||||
utxos = yield self.db.runQuery(
|
utxos = yield self.db.runQuery(
|
||||||
"""
|
"""
|
||||||
SELECT amount, script, txo.txid, position
|
SELECT amount, script, txo.txid, position
|
||||||
FROM txo JOIN tx ON tx.txid=txo.txid
|
FROM txo JOIN tx ON tx.txid=txo.txid
|
||||||
WHERE txo.txid=? AND position=? AND (is_claim OR is_update) AND txoid NOT IN (SELECT txoid FROM txi)
|
WHERE {} AND (is_claim OR is_update) AND txoid NOT IN (SELECT txoid FROM txi)
|
||||||
ORDER BY tx.height DESC LIMIT 1;
|
ORDER BY tx.height DESC LIMIT 1;
|
||||||
""", (txid, nout)
|
""".format(filter_sql), filter_value
|
||||||
)
|
)
|
||||||
output_class = account.ledger.transaction_class.output_class
|
output_class = account.ledger.transaction_class.output_class
|
||||||
defer.returnValue([
|
defer.returnValue([
|
||||||
|
|
Loading…
Reference in a new issue