AaronFiore/electrum
1
0
Fork 0
Code Activity

network: rename _send_http_on_proxy and make it part of public API

Browse Source
This commit is contained in:
SomberNight
2022-06-28 18:51:21 +02:00
parent 81880e8538
commit 5b0aad5084
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
electrum/network.py
View File

@@ -1291,9 +1291,15 @@ class Network(Logger, NetworkRetryManager[ServerAddr]):
await asyncio.sleep(0.1) await asyncio.sleep(0.1)
@classmethod @classmethod
async def _send_http_on_proxy(cls, method: str, url: str, params: str = None, async def async_send_http_on_proxy(
body: bytes = None, json: dict = None, headers=None, cls, method: str, url: str, *,
on_finish=None, timeout=None): params: str = None,
body: bytes = None,
json: dict = None,
headers=None,
on_finish=None,
timeout=None,
):
async def default_on_finish(resp: ClientResponse): async def default_on_finish(resp: ClientResponse):
resp.raise_for_status() resp.raise_for_status()
return await resp.text() return await resp.text()
@@ -1326,7 +1332,7 @@ class Network(Logger, NetworkRetryManager[ServerAddr]):
loop = network.asyncio_loop loop = network.asyncio_loop
else: else:
loop = util.get_asyncio_loop() loop = util.get_asyncio_loop()
coro = asyncio.run_coroutine_threadsafe(cls._send_http_on_proxy(method, url, **kwargs), loop) coro = asyncio.run_coroutine_threadsafe(cls.async_send_http_on_proxy(method, url, **kwargs), loop)
# note: _send_http_on_proxy has its own timeout, so no timeout here: # note: _send_http_on_proxy has its own timeout, so no timeout here:
return coro.result() return coro.result()

8
electrum/submarine_swaps.py
View File

@@ -290,7 +290,7 @@ class SwapManager(Logger):
"invoice": invoice, "invoice": invoice,
"refundPublicKey": pubkey.hex() "refundPublicKey": pubkey.hex()
} }
response = await self.network._send_http_on_proxy( response = await self.network.async_send_http_on_proxy(
'post', 'post',
self.api_url + '/createswap', self.api_url + '/createswap',
json=request_data, json=request_data,
@@ -386,7 +386,7 @@ class SwapManager(Logger):
"preimageHash": preimage_hash.hex(), "preimageHash": preimage_hash.hex(),
"claimPublicKey": pubkey.hex() "claimPublicKey": pubkey.hex()
} }
response = await self.network._send_http_on_proxy( response = await self.network.async_send_http_on_proxy(
'post', 'post',
self.api_url + '/createswap', self.api_url + '/createswap',
json=request_data, json=request_data,
@@ -470,8 +470,8 @@ class SwapManager(Logger):
self._swaps_by_lockup_address[swap.lockup_address] = swap self._swaps_by_lockup_address[swap.lockup_address] = swap
async def get_pairs(self) -> None: async def get_pairs(self) -> None:
assert self.network from .network import Network
response = await self.network._send_http_on_proxy( response = await Network.async_send_http_on_proxy(
'get', 'get',
self.api_url + '/getpairs', self.api_url + '/getpairs',
timeout=30) timeout=30)