Skip to content
Snippets Groups Projects
Commit ceadb4af authored by Josh Brooks's avatar Josh Brooks
Browse files

Fix compile issues from merge

parent 7ebd2ea8
No related branches found
No related tags found
3 merge requests!510Release,!207WIP: Client Restructure,!203Symmetric broadcast
...@@ -169,13 +169,13 @@ func (c *Client) MakePrecannedContact(precannedID uint) contact.Contact { ...@@ -169,13 +169,13 @@ func (c *Client) MakePrecannedContact(precannedID uint) contact.Contact {
// GetRelationshipFingerprint returns a unique 15 character fingerprint for an // GetRelationshipFingerprint returns a unique 15 character fingerprint for an
// E2E relationship. An error is returned if no relationship with the partner // E2E relationship. An error is returned if no relationship with the partner
// is found. // 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) m, err := c.e2e.GetPartner(p)
if err != nil { 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) partner.ConnectionFp{}, err)
} else if m == nil { } 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) p)
} }
......
...@@ -62,7 +62,7 @@ var singleCmd = &cobra.Command{ ...@@ -62,7 +62,7 @@ var singleCmd = &cobra.Command{
recvCh: make(chan struct { recvCh: make(chan struct {
request *single.Request request *single.Request
ephID receptionID.EphemeralIdentity ephID receptionID.EphemeralIdentity
round rounds.Round round []rounds.Round
}), }),
} }
...@@ -142,7 +142,7 @@ type Response struct { ...@@ -142,7 +142,7 @@ type Response struct {
} }
func (r *Response) Callback(payload []byte, receptionID receptionID.EphemeralIdentity, 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", jww.DEBUG.Printf("Payload: %v, receptionID: %v, round: %v, err: %v",
payload, receptionID, round, err) payload, receptionID, round, err)
r.callbackChan <- struct { r.callbackChan <- struct {
...@@ -243,16 +243,16 @@ type Receiver struct { ...@@ -243,16 +243,16 @@ type Receiver struct {
recvCh chan struct { recvCh chan struct {
request *single.Request request *single.Request
ephID receptionID.EphemeralIdentity ephID receptionID.EphemeralIdentity
round rounds.Round round []rounds.Round
} }
} }
func (r *Receiver) Callback(req *single.Request, ephID receptionID.EphemeralIdentity, func (r *Receiver) Callback(req *single.Request, ephID receptionID.EphemeralIdentity,
round rounds.Round) { round []rounds.Round) {
r.recvCh <- struct { r.recvCh <- struct {
request *single.Request request *single.Request
ephID receptionID.EphemeralIdentity ephID receptionID.EphemeralIdentity
round rounds.Round round []rounds.Round
}{ }{
request: req, request: req,
ephID: ephID, ephID: ephID,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment