From d57be0a0ca6e33ebdf2c8abdb8e3ce9d459c4246 Mon Sep 17 00:00:00 2001
From: ThomasV <thomasv@electrum.org>
Date: Sun, 14 Oct 2018 15:42:05 +0200
Subject: [PATCH] start channel verifier in network.start()

---
 electrum/daemon.py   | 6 +++++-
 electrum/lnrouter.py | 2 --
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/electrum/daemon.py b/electrum/daemon.py
index be88486f8..ce1e45504 100644
--- a/electrum/daemon.py
+++ b/electrum/daemon.py
@@ -166,7 +166,11 @@ class Daemon(DaemonThread):
         self.watchtower = WatchTower(self.config, self.network.lnwatcher) if self.config.get('watchtower_host') else None
         # client-side
         if self.network:
-            self.network.start([self.fx.run, self.network.lnwatcher.watchtower_task])
+            self.network.start([
+                self.fx.run,
+                self.network.lnwatcher.watchtower_task,
+                self.network.channel_db.ca_verifier.main
+            ])
         self.start()
 
     def init_server(self, config: SimpleConfig, fd):
diff --git a/electrum/lnrouter.py b/electrum/lnrouter.py
index 450997e56..c7f3d60fb 100644
--- a/electrum/lnrouter.py
+++ b/electrum/lnrouter.py
@@ -281,8 +281,6 @@ class ChannelDB(JsonDB):
         self._last_good_address = {}  # node_id -> LNPeerAddr
 
         self.ca_verifier = LNChannelVerifier(network, self)
-        # FIXME if the channel verifier raises, it kills network.main_taskgroup
-        asyncio.run_coroutine_threadsafe(self.network.add_job(self.ca_verifier.main), network.asyncio_loop)
 
         self.load_data()