tchannel_db: fix timestamp_range, reduce verbosity - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 93e8d4f953056a7affc198c5af7bdae55eb884ba
DIR parent aa398993cfcbd27e4431e05fc90c0585a81d83e8
HTML Author: ThomasV <thomasv@electrum.org>
Date: Mon, 18 Mar 2019 12:24:37 +0100
channel_db: fix timestamp_range, reduce verbosity
Diffstat:
M electrum/lnpeer.py | 3 +--
M electrum/lnrouter.py | 15 ++++++++++-----
2 files changed, 11 insertions(+), 7 deletions(-)
---
DIR diff --git a/electrum/lnpeer.py b/electrum/lnpeer.py
t@@ -218,12 +218,11 @@ class Peer(PrintError):
self.print_error('requesting whole channel graph')
else:
self.print_error('requesting channel graph since', datetime.fromtimestamp(timestamp).ctime())
- timestamp_range = int(time.time()) - timestamp
self.send_message(
'gossip_timestamp_filter',
chain_hash=constants.net.rev_genesis_bytes(),
first_timestamp=timestamp,
- timestamp_range=timestamp_range)
+ timestamp_range=b'\xff'*4)
while True:
await asyncio.sleep(5)
if self.node_anns:
DIR diff --git a/electrum/lnrouter.py b/electrum/lnrouter.py
t@@ -305,7 +305,7 @@ class ChannelDB(SqlDB):
self.DBSession.commit()
@sql
- @profiler
+ #@profiler
def on_channel_announcement(self, msg_payloads, trusted=False):
if type(msg_payloads) is dict:
msg_payloads = [msg_payloads]
t@@ -335,12 +335,15 @@ class ChannelDB(SqlDB):
@sql
def get_last_timestamp(self):
+ return self._get_last_timestamp()
+
+ def _get_last_timestamp(self):
from sqlalchemy.sql import func
r = self.DBSession.query(func.max(Policy.timestamp).label('max_timestamp')).one()
return r.max_timestamp or 0
@sql
- @profiler
+ #@profiler
def on_channel_update(self, msg_payloads, trusted=False):
if type(msg_payloads) is dict:
msg_payloads = [msg_payloads]
t@@ -372,16 +375,18 @@ class ChannelDB(SqlDB):
if p and p.timestamp >= new_policy.timestamp:
continue
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
self.DBSession.commit()
# add and commit new policies
for new_policy in new_policies.values():
self.DBSession.add(new_policy)
self.DBSession.commit()
+ if new_policies:
+ self.print_error('last timestamp:', datetime.fromtimestamp(self._get_last_timestamp()).ctime())
@sql
- @profiler
+ #@profiler
def on_node_announcement(self, msg_payloads):
if type(msg_payloads) is dict:
msg_payloads = [msg_payloads]
t@@ -414,7 +419,7 @@ class ChannelDB(SqlDB):
new_nodes[node_id] = node_info
for addr in node_addresses:
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():
self.DBSession.add(node_info)
for new_addr in new_addresses.values():