WIP: Fix ud tests

single/cypher.go

@@ -58,6 +58,15 @@ func (rk *cypher) Encrypt(rp message.ResponsePart) (
 	fp format.Fingerprint, encryptedPayload, mac []byte) {
 	fp = rk.GetFingerprint()
 	key := rk.getKey()
+
+	fmt.Printf("encrypt:"+
+		"\nfp: %v"+
+		"\nkey: %v\n"+
+		"contents: %v\n"+
+		"mac: %v\n", base64.StdEncoding.EncodeToString(fp.Bytes()),
+		base64.StdEncoding.EncodeToString(key),
+		base64.StdEncoding.EncodeToString(rp.Marshal()),
+		base64.StdEncoding.EncodeToString(mac))
 	// FIXME: Encryption is identical to what is used by e2e.Crypt, lets make
 	//  them the same code path.
 	encryptedPayload = cAuth.Crypt(key, fp[:24], rp.Marshal())
@@ -69,7 +78,7 @@ func (rk *cypher) Decrypt(contents, mac []byte) ([]byte, error) {
 	fp := rk.GetFingerprint()
 	key := rk.getKey()
 
-	fmt.Printf("rk vals:"+
+	fmt.Printf("decrypt:"+
 		"\nfp: %v"+
 		"\nkey: %v\n"+
 		"contents: %v\n"+

single/request.go

@@ -98,7 +98,7 @@ func GetMaxRequestSize(net CMix, e2eGrp *cyclic.Group) int {
 //
 // The network follower must be running and healthy to transmit.
 func TransmitRequest(recipient contact.Contact, tag string, payload []byte,
-	callback Response, param RequestParams, net cmix.Client, rng csprng.Source,
+	callback Response, param RequestParams, net CMix, rng csprng.Source,
 	e2eGrp *cyclic.Group) ([]id.Round, receptionID.EphemeralIdentity, error) {
 
 	if len(payload) > GetMaxRequestSize(net, e2eGrp) {

ud/lookup.go

@@ -30,7 +30,7 @@ type lookupCallback func(contact.Contact, error)
 func Lookup(services CMix,
 	rng csprng.Source, grp *cyclic.Group,
 	udContact contact.Contact, callback lookupCallback,
-	uid *id.ID, timeout time.Duration) (id.Round,
+	uid *id.ID, timeout time.Duration) ([]id.Round,
 	receptionID.EphemeralIdentity, error) {
 
 	jww.INFO.Printf("ud.Lookup(%s, %s)", uid, timeout)
@@ -74,7 +74,7 @@ func lookup(net CMix,
 	request := &LookupSend{UserID: uid.Marshal()}
 	requestMarshaled, err := proto.Marshal(request)
 	if err != nil {
-		return id.Round(0),
+		return []id.Round{},
 			receptionID.EphemeralIdentity{}, errors.WithMessage(err,
 				"Failed to form outgoing lookup request.")
 	}
@@ -105,7 +105,7 @@ type lookupResponse struct {
 
 func (m lookupResponse) Callback(payload []byte,
 	receptionID receptionID.EphemeralIdentity,
-	round rounds.Round, err error) {
+	rounds []rounds.Round, err error) {
 
 	if err != nil {
 		go m.cb(contact.Contact{}, errors.WithMessage(err, "Failed to lookup."))

ud/search.go

@@ -36,7 +36,7 @@ type searchCallback func([]contact.Contact, error)
 func Search(services CMix, events event.Reporter,
 	rng csprng.Source, grp *cyclic.Group,
 	udContact contact.Contact, callback searchCallback,
-	list fact.FactList, timeout time.Duration) (id.Round,
+	list fact.FactList, timeout time.Duration) ([]id.Round,
 	receptionID.EphemeralIdentity, error) {
 	jww.INFO.Printf("ud.Search(%s, %s)", list.Stringify(), timeout)
 
@@ -46,7 +46,7 @@ func Search(services CMix, events event.Reporter,
 	request := &SearchSend{Fact: factHashes}
 	requestMarshaled, err := proto.Marshal(request)
 	if err != nil {
-		return id.Round(0), receptionID.EphemeralIdentity{},
+		return []id.Round{}, receptionID.EphemeralIdentity{},
 			errors.WithMessage(err, "Failed to form outgoing search request.")
 	}
 
@@ -67,7 +67,7 @@ func Search(services CMix, events event.Reporter,
 	rndId, ephId, err := single.TransmitRequest(udContact, SearchTag, requestMarshaled,
 		response, p, services, rng, grp)
 	if err != nil {
-		return id.Round(0), receptionID.EphemeralIdentity{},
+		return []id.Round{}, receptionID.EphemeralIdentity{},
 			errors.WithMessage(err, "Failed to transmit search request.")
 	}
 
@@ -89,7 +89,7 @@ type searchResponse struct {
 
 func (m searchResponse) Callback(payload []byte,
 	receptionID receptionID.EphemeralIdentity,
-	round rounds.Round, err error) {
+	round []rounds.Round, err error) {
 	fmt.Println("in callback")
 	if err != nil {
 		go m.cb(nil, errors.WithMessage(err, "Failed to search."))

ud/search_test.go

@@ -3,6 +3,7 @@ package ud
 import (
 	"encoding/base64"
 	"fmt"
+	"gitlab.com/elixxir/client/single"
 	"gitlab.com/elixxir/crypto/contact"
 	dh "gitlab.com/elixxir/crypto/diffieHellman"
 	"gitlab.com/elixxir/crypto/e2e/singleUse"
@@ -70,6 +71,14 @@ func TestManager_Search(t *testing.T) {
 		})
 	}
 
+	udMockPrivKey := tnm.GetInstance().GetE2EGroup().NewInt(25)
+
+	receiver := newMockReceiver(callbackChan)
+
+	mockListener := single.Listen(SearchTag, tnm.c.ID, udMockPrivKey,
+		tnm, grp, receiver)
+	defer mockListener.Stop()
+
 	udContact, err := m.GetContact()
 	if err != nil {
 		t.Fatalf("Failed to get ud contact: %+v", err)