Compare commits
5
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
91846939f6 | ||
|
|
c85127d76b | ||
|
|
166bf65e88 | ||
|
|
f68bdc406f | ||
|
|
8390482d6c |
No files matched your search
@@ -128,11 +128,13 @@ class WalletComponent(Component):
|
||||
if self.wallet_manager.ledger.network.remote_height:
|
||||
local_height = self.wallet_manager.ledger.local_height_including_downloaded_height
|
||||
disk_height = len(self.wallet_manager.ledger.headers)
|
||||
download_height = local_height - disk_height if disk_height != local_height else local_height
|
||||
remote_height = self.wallet_manager.ledger.network.remote_height
|
||||
target_height = remote_height - disk_height if disk_height != local_height else remote_height
|
||||
best_hash = self.wallet_manager.get_best_blockhash()
|
||||
if disk_height != local_height != remote_height:
|
||||
download_height, target_height = local_height - disk_height, remote_height - disk_height
|
||||
else:
|
||||
download_height, target_height = local_height, remote_height
|
||||
progress = min(max(math.ceil(float(download_height) / float(target_height) * 100), 0), 100)
|
||||
best_hash = self.wallet_manager.get_best_blockhash()
|
||||
result.update({
|
||||
'headers_synchronization_progress': progress,
|
||||
'blocks': max(local_height, 0),
|
||||
|
||||
@@ -718,8 +718,6 @@ class SQLDB:
|
||||
claim_hash = output.claim_hash
|
||||
update_claims.append(output)
|
||||
recalculate_claim_hashes.add(claim_hash)
|
||||
delete_claim_hashes.discard(claim_hash)
|
||||
update_claim_hashes.add(claim_hash)
|
||||
body_timer.stop()
|
||||
|
||||
skip_update_claim_timer = timer.add_timer('skip update of abandoned claims')
|
||||
@@ -727,8 +725,10 @@ class SQLDB:
|
||||
for updated_claim in list(update_claims):
|
||||
if updated_claim.ref.hash in delete_others:
|
||||
update_claims.remove(updated_claim)
|
||||
delete_claim_hashes.add(updated_claim.claim_hash)
|
||||
update_claim_hashes.discard(updated_claim.claim_hash)
|
||||
for updated_claim in update_claims:
|
||||
claim_hash = updated_claim.claim_hash
|
||||
delete_claim_hashes.discard(claim_hash)
|
||||
update_claim_hashes.add(claim_hash)
|
||||
skip_update_claim_timer.stop()
|
||||
|
||||
skip_insert_claim_timer = timer.add_timer('skip insertion of abandoned claims')
|
||||
|
||||
@@ -321,6 +321,14 @@ class TestClaimtrie(TestSQLDB):
|
||||
advance(10, [stream, self.get_stream_update(stream, 11*COIN)])
|
||||
self.assertTrue(reader._search())
|
||||
|
||||
def test_double_updates_in_same_block(self):
|
||||
advance, state = self.advance, self.state
|
||||
stream = self.get_stream('Claim A', 10*COIN)
|
||||
advance(10, [stream])
|
||||
update = self.get_stream_update(stream, 11*COIN)
|
||||
advance(20, [update, self.get_stream_update(update, 9*COIN)])
|
||||
self.assertTrue(reader._search())
|
||||
|
||||
def test_create_and_abandon_in_same_block(self):
|
||||
advance, state = self.advance, self.state
|
||||
stream = self.get_stream('Claim A', 10*COIN)
|
||||
|
||||
@@ -180,7 +180,7 @@ class TestQueryBuilder(unittest.TestCase):
|
||||
a__not='b', b__in='select * from blah where c=:$c',
|
||||
d__any={'one__like': 'o', 'two': 2},
|
||||
a0=3, a00=1, a00a=2, a00aa=4, # <-- breaks without correct interpolation key order
|
||||
ahash=memoryview(sha256(b'hello world')),
|
||||
ahash=sha256(b'hello world'),
|
||||
limit=10, order_by='b', **{'$c': 3})
|
||||
),
|
||||
"select * from foo WHERE a != 'b' AND "
|
||||
|
||||
@@ -199,8 +199,8 @@ def query(select, **constraints) -> Tuple[str, Dict[str, Any]]:
|
||||
def interpolate(sql, values):
|
||||
for k in sorted(values.keys(), reverse=True):
|
||||
value = values[k]
|
||||
if isinstance(value, memoryview):
|
||||
value = f"X'{hexlify(bytes(value)).decode()}'"
|
||||
if isinstance(value, bytes):
|
||||
value = f"X'{hexlify(value).decode()}'"
|
||||
elif isinstance(value, str):
|
||||
value = f"'{value}'"
|
||||
else:
|
||||
|
||||
Reference in new issue
Block a user