From 95ee63e3996ecc409af57e30b85a8c3f940deb5b Mon Sep 17 00:00:00 2001 From: Mark Veidemanis Date: Wed, 28 Oct 2020 18:38:27 +0000 Subject: [PATCH] Fix circular import in ChanKeep/provisioning modules --- modules/chankeep.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/chankeep.py b/modules/chankeep.py index dd2a19c..e4f3f00 100644 --- a/modules/chankeep.py +++ b/modules/chankeep.py @@ -3,7 +3,7 @@ from utils.logging.log import * from utils.logging.debug import * from copy import deepcopy from math import ceil -from modules.provision import provisionMultipleRelays +import modules.provision from twisted.internet.threads import deferToThread def allRelaysActive(net): @@ -98,12 +98,12 @@ def keepChannels(net, listinfo, mean, sigrelay, relay): return if coverAll: needed = relay-len(main.network[net].relays.keys()) - newNums = provisionMultipleRelays(net, needed) + newNums = modules.provision.provisionMultipleRelays(net, needed) flist = [i[0] for i in listinfo] populateChans(net, flist, relay, newNums) else: needed = sigrelay-len(main.network[net].relays.keys()) - newNums = provisionMultipleRelays(net, needed) + newNums = modules.provision.provisionMultipleRelays(net, needed) siglist = [i[0] for i in listinfo if int(i[1]) > mean] populateChans(net, siglist, sigrelay, newNums) notifyJoin(net)