AaronFiore/electrum
1
0
Fork 0
Code Activity

rename CustomTaskGroup to SilentTaskGroup

Browse Source
This commit is contained in:
SomberNight
2018-09-12 19:24:58 +02:00
parent 2039c07a2d
commit 47a97279af
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
electrum/address_synchronizer.py
View File

@@ -28,7 +28,7 @@ from collections import defaultdict
from . import bitcoin from . import bitcoin
from .bitcoin import COINBASE_MATURITY, TYPE_ADDRESS, TYPE_PUBKEY from .bitcoin import COINBASE_MATURITY, TYPE_ADDRESS, TYPE_PUBKEY
from .util import PrintError, profiler, bfh, VerifiedTxInfo, TxMinedStatus, aiosafe, CustomTaskGroup from .util import PrintError, profiler, bfh, VerifiedTxInfo, TxMinedStatus, aiosafe, SilentTaskGroup
from .transaction import Transaction, TxOutput from .transaction import Transaction, TxOutput
from .synchronizer import Synchronizer from .synchronizer import Synchronizer
from .verifier import SPV from .verifier import SPV
@@ -157,7 +157,7 @@ class AddressSynchronizer(PrintError):
self.verifier = SPV(self.network, self) self.verifier = SPV(self.network, self)
self.synchronizer = synchronizer = Synchronizer(self) self.synchronizer = synchronizer = Synchronizer(self)
assert self.group is None, 'group already exists' assert self.group is None, 'group already exists'
self.group = CustomTaskGroup() self.group = SilentTaskGroup()
async def job(): async def job():
async with self.group as group: async with self.group as group:

4
electrum/interface.py
View File

@@ -34,7 +34,7 @@ from collections import defaultdict
import aiorpcx import aiorpcx
from aiorpcx import ClientSession, Notification from aiorpcx import ClientSession, Notification
from .util import PrintError, aiosafe, bfh, AIOSafeSilentException, CustomTaskGroup from .util import PrintError, aiosafe, bfh, AIOSafeSilentException, SilentTaskGroup
from . import util from . import util
from . import x509 from . import x509
from . import pem from . import pem
@@ -139,7 +139,7 @@ class Interface(PrintError):
# TODO combine? # TODO combine?
self.fut = asyncio.get_event_loop().create_task(self.run()) self.fut = asyncio.get_event_loop().create_task(self.run())
self.group = CustomTaskGroup() self.group = SilentTaskGroup()
if proxy: if proxy:
username, pw = proxy.get('user'), proxy.get('password') username, pw = proxy.get('user'), proxy.get('password')

7
electrum/util.py
View File

@@ -868,10 +868,11 @@ def make_aiohttp_session(proxy):
return aiohttp.ClientSession(headers={'User-Agent' : 'Electrum'}, timeout=aiohttp.ClientTimeout(total=10)) return aiohttp.ClientSession(headers={'User-Agent' : 'Electrum'}, timeout=aiohttp.ClientTimeout(total=10))
class CustomTaskGroup(TaskGroup): class SilentTaskGroup(TaskGroup):
def spawn(self, *args, **kwargs): def spawn(self, *args, report_crash=None, **kwargs):
# don't complain if group is already closed. # don't complain if group is already closed.
if self._closed: if self._closed:
raise asyncio.CancelledError() raise asyncio.CancelledError()
return super().spawn(*args, **kwargs) # ignore value of report_crash, and force it to False
return super().spawn(*args, **kwargs, report_crash=False)