From 456fbe1f24148f369d42b2d846d593bebe26fd7a Mon Sep 17 00:00:00 2001
From: mcrakhman <rakhmanov.m@gmail.com>
Date: Mon, 27 Mar 2023 21:22:32 +0200
Subject: [PATCH] Move peer util package into crypto

---
 net/secureservice/handshake/handshake_test.go | 7 +++----
 testutil/accounttest/accountservice.go        | 3 +--
 util/crypto/ed25519.go                        | 3 +--
 util/{peer => crypto}/peer.go                 | 5 ++---
 4 files changed, 7 insertions(+), 11 deletions(-)
 rename util/{peer => crypto}/peer.go (69%)

diff --git a/net/secureservice/handshake/handshake_test.go b/net/secureservice/handshake/handshake_test.go
index b19acae8..b766952f 100644
--- a/net/secureservice/handshake/handshake_test.go
+++ b/net/secureservice/handshake/handshake_test.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"github.com/anytypeio/any-sync/net/secureservice/handshake/handshakeproto"
 	crypto2 "github.com/anytypeio/any-sync/util/crypto"
-	peer2 "github.com/anytypeio/any-sync/util/peer"
 	"github.com/libp2p/go-libp2p/core/crypto"
 	"github.com/libp2p/go-libp2p/core/network"
 	"github.com/libp2p/go-libp2p/core/peer"
@@ -568,9 +567,9 @@ func newConnPair(t require.TestingT) (sc1, sc2 *secConn) {
 	sk2b, err := sk2.Raw()
 	signKey2, err := crypto.UnmarshalEd25519PrivateKey(sk2b)
 	require.NoError(t, err)
-	peerId1, err := peer2.IdFromSigningPubKey(sk1.GetPublic())
+	peerId1, err := crypto2.IdFromSigningPubKey(sk1.GetPublic())
 	require.NoError(t, err)
-	peerId2, err := peer2.IdFromSigningPubKey(sk2.GetPublic())
+	peerId2, err := crypto2.IdFromSigningPubKey(sk2.GetPublic())
 	require.NoError(t, err)
 	sc1 = &secConn{
 		Conn:       c1,
@@ -594,7 +593,7 @@ type secConn struct {
 func (s *secConn) LocalPeer() peer.ID {
 	skB, _ := s.localKey.Raw()
 	sk, _ := crypto2.NewSigningEd25519PubKeyFromBytes(skB)
-	lp, _ := peer2.IdFromSigningPubKey(sk)
+	lp, _ := crypto2.IdFromSigningPubKey(sk)
 	return lp
 }
 
diff --git a/testutil/accounttest/accountservice.go b/testutil/accounttest/accountservice.go
index 57986340..7aec1c14 100644
--- a/testutil/accounttest/accountservice.go
+++ b/testutil/accounttest/accountservice.go
@@ -6,7 +6,6 @@ import (
 	"github.com/anytypeio/any-sync/commonspace/object/accountdata"
 	"github.com/anytypeio/any-sync/nodeconf"
 	"github.com/anytypeio/any-sync/util/crypto"
-	"github.com/anytypeio/any-sync/util/peer"
 )
 
 // AccountTestService provides service for test purposes, generates new random account every Init
@@ -28,7 +27,7 @@ func (s *AccountTestService) Init(a *app.App) (err error) {
 		return err
 	}
 
-	peerId, err := peer.IdFromSigningPubKey(peerKey.GetPublic())
+	peerId, err := crypto.IdFromSigningPubKey(peerKey.GetPublic())
 	if err != nil {
 		return err
 	}
diff --git a/util/crypto/ed25519.go b/util/crypto/ed25519.go
index 02cc9ed2..17e24e5a 100644
--- a/util/crypto/ed25519.go
+++ b/util/crypto/ed25519.go
@@ -8,7 +8,6 @@ import (
 	"errors"
 	"fmt"
 	"github.com/anytypeio/any-sync/util/crypto/cryptoproto"
-	"github.com/anytypeio/any-sync/util/peer"
 	"github.com/anytypeio/any-sync/util/strkey"
 	"github.com/gogo/protobuf/proto"
 	"github.com/libp2p/go-libp2p/core/crypto"
@@ -161,7 +160,7 @@ func (k *Ed25519PubKey) Account() string {
 
 // PeerId returns string representation of key for peer id
 func (k *Ed25519PubKey) PeerId() string {
-	peerId, _ := peer.IdFromSigningPubKey(k)
+	peerId, _ := IdFromSigningPubKey(k)
 	return peerId.String()
 }
 
diff --git a/util/peer/peer.go b/util/crypto/peer.go
similarity index 69%
rename from util/peer/peer.go
rename to util/crypto/peer.go
index ee6a32cd..a7a7ac3d 100644
--- a/util/peer/peer.go
+++ b/util/crypto/peer.go
@@ -1,12 +1,11 @@
-package peer
+package crypto
 
 import (
-	utilcrypto "github.com/anytypeio/any-sync/util/crypto"
 	"github.com/libp2p/go-libp2p/core/crypto"
 	"github.com/libp2p/go-libp2p/core/peer"
 )
 
-func IdFromSigningPubKey(pubKey utilcrypto.PubKey) (peer.ID, error) {
+func IdFromSigningPubKey(pubKey PubKey) (peer.ID, error) {
 	rawSigning, err := pubKey.Raw()
 	if err != nil {
 		return "", err