StarMirror/py-libp2p
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Mypy fixes

Browse Source
This commit is contained in:
Alex Stokes 2019-08-24 20:36:33 +02:00
parent 44e5de636f
commit 7c004a4e14
No known key found for this signature in database
GPG Key ID: 51CE1721B245C086
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libp2p/crypto/key_exchange.py
View File

@ -1,5 +1,6 @@
from typing import Callable, Tuple, cast
from Crypto.Math.Numbers import Integer
import Crypto.PublicKey.ECC as ECC
from libp2p.crypto.ecc import ECCPrivateKey, create_new_key_pair
@ -23,6 +24,6 @@ def create_ephemeral_key_pair(curve_type: str) -> Tuple[PublicKey, SharedKeyGene
private_key = cast(ECCPrivateKey, key_pair.private_key)
secret_point = curve_point * private_key.impl.d
byte_size = secret_point.size_in_bytes()
return secret_point.x.to_bytes(byte_size)
return cast(Integer, secret_point.x).to_bytes(byte_size)
return key_pair.public_key, _key_exchange

18
libp2p/security/secio/transport.py
View File

@ -1,6 +1,5 @@
from dataclasses import dataclass
import hashlib
from typing import Optional, Tuple
from typing import Optional, Tuple, cast
import multihash
@ -17,6 +16,7 @@ from libp2p.crypto.keys import PrivateKey, PublicKey
from libp2p.crypto.serialization import deserialize_public_key
from libp2p.io.msgio import encode as encode_message
from libp2p.io.msgio import read_next_message
from libp2p.network.connection.raw_connection import RawConnection
from libp2p.network.connection.raw_connection_interface import IRawConnection
from libp2p.peer.id import ID as PeerID
from libp2p.security.base_session import BaseSession
@ -67,13 +67,13 @@ class SecureSession(BaseSession):
def _initialize_authenticated_encryption_for_remote_peer(self) -> None:
self.remote_encrypter = Encrypter(self.remote_encryption_parameters)
async def read(self) -> bytes:
async def read(self, n: int = -1) -> bytes:
return await self._read_msg()
async def _read_msg(self) -> bytes:
# TODO do we need to serialize reads?
# TODO do not expose reader
msg = await read_next_message(self.conn.reader)
msg = await read_next_message(cast(RawConnection, self.conn).reader)
return self.remote_encrypter.decrypt_if_valid(msg)
async def write(self, data: bytes) -> None:
@ -85,8 +85,8 @@ class SecureSession(BaseSession):
tag = self.local_encrypter.authenticate(encrypted_data)
msg = encode_message(encrypted_data + tag)
# TODO clean up how we write messages
await self.conn.writer.write(msg)
await self.conn.writer.drain()
await cast(RawConnection, self.conn).writer.write(msg)
await cast(RawConnection, self.conn).writer.drain()
@dataclass(frozen=True)
@ -162,10 +162,10 @@ class SessionParameters:
async def _response_to_msg(conn: IRawConnection, msg: bytes) -> bytes:
# TODO clean up ``IRawConnection`` so that we don't have to break
# the abstraction
await conn.writer.write(encode_message(msg))
await conn.writer.drain()
await cast(RawConnection, conn).writer.write(encode_message(msg))
await cast(RawConnection, conn).writer.drain()
return await read_next_message(conn.reader)
return await read_next_message(cast(RawConnection, conn).reader)
def _mk_multihash_sha256(data: bytes) -> bytes: