update

pkg/client/client.go

@@ -7,7 +7,6 @@ import (
 	"github.com/number571/go-peer/pkg/crypto/hashing"
 	"github.com/number571/go-peer/pkg/crypto/random"
 	"github.com/number571/go-peer/pkg/crypto/symmetric"
-	"github.com/number571/go-peer/pkg/encoding"
 	"github.com/number571/go-peer/pkg/message/layer2"
 	"github.com/number571/go-peer/pkg/payload/joiner"
 )
@@ -148,7 +147,7 @@ func (p *sClient) DecryptMessage(pMapPubKeys asymmetric.IMapPubKeys, pMsg []byte
 	)
 
 	// Get public key from map by pkid (hash)
-	sPubKey := pMapPubKeys.GetPubKey(encoding.HexEncode(pkid))
+	sPubKey := pMapPubKeys.GetPubKey(pkid)
 	if sPubKey == nil {
 		return nil, nil, ErrDecodePublicKey
 	}

pkg/crypto/asymmetric/map_pubkeys.go

@@ -2,6 +2,8 @@ package asymmetric
 
 import (
 	"sync"
+
+	"github.com/number571/go-peer/pkg/encoding"
 )
 
 var (
@@ -25,11 +27,11 @@ func NewMapPubKeys(pPubKeys ...IPubKey) IMapPubKeys {
 }
 
 // Check the existence of a friend in the list by the public key.
-func (p *sMapPubKeys) GetPubKey(pHash string) IPubKey {
+func (p *sMapPubKeys) GetPubKey(pHash []byte) IPubKey {
 	p.fMutex.RLock()
 	defer p.fMutex.RUnlock()
 
-	pubKey, ok := p.fMapping[pHash]
+	pubKey, ok := p.fMapping[encoding.HexEncode(pHash)]
 	if !ok {
 		return nil
 	}

pkg/crypto/asymmetric/map_pubkeys_test.go

@@ -14,7 +14,7 @@ func TestMapPubKeys(t *testing.T) {
 	}
 
 	mapping := NewMapPubKeys(pubKeys...)
-	pkHash := pubKeys[1].GetHasher().ToString()
+	pkHash := pubKeys[1].GetHasher().ToBytes()
 	if pk := mapping.GetPubKey(pkHash); pk == nil {
 		t.Error("get invalid pub key")
 		return

pkg/crypto/asymmetric/types.go

@@ -6,7 +6,7 @@ import (
 )
 
 type IMapPubKeys interface {
-	GetPubKey(string) IPubKey
+	GetPubKey([]byte) IPubKey
 	DelPubKey(IPubKey)
 	SetPubKey(IPubKey)
 }