chore: fix conflicts

Signed-off-by: Ivan Ivanov <ivanivanov.ii726@gmail.com>
hashgraph · Aug 1, 2024 · 28a33c8 · 28a33c8
1 parent cea8098
commit 28a33c8
Showing 1 changed file with 4 additions and 4 deletions.
diff --git 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) {