Compare commits

...

4 Commits

5 changed files with 5 additions and 18 deletions

View File

@@ -515,7 +515,7 @@ def get_latest_txs(chain_spec, count=10, since=None, until=None, status=None, n
if not_status != None:
q = q.filter(Otx.status.op('&')(not_status)==0)
q = q.order_by(Otx.nonce.asc(), Otx.date_created.asc()).limit(count)
q = q.order_by(Otx.date_created.desc(), Otx.nonce.desc()).limit(count)
results = q.all()
for r in results:
if txs.get(r.tx_hash) != None:

View File

@@ -1,6 +1,6 @@
[metadata]
name = chainqueue
version = 0.0.6a4
version = 0.0.6rc2
description = Generic blockchain transaction queue control
author = Louis Holbrook
author_email = dev@holbrook.no

View File

@@ -12,23 +12,11 @@ while True:
requirements.append(l.rstrip())
f.close()
test_requirements = []
f = open('test_requirements.txt', 'r')
while True:
l = f.readline()
if l == '':
break
test_requirements.append(l.rstrip())
f.close()
postgres_requirements = ['psycopg2==2.8.6'] + requirements
sqlite_requirements = [] + requirements
postgres_requirements = [
'psycopg2==2.8.6',
] + requirements
sqlite_requirements = [
] + requirements
setup(
install_requires=requirements,
tests_require=test_requirements,
extras_require={
'postgres': postgres_requirements,
'sqlite': sqlite_requirements,

0
tests/__init__.py Normal file
View File

View File

@@ -373,7 +373,6 @@ class TestTxQuery(TestTxBase):
nonce_hashes.append(tx_hash)
time_between = datetime.datetime.utcnow()
tx_hash = add_0x(os.urandom(32).hex())
signed_tx = add_0x(os.urandom(128).hex())
@@ -401,7 +400,7 @@ class TestTxQuery(TestTxBase):
txs = get_latest_txs(self.chain_spec, session=self.session)
self.assertEqual(len(txs.keys()), 3)
txs = get_latest_txs(self.chain_spec, count=1, session=self.session)
self.assertEqual(len(txs.keys()), 1)