From 8cd23abfe22a11fadc11e152ae068eb3f3b8c6ac Mon Sep 17 00:00:00 2001 From: mhchia Date: Fri, 16 Aug 2019 10:54:28 +0800 Subject: [PATCH] Remove the leftover merge related stuff --- libp2p/crypto/keys.py | 8 -------- 1 file changed, 8 deletions(-) diff --git a/libp2p/crypto/keys.py b/libp2p/crypto/keys.py index c43ddb7..b0dec3d 100644 --- a/libp2p/crypto/keys.py +++ b/libp2p/crypto/keys.py @@ -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)