From 1c471aeb96e9c06b6a537011aac3426e7789de3e Mon Sep 17 00:00:00 2001
From: "Richard T. Carback III" <rick.carback@gmail.com>
Date: Tue, 28 Jun 2022 19:44:38 +0000
Subject: [PATCH] Update bindings to use passed in E2E params from xxdk
---
bindings/autheticatedConnection.go | 4 +++-
bindings/connect.go | 5 ++++-
bindings/e2e.go | 9 ++++++---
3 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/bindings/autheticatedConnection.go b/bindings/autheticatedConnection.go
index cc0ef41a8..272000824 100644
--- a/bindings/autheticatedConnection.go
+++ b/bindings/autheticatedConnection.go
@@ -2,6 +2,7 @@ package bindings
import (
"gitlab.com/elixxir/client/connect"
+ "gitlab.com/elixxir/client/xxdk"
"gitlab.com/elixxir/crypto/contact"
)
@@ -35,6 +36,7 @@ func (c *Cmix) ConnectWithAuthentication(e2eId int, recipientContact []byte) (*A
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
}
diff --git a/bindings/connect.go b/bindings/connect.go
index 81a482a32..754a5366c 100644
--- a/bindings/connect.go
+++ b/bindings/connect.go
@@ -2,9 +2,11 @@ package bindings
import (
"encoding/json"
+
"gitlab.com/elixxir/client/catalog"
"gitlab.com/elixxir/client/connect"
e2e2 "gitlab.com/elixxir/client/e2e"
+ "gitlab.com/elixxir/client/xxdk"
"gitlab.com/elixxir/crypto/contact"
)
@@ -44,7 +46,8 @@ func (c *Cmix) Connect(e2eId int, recipientContact []byte) (
return nil, err
}
- connection, err := connect.Connect(cont, e2eClient.api, connect.GetDefaultParams())
+ connection, err := connect.Connect(cont, e2eClient.api,
+ xxdk.GetDefaultE2EParams())
if err != nil {
return nil, err
}
diff --git a/bindings/e2e.go b/bindings/e2e.go
index 55ee801ad..a0d5bb252 100644
--- a/bindings/e2e.go
+++ b/bindings/e2e.go
@@ -53,8 +53,9 @@ func LoginE2e(cmixId int, callbacks AuthCallbacks, identity []byte) (*E2e, error
}
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 {
return nil, err
}
@@ -76,8 +77,9 @@ func LoginE2eEphemeral(cmixId int, callbacks AuthCallbacks, identity []byte) (*E
}
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 {
return nil, err
}
@@ -96,8 +98,9 @@ func LoginE2eLegacy(cmixId int, callbacks AuthCallbacks) (*E2e, error) {
}
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 {
return nil, err
}
--
GitLab