Skip to content
Snippets Groups Projects
Commit 1c471aeb authored by Richard T. Carback III's avatar Richard T. Carback III
Browse files

Update bindings to use passed in E2E params from xxdk

parent 7d58e534
No related branches found
No related tags found
2 merge requests!510Release,!253General Cleanup
...@@ -2,6 +2,7 @@ package bindings ...@@ -2,6 +2,7 @@ package bindings
import ( import (
"gitlab.com/elixxir/client/connect" "gitlab.com/elixxir/client/connect"
"gitlab.com/elixxir/client/xxdk"
"gitlab.com/elixxir/crypto/contact" "gitlab.com/elixxir/crypto/contact"
) )
...@@ -35,6 +36,7 @@ func (c *Cmix) ConnectWithAuthentication(e2eId int, recipientContact []byte) (*A ...@@ -35,6 +36,7 @@ func (c *Cmix) ConnectWithAuthentication(e2eId int, recipientContact []byte) (*A
return nil, err return nil, err
} }
connection, err := connect.ConnectWithAuthentication(cont, e2eClient.api, connect.GetDefaultParams()) connection, err := connect.ConnectWithAuthentication(cont, e2eClient.api,
xxdk.GetDefaultE2EParams())
return authenticatedConnectionTrackerSingleton.make(connection), nil return authenticatedConnectionTrackerSingleton.make(connection), nil
} }
...@@ -2,9 +2,11 @@ package bindings ...@@ -2,9 +2,11 @@ package bindings
import ( import (
"encoding/json" "encoding/json"
"gitlab.com/elixxir/client/catalog" "gitlab.com/elixxir/client/catalog"
"gitlab.com/elixxir/client/connect" "gitlab.com/elixxir/client/connect"
e2e2 "gitlab.com/elixxir/client/e2e" e2e2 "gitlab.com/elixxir/client/e2e"
"gitlab.com/elixxir/client/xxdk"
"gitlab.com/elixxir/crypto/contact" "gitlab.com/elixxir/crypto/contact"
) )
...@@ -44,7 +46,8 @@ func (c *Cmix) Connect(e2eId int, recipientContact []byte) ( ...@@ -44,7 +46,8 @@ func (c *Cmix) Connect(e2eId int, recipientContact []byte) (
return nil, err return nil, err
} }
connection, err := connect.Connect(cont, e2eClient.api, connect.GetDefaultParams()) connection, err := connect.Connect(cont, e2eClient.api,
xxdk.GetDefaultE2EParams())
if err != nil { if err != nil {
return nil, err return nil, err
} }
......
...@@ -53,8 +53,9 @@ func LoginE2e(cmixId int, callbacks AuthCallbacks, identity []byte) (*E2e, error ...@@ -53,8 +53,9 @@ func LoginE2e(cmixId int, callbacks AuthCallbacks, identity []byte) (*E2e, error
} }
authCallbacks := &authCallback{bindingsCbs: callbacks} authCallbacks := &authCallback{bindingsCbs: callbacks}
params := xxdk.GetDefaultE2EParams()
newE2e, err := xxdk.Login(cmix.api, authCallbacks, newIdentity) newE2e, err := xxdk.Login(cmix.api, authCallbacks, newIdentity, params)
if err != nil { if err != nil {
return nil, err return nil, err
} }
...@@ -76,8 +77,9 @@ func LoginE2eEphemeral(cmixId int, callbacks AuthCallbacks, identity []byte) (*E ...@@ -76,8 +77,9 @@ func LoginE2eEphemeral(cmixId int, callbacks AuthCallbacks, identity []byte) (*E
} }
authCallbacks := &authCallback{bindingsCbs: callbacks} authCallbacks := &authCallback{bindingsCbs: callbacks}
params := xxdk.GetDefaultE2EParams()
newE2e, err := xxdk.LoginEphemeral(cmix.api, authCallbacks, newIdentity) newE2e, err := xxdk.LoginEphemeral(cmix.api, authCallbacks, newIdentity, params)
if err != nil { if err != nil {
return nil, err return nil, err
} }
...@@ -96,8 +98,9 @@ func LoginE2eLegacy(cmixId int, callbacks AuthCallbacks) (*E2e, error) { ...@@ -96,8 +98,9 @@ func LoginE2eLegacy(cmixId int, callbacks AuthCallbacks) (*E2e, error) {
} }
authCallbacks := &authCallback{bindingsCbs: callbacks} authCallbacks := &authCallback{bindingsCbs: callbacks}
params := xxdk.GetDefaultE2EParams()
newE2e, err := xxdk.LoginLegacy(cmix.api, authCallbacks) newE2e, err := xxdk.LoginLegacy(cmix.api, params, authCallbacks)
if err != nil { if err != nil {
return nil, err return nil, err
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment