removed unused methods

This commit is contained in:
Lex Berezhny 2018-07-14 22:16:39 -04:00
parent 184d3a5910
commit 0f786a8c43

View file

@ -32,12 +32,6 @@ class SQLiteMixin(object):
self.db.close() self.db.close()
return defer.succeed(True) return defer.succeed(True)
def _debug_sql(self, sql):
""" For use during debugging to execute arbitrary SQL queries without waiting on reactor. """
conn = self.db.connectionFactory(self.db)
trans = self.db.transactionFactory(self, conn)
return trans.execute(sql).fetchall()
def _insert_sql(self, table, data): def _insert_sql(self, table, data):
# type: (str, dict) -> tuple[str, List] # type: (str, dict) -> tuple[str, List]
columns, values = [], [] columns, values = [], []
@ -61,20 +55,11 @@ class SQLiteMixin(object):
) )
return sql, values return sql, values
@defer.inlineCallbacks
def query_one_value_list(self, query, params):
# type: (str, Union[dict,tuple]) -> defer.Deferred[List]
result = yield self.db.runQuery(query, params)
if result:
defer.returnValue([i[0] for i in result])
else:
defer.returnValue([])
@defer.inlineCallbacks @defer.inlineCallbacks
def query_one_value(self, query, params=None, default=None): def query_one_value(self, query, params=None, default=None):
result = yield self.db.runQuery(query, params) result = yield self.db.runQuery(query, params)
if result: if result:
defer.returnValue(result[0][0]) defer.returnValue(result[0][0] or default)
else: else:
defer.returnValue(default) defer.returnValue(default)
@ -94,17 +79,6 @@ class SQLiteMixin(object):
else: else:
defer.returnValue(default) defer.returnValue(default)
def query_count(self, sql, params):
return self.query_one_value(
"SELECT count(*) FROM ({})".format(sql), params
)
def insert_and_return_id(self, table, data):
def do_insert(t):
t.execute(*self._insert_sql(table, data))
return t.lastrowid
return self.db.runInteraction(do_insert)
class BaseDatabase(SQLiteMixin): class BaseDatabase(SQLiteMixin):
@ -232,7 +206,6 @@ class BaseDatabase(SQLiteMixin):
else: else:
defer.returnValue((None, None, False)) defer.returnValue((None, None, False))
@defer.inlineCallbacks
def get_balance_for_account(self, account, **constraints): def get_balance_for_account(self, account, **constraints):
extra_sql = "" extra_sql = ""
if constraints: if constraints:
@ -247,7 +220,7 @@ class BaseDatabase(SQLiteMixin):
extra_sql = ' AND ' + ' AND '.join(extras) extra_sql = ' AND ' + ' AND '.join(extras)
values = {'account': account.public_key.address} values = {'account': account.public_key.address}
values.update(constraints) values.update(constraints)
result = yield self.db.runQuery( return self.query_one_value(
""" """
SELECT SUM(amount) SELECT SUM(amount)
FROM txo FROM txo
@ -256,12 +229,8 @@ class BaseDatabase(SQLiteMixin):
WHERE WHERE
pubkey_address.account=:account AND pubkey_address.account=:account AND
txoid NOT IN (SELECT txoid FROM txi) txoid NOT IN (SELECT txoid FROM txi)
"""+extra_sql, values """+extra_sql, values, 0
) )
if result:
defer.returnValue(result[0][0] or 0)
else:
defer.returnValue(0)
@defer.inlineCallbacks @defer.inlineCallbacks
def get_utxos_for_account(self, account, **constraints): def get_utxos_for_account(self, account, **constraints):