dxs/onionr
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fixed some broken things from communicator decoupling

Browse source
This commit is contained in:
Kevin Froman 2020-08-08 12:38:14 -05:00
parent bff2595ac9
commit 96af4e8db0
9 changed files with 14 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/communicatorutils/announcenode.py
View file

@ -49,7 +49,7 @@ def announce_node(daemon):
break
else:
try:
peer = onlinepeers.pick_online_peer(daemon)
peer = onlinepeers.pick_online_peer(kv)
except onionrexceptions.OnlinePeerNeeded:
peer = ""

2
src/communicatorutils/downloadblocks/__init__.py
View file

@ -78,7 +78,7 @@ def download_blocks_from_communicator(comm_inst: "OnionrCommunicatorDaemon"):
kv.get('currentDownloading').append(blockHash)
if len(blockPeers) == 0:
try:
peerUsed = onlinepeers.pick_online_peer(comm_inst)
peerUsed = onlinepeers.pick_online_peer(kv)
except onionrexceptions.OnlinePeerNeeded:
continue
else:

6
src/communicatorutils/lookupadders.py
View file

@ -41,8 +41,8 @@ def lookup_new_peer_transports_with_communicator(shared_state):
# Don't get new peers if we have too many queued up
break
try:
peer = onlinepeers.pick_online_peer()
newAdders = peeraction.peer_action(comm_inst, peer, action='pex')
peer = onlinepeers.pick_online_peer(kv)
newAdders = peeraction.peer_action(shared_state, peer, action='pex')
except onionrexceptions.OnlinePeerNeeded:
continue
try:
@ -64,5 +64,3 @@ def lookup_new_peer_transports_with_communicator(shared_state):
except ValueError:
pass
kv.get('newPeers').extend(newPeers)
comm_inst.decrementThreadCount(
'lookup_new_peer_transports_with_communicator')

2
src/communicatorutils/lookupblocks.py
View file

@ -65,7 +65,7 @@ def lookup_blocks_from_communicator(comm_inst):
break
try:
# select random online peer
peer = onlinepeers.pick_online_peer(comm_inst)
peer = onlinepeers.pick_online_peer(kv)
except onionrexceptions.OnlinePeerNeeded:
time.sleep(1)
continue

2
src/communicatorutils/uploadblocks/__init__.py
View file

@ -67,7 +67,7 @@ def upload_blocks_from_communicator(comm_inst: 'OnionrCommunicatorDaemon'):
session = session_manager.add_session(bl)
for _ in range(min(len(kv.get('onlinePeers')), 6)):
try:
peer = onlinepeers.pick_online_peer(comm_inst)
peer = onlinepeers.pick_online_peer(kv)
except onionrexceptions.OnlinePeerNeeded:
continue
try: