From 28a33c80ac15508fe6542f8d36d5bf4da028a2d7 Mon Sep 17 00:00:00 2001
From: Ivan Ivanov <ivanivanov.ii726@gmail.com>
Date: Thu, 1 Aug 2024 12:07:39 +0300
Subject: [PATCH] chore: fix conflicts

Signed-off-by: Ivan Ivanov <ivanivanov.ii726@gmail.com>
---
 crypto.go | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/crypto.go b/crypto.go
index ee28976e..463b73d7 100644
--- a/crypto.go
+++ b/crypto.go
@@ -42,15 +42,15 @@ type Key interface {
 	String() string
 }
 
-func KeyFromBytes(bytes []byte) (KeyList, error) {
-	protoKey := &services.KeyList{}
+func KeyFromBytes(bytes []byte) (Key, error) {
+	protoKey := &services.Key{}
 
 	err := protobuf.Unmarshal(bytes, protoKey)
 	if err != nil {
-		return KeyList{}, err
+		return nil, err
 	}
 
-	return _KeyListFromProtobuf(protoKey)
+	return _KeyFromProtobuf(protoKey)
 }
 
 func KeyToBytes(key Key) ([]byte, error) {