LBRYFoundation/LBRY-Vault
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/LBRY-Vault.git synced 2025-09-01 09:45:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

channel_db: fix timestamp_range, reduce verbosity

Browse source
This commit is contained in:
ThomasV 2019-03-18 12:24:37 +01:00
parent aa398993cf
commit 93e8d4f953
2 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
electrum/lnpeer.py
View file

@ -218,12 +218,11 @@ class Peer(PrintError):
self.print_error('requesting whole channel graph') self.print_error('requesting whole channel graph')
else: else:
self.print_error('requesting channel graph since', datetime.fromtimestamp(timestamp).ctime()) self.print_error('requesting channel graph since', datetime.fromtimestamp(timestamp).ctime())
timestamp_range = int(time.time()) - timestamp
self.send_message( self.send_message(
'gossip_timestamp_filter', 'gossip_timestamp_filter',
chain_hash=constants.net.rev_genesis_bytes(), chain_hash=constants.net.rev_genesis_bytes(),
first_timestamp=timestamp, first_timestamp=timestamp,
timestamp_range=timestamp_range) timestamp_range=b'\xff'*4)
while True: while True:
await asyncio.sleep(5) await asyncio.sleep(5)
if self.node_anns: if self.node_anns:

15
electrum/lnrouter.py
View file

@ -305,7 +305,7 @@ class ChannelDB(SqlDB):
self.DBSession.commit() self.DBSession.commit()
@sql @sql
@profiler #@profiler
def on_channel_announcement(self, msg_payloads, trusted=False): def on_channel_announcement(self, msg_payloads, trusted=False):
if type(msg_payloads) is dict: if type(msg_payloads) is dict:
msg_payloads = [msg_payloads] msg_payloads = [msg_payloads]
@ -335,12 +335,15 @@ class ChannelDB(SqlDB):
@sql @sql
def get_last_timestamp(self): def get_last_timestamp(self):
return self._get_last_timestamp()
def _get_last_timestamp(self):
from sqlalchemy.sql import func from sqlalchemy.sql import func
r = self.DBSession.query(func.max(Policy.timestamp).label('max_timestamp')).one() r = self.DBSession.query(func.max(Policy.timestamp).label('max_timestamp')).one()
return r.max_timestamp or 0 return r.max_timestamp or 0
@sql @sql
@profiler #@profiler
def on_channel_update(self, msg_payloads, trusted=False): def on_channel_update(self, msg_payloads, trusted=False):
if type(msg_payloads) is dict: if type(msg_payloads) is dict:
msg_payloads = [msg_payloads] msg_payloads = [msg_payloads]
@ -372,16 +375,18 @@ class ChannelDB(SqlDB):
if p and p.timestamp >= new_policy.timestamp: if p and p.timestamp >= new_policy.timestamp:
continue continue
new_policies[(short_channel_id, node_id)] = new_policy new_policies[(short_channel_id, node_id)] = new_policy
self.print_error('on_channel_update: %d/%d'%(len(new_policies), len(msg_payloads))) #self.print_error('on_channel_update: %d/%d'%(len(new_policies), len(msg_payloads)))
# commit pending removals # commit pending removals
self.DBSession.commit() self.DBSession.commit()
# add and commit new policies # add and commit new policies
for new_policy in new_policies.values(): for new_policy in new_policies.values():
self.DBSession.add(new_policy) self.DBSession.add(new_policy)
self.DBSession.commit() self.DBSession.commit()
if new_policies:
self.print_error('last timestamp:', datetime.fromtimestamp(self._get_last_timestamp()).ctime())
@sql @sql
@profiler #@profiler
def on_node_announcement(self, msg_payloads): def on_node_announcement(self, msg_payloads):
if type(msg_payloads) is dict: if type(msg_payloads) is dict:
msg_payloads = [msg_payloads] msg_payloads = [msg_payloads]
@ -414,7 +419,7 @@ class ChannelDB(SqlDB):
new_nodes[node_id] = node_info new_nodes[node_id] = node_info
for addr in node_addresses: for addr in node_addresses:
new_addresses[(addr.node_id,addr.host,addr.port)] = addr new_addresses[(addr.node_id,addr.host,addr.port)] = addr
self.print_error("on_node_announcement: %d/%d"%(len(new_nodes), len(msg_payloads))) #self.print_error("on_node_announcement: %d/%d"%(len(new_nodes), len(msg_payloads)))
for node_info in new_nodes.values(): for node_info in new_nodes.values():
self.DBSession.add(node_info) self.DBSession.add(node_info)
for new_addr in new_addresses.values(): for new_addr in new_addresses.values():