Fix TestChannelIDTracking

ud/channelIDTracking_test.go

@@ -64,27 +64,32 @@ func TestChannelIDTracking(t *testing.T) {
 	comms := new(mockComms)
 	username := "Alice"
 
+	/*
 		udPubKeyBytes := m.user.GetCmix().GetInstance().
 			GetPartialNdf().Get().UDB.DhPubKey
+	*/
+
+	udPubKey, udPrivKey, err := ed25519.GenerateKey(stream)
+	require.NoError(t, err)
 
 	myTestClientIDTracker := newclientIDTracker(
 		comms, host, username,
 		kv, m.user.GetReceptionIdentity(),
-		ed25519.PublicKey(udPubKeyBytes), rngGen)
+		udPubKey, rngGen)
 
 	rsaPrivKey, err := myTestClientIDTracker.receptionIdentity.GetRSAPrivateKey()
 	require.NoError(t, err)
 
 	comms.SetUserRSAPubKey(rsaPrivKey.GetPublic())
+	comms.SetUDEd25519PrivateKey(&udPrivKey)
 	comms.SetUserEd25519PubKey(myTestClientIDTracker.registrationDisk.GetPublicKey())
+	comms.SetUsername(username)
 
 	//sig, _ := myTestClientIDTracker.registrationDisk.GetLeaseSignature()
 	// XXX bad signature
 	sig := make([]byte, 64)
 	stream.Read(sig)
 
-	comms.SetLeaseSignature(sig)
-
 	err = myTestClientIDTracker.register()
 	require.NoError(t, err)
 }

ud/mockComms_test.go

@@ -2,7 +2,6 @@ package ud
 
 import (
 	"crypto/ed25519"
-	"fmt"
 	"time"
 
 	"gitlab.com/xx_network/comms/connect"
@@ -18,7 +17,8 @@ type mockComms struct {
 	udHost            *connect.Host
 	userRsaPub        *rsa.PublicKey
 	userEd25519PubKey []byte
-	udLeaseEd25519Signature []byte
+	udPrivKey         *ed25519.PrivateKey
+	username          string
 }
 
 func (m mockComms) SendRegisterUser(host *connect.Host, message *pb.UDBUserRegistration) (*messages.Ack, error) {
@@ -55,6 +55,10 @@ func (m mockComms) GetHost(hostId *id.ID) (*connect.Host, bool) {
 	return m.udHost, true
 }
 
+func (m *mockComms) SetUDEd25519PrivateKey(key *ed25519.PrivateKey) {
+	m.udPrivKey = key
+}
+
 func (m *mockComms) SetUserRSAPubKey(userRsaPub *rsa.PublicKey) {
 	m.userRsaPub = userRsaPub
 }
@@ -63,30 +67,34 @@ func (m *mockComms) SetUserEd25519PubKey(key ed25519.PublicKey) {
 	m.userEd25519PubKey = []byte(key)
 }
 
-func (m *mockComms) SetLeaseSignature(signature []byte) {
-	m.udLeaseEd25519Signature = signature
+func (m *mockComms) SetUsername(u string) {
+	m.username = u
 }
 
 func (m mockComms) SendChannelLeaseRequest(host *connect.Host, message *pb.ChannelLeaseRequest) (*pb.ChannelLeaseResponse, error) {
 
-	fmt.Printf("message sig: %x\n", message.UserPubKeyRSASignature)
-	fmt.Printf("rsa pub key: %v\n", m.userRsaPub)
 	err := channel.VerifyChannelIdentityRequest(message.UserPubKeyRSASignature,
 		message.UserEd25519PubKey,
 		time.Now(),
 		time.Unix(0, message.Timestamp),
 		m.userRsaPub)
-
 	if err != nil {
 		panic(err)
 	}
 
 	d, _ := time.ParseDuration("4h30m")
+	lease := time.Now().Add(d).UnixNano()
+	signature := channel.SignChannelLease(m.userEd25519PubKey, m.username,
+		time.Unix(0, lease), *m.udPrivKey)
+
+	if err != nil {
+		panic(err)
+	}
 
 	response := &pb.ChannelLeaseResponse{
-		Lease:                   time.Now().Add(d).UnixNano(),
+		Lease:                   lease,
 		UserEd25519PubKey:       m.userEd25519PubKey,
-		UDLeaseEd25519Signature: m.udLeaseEd25519Signature,
+		UDLeaseEd25519Signature: signature,
 	}
 
 	return response, nil