AaronFiore/electrum
1
0
Fork 0
Code Activity

Merge pull request #4753 from SomberNight/synchronizer_rewrite

Browse Source 
restructure synchronizer
This commit is contained in:
ThomasV
2018-10-10 20:46:17 +02:00
committed by GitHub
parent 150e27608b 02f108d927
commit cd5453e477
9 changed files with 249 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
electrum/util.py
View File

@@ -879,7 +879,12 @@ VerifiedTxInfo = NamedTuple("VerifiedTxInfo", [("height", int),
("txpos", int),
("header_hash", str)])
def make_aiohttp_session(proxy):
def make_aiohttp_session(proxy: dict, headers=None, timeout=None):
if headers is None:
headers = {'User-Agent': 'Electrum'}
if timeout is None:
timeout = aiohttp.ClientTimeout(total=10)
if proxy:
connector = SocksConnector(
socks_ver=SocksVer.SOCKS5 if proxy['mode'] == 'socks5' else SocksVer.SOCKS4,
@@ -889,9 +894,9 @@ def make_aiohttp_session(proxy):
password=proxy.get('password', None),
rdns=True
)
return aiohttp.ClientSession(headers={'User-Agent' : 'Electrum'}, timeout=aiohttp.ClientTimeout(total=10), connector=connector)
return aiohttp.ClientSession(headers=headers, timeout=timeout, connector=connector)
else:
return aiohttp.ClientSession(headers={'User-Agent' : 'Electrum'}, timeout=aiohttp.ClientTimeout(total=10))
return aiohttp.ClientSession(headers=headers, timeout=timeout)
class SilentTaskGroup(TaskGroup):