tinterface: (trivial) make some methods private - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 38980a4f5cdccd3816bc0130c8471104fa805aab
DIR parent 69de3b94db5594ddff36db8c926d787b45baa92e
HTML Author: SomberNight <somber.night@protonmail.com>
Date: Fri, 24 Apr 2020 17:18:05 +0200
interface: (trivial) make some methods private
Diffstat:
M electrum/interface.py | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
---
DIR diff --git a/electrum/interface.py b/electrum/interface.py
t@@ -353,13 +353,13 @@ class Interface(Logger):
async def _try_saving_ssl_cert_for_first_time(self, ca_ssl_context):
ca_signed = await self.is_server_ca_signed(ca_ssl_context)
if ca_signed:
- if self.get_expected_fingerprint():
+ if self._get_expected_fingerprint():
raise InvalidOptionCombination("cannot use --serverfingerprint with CA signed servers")
with open(self.cert_path, 'w') as f:
# empty file means this is CA signed, not self-signed
f.write('')
else:
- await self.save_certificate()
+ await self._save_certificate()
def _is_saved_ssl_cert_available(self):
if not os.path.exists(self.cert_path):
t@@ -367,7 +367,7 @@ class Interface(Logger):
with open(self.cert_path, 'r') as f:
contents = f.read()
if contents == '': # CA signed
- if self.get_expected_fingerprint():
+ if self._get_expected_fingerprint():
raise InvalidOptionCombination("cannot use --serverfingerprint with CA signed servers")
return True
# pinned self-signed cert
t@@ -387,7 +387,7 @@ class Interface(Logger):
self.logger.info(f"certificate has expired: {e}")
os.unlink(self.cert_path) # delete pinned cert only in this case
return False
- self.verify_certificate_fingerprint(bytearray(b))
+ self._verify_certificate_fingerprint(bytearray(b))
return True
async def _get_ssl_context(self):
t@@ -469,14 +469,14 @@ class Interface(Logger):
self.ready.set_result(1)
- async def save_certificate(self):
+ async def _save_certificate(self) -> None:
if not os.path.exists(self.cert_path):
# we may need to retry this a few times, in case the handshake hasn't completed
for _ in range(10):
- dercert = await self.get_certificate()
+ dercert = await self._fetch_certificate()
if dercert:
self.logger.info("succeeded in getting cert")
- self.verify_certificate_fingerprint(dercert)
+ self._verify_certificate_fingerprint(dercert)
with open(self.cert_path, 'w') as f:
cert = ssl.DER_cert_to_PEM_cert(dercert)
# workaround android bug
t@@ -492,7 +492,7 @@ class Interface(Logger):
else:
raise GracefulDisconnect("could not get certificate after 10 tries")
- async def get_certificate(self):
+ async def _fetch_certificate(self) -> bytes:
sslc = ssl.SSLContext()
async with _RSClient(session_factory=RPCSession,
host=self.host, port=self.port,
t@@ -501,12 +501,12 @@ class Interface(Logger):
ssl_object = asyncio_transport.get_extra_info("ssl_object") # type: ssl.SSLObject
return ssl_object.getpeercert(binary_form=True)
- def get_expected_fingerprint(self):
+ def _get_expected_fingerprint(self) -> Optional[str]:
if self.is_main_server():
return self.network.config.get("serverfingerprint")
- def verify_certificate_fingerprint(self, certificate):
- expected_fingerprint = self.get_expected_fingerprint()
+ def _verify_certificate_fingerprint(self, certificate):
+ expected_fingerprint = self._get_expected_fingerprint()
if not expected_fingerprint:
return
fingerprint = hashlib.sha256(certificate).hexdigest()