From 0f786a8c43e974e6ca93028da0cc8399c3ad1cac Mon Sep 17 00:00:00 2001 From: Lex Berezhny Date: Sat, 14 Jul 2018 22:16:39 -0400 Subject: [PATCH] removed unused methods --- torba/basedatabase.py | 37 +++---------------------------------- 1 file changed, 3 insertions(+), 34 deletions(-) diff --git a/torba/basedatabase.py b/torba/basedatabase.py index b274e971f..82026afad 100644 --- a/torba/basedatabase.py +++ b/torba/basedatabase.py @@ -32,12 +32,6 @@ class SQLiteMixin(object): self.db.close() 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): # type: (str, dict) -> tuple[str, List] columns, values = [], [] @@ -61,20 +55,11 @@ class SQLiteMixin(object): ) 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 def query_one_value(self, query, params=None, default=None): result = yield self.db.runQuery(query, params) if result: - defer.returnValue(result[0][0]) + defer.returnValue(result[0][0] or default) else: defer.returnValue(default) @@ -94,17 +79,6 @@ class SQLiteMixin(object): else: 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): @@ -232,7 +206,6 @@ class BaseDatabase(SQLiteMixin): else: defer.returnValue((None, None, False)) - @defer.inlineCallbacks def get_balance_for_account(self, account, **constraints): extra_sql = "" if constraints: @@ -247,7 +220,7 @@ class BaseDatabase(SQLiteMixin): extra_sql = ' AND ' + ' AND '.join(extras) values = {'account': account.public_key.address} values.update(constraints) - result = yield self.db.runQuery( + return self.query_one_value( """ SELECT SUM(amount) FROM txo @@ -256,12 +229,8 @@ class BaseDatabase(SQLiteMixin): WHERE pubkey_address.account=:account AND 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 def get_utxos_for_account(self, account, **constraints):