diff --git a/api/auth.go b/api/auth.go index b9004139e9d49f596f25870f683b1fc3e4774a7b..50ac3131b93a6da5feba080fbbdc24846fe78a72 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 ce698a01a32b79138ff80e1edefe9b4d15d7cb06..c2cd177f2c01987aa03d308f2fa96dce32946e06 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,