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

Remove the leftover merge related stuff

Browse Source
This commit is contained in:
mhchia 2019-08-16 10:54:28 +08:00 committed by Kevin Mai-Husan Chia
parent e293b89925
commit 8cd23abfe2
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libp2p/crypto/keys.py
View File

@ -48,12 +48,8 @@ class PublicKey(Key):
def serialize_to_protobuf(self) -> protobuf.PublicKey:
key_type = self.get_type().value
data = self.to_bytes()
<<<<<<< HEAD
protobuf_key = protobuf.PublicKey(key_type=key_type, data=data)
return protobuf_key
=======
return protobuf.PublicKey(key_type=_type.value, data=data)
>>>>>>> Fix mypy
class PrivateKey(Key):
@ -72,12 +68,8 @@ class PrivateKey(Key):
def serialize_to_protobuf(self) -> protobuf.PrivateKey:
key_type = self.get_type().value
data = self.to_bytes()
<<<<<<< HEAD
protobuf_key = protobuf.PrivateKey(key_type=key_type, data=data)
return protobuf_key
=======
return protobuf.PrivateKey(key_type=_type.value, data=data)
>>>>>>> Fix mypy
@dataclass(frozen=True)