Skip to content
Snippets Groups Projects
Commit aed6cbdd authored by Jake Taylor's avatar Jake Taylor
Browse files

wfc

parent e5975400
No related branches found
No related tags found
4 merge requests!510Release,!207WIP: Client Restructure,!206Built the connection interface which wraps e2e and auth objects and manages a...,!203Symmetric broadcast
...@@ -114,11 +114,7 @@ func Connect(recipient contact.Contact, myId *id.ID, rng *fastRNG.StreamGenerato ...@@ -114,11 +114,7 @@ func Connect(recipient contact.Contact, myId *id.ID, rng *fastRNG.StreamGenerato
return nil, err return nil, err
} }
return &handler{ return ConnectWithPartner(newPartner, e2eHandler, p), nil
partner: newPartner,
params: p,
e2e: e2eHandler,
}, nil
} }
// WaitForConnections assembles a Connection object on the reception-side // WaitForConnections assembles a Connection object on the reception-side
...@@ -157,14 +153,10 @@ func WaitForConnections(myId *id.ID, rng *fastRNG.StreamGenerator, ...@@ -157,14 +153,10 @@ func WaitForConnections(myId *id.ID, rng *fastRNG.StreamGenerator,
} }
// Return the new Connection object // Return the new Connection object
return &handler{ return ConnectWithPartner(newPartner, e2eHandler, p), nil
partner: newPartner,
params: p,
e2e: e2eHandler,
}, nil
} }
// ConnectWithPartner assembles a Connection object on the reception-side // ConnectWithPartner assembles a Connection object
// after an E2E partnership has already been confirmed with the given partner.Manager // after an E2E partnership has already been confirmed with the given partner.Manager
func ConnectWithPartner(partner partner.Manager, e2eHandler clientE2e.Handler, p Params) Connection { func ConnectWithPartner(partner partner.Manager, e2eHandler clientE2e.Handler, p Params) Connection {
return &handler{ return &handler{
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment