From ceadb4afb228f0cd68c0f89a653e0189ea68d8b4 Mon Sep 17 00:00:00 2001
From: josh <josh@elixxir.io>
Date: Thu, 21 Apr 2022 11:52:56 -0700
Subject: [PATCH] Fix compile issues from merge
---
api/auth.go | 6 +++---
cmd/single.go | 10 +++++-----
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/api/auth.go b/api/auth.go
index b9004139e..50ac3131b 100644
--- a/api/auth.go
+++ b/api/auth.go
@@ -169,13 +169,13 @@ func (c *Client) MakePrecannedContact(precannedID uint) contact.Contact {
// GetRelationshipFingerprint returns a unique 15 character fingerprint for an
// E2E relationship. An error is returned if no relationship with the partner
// is found.
-func (c *Client) GetRelationshipFingerprint(p *id.ID) (partner.ConnectionFp, error) {
+func (c *Client) GetRelationshipFingerprint(p *id.ID) (string, error) {
m, err := c.e2e.GetPartner(p)
if err != nil {
- return partner.ConnectionFp{}, errors.Errorf("could not get partner %s: %+v",
+ return "", errors.Errorf("could not get partner %s: %+v",
partner.ConnectionFp{}, err)
} else if m == nil {
- return partner.ConnectionFp{}, errors.Errorf("manager for partner %s is nil.",
+ return "", errors.Errorf("manager for partner %s is nil.",
p)
}
diff --git a/cmd/single.go b/cmd/single.go
index ce698a01a..c2cd177f2 100644
--- a/cmd/single.go
+++ b/cmd/single.go
@@ -62,7 +62,7 @@ var singleCmd = &cobra.Command{
recvCh: make(chan struct {
request *single.Request
ephID receptionID.EphemeralIdentity
- round rounds.Round
+ round []rounds.Round
}),
}
@@ -142,7 +142,7 @@ type Response struct {
}
func (r *Response) Callback(payload []byte, receptionID receptionID.EphemeralIdentity,
- round rounds.Round, err error) {
+ round []rounds.Round, err error) {
jww.DEBUG.Printf("Payload: %v, receptionID: %v, round: %v, err: %v",
payload, receptionID, round, err)
r.callbackChan <- struct {
@@ -243,16 +243,16 @@ type Receiver struct {
recvCh chan struct {
request *single.Request
ephID receptionID.EphemeralIdentity
- round rounds.Round
+ round []rounds.Round
}
}
func (r *Receiver) Callback(req *single.Request, ephID receptionID.EphemeralIdentity,
- round rounds.Round) {
+ round []rounds.Round) {
r.recvCh <- struct {
request *single.Request
ephID receptionID.EphemeralIdentity
- round rounds.Round
+ round []rounds.Round
}{
request: req,
ephID: ephID,
--
GitLab