Skip to content
Snippets Groups Projects
Commit 70b4a370 authored by benjamin's avatar benjamin
Browse files

fix for client release merge

parent 794ddfce
No related branches found
No related tags found
1 merge request!60Revert "Fail a test to be sure it works"
......@@ -23,20 +23,34 @@ require (
github.com/cloudflare/circl v1.2.0 // indirect
github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f // indirect
github.com/elliotchance/orderedmap v1.4.0 // indirect
github.com/fsnotify/fsnotify v1.5.4 // indirect
github.com/golang-collections/collections v0.0.0-20130729185459-604e922904d3 // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/gorilla/websocket v1.5.0 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/improbable-eng/grpc-web v0.15.0 // indirect
github.com/inconshreveable/mousetrap v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/klauspost/compress v1.11.7 // indirect
github.com/klauspost/cpuid/v2 v2.1.0 // indirect
github.com/magiconair/properties v1.8.6 // indirect
github.com/mattn/go-isatty v0.0.14 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 // indirect
github.com/pelletier/go-toml v1.9.5 // indirect
github.com/pelletier/go-toml/v2 v2.0.2 // indirect
github.com/pkg/profile v1.6.0 // indirect
github.com/rs/cors v1.8.2 // indirect
github.com/sethvargo/go-diceware v0.3.0 // indirect
github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e // indirect
github.com/soheilhy/cmux v0.1.5 // indirect
github.com/spf13/afero v1.9.2 // indirect
github.com/spf13/cast v1.5.0 // indirect
github.com/spf13/cobra v1.5.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/spf13/viper v1.12.0 // indirect
github.com/subosito/gotenv v1.4.0 // indirect
github.com/ttacon/builder v0.0.0-20170518171403-c099f663e1c2 // indirect
github.com/ttacon/libphonenumber v1.2.1 // indirect
github.com/tyler-smith/go-bip39 v1.1.0 // indirect
......@@ -54,5 +68,8 @@ require (
google.golang.org/genproto v0.0.0-20220822174746-9e6da59bd2fc // indirect
google.golang.org/grpc v1.49.0 // indirect
google.golang.org/protobuf v1.28.1 // indirect
gopkg.in/ini.v1 v1.66.6 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
nhooyr.io/websocket v1.8.7 // indirect
)
This diff is collapsed.
......@@ -390,10 +390,10 @@ type groupChatProcessor struct {
// - roundId - Returns the ID of the round sent on (int).
// - err - Returns an error on failure (Error).
func (gcp *groupChatProcessor) Process(decryptedMessage, msg,
receptionId []byte, ephemeralId, roundId int64, err error) {
receptionId []byte, ephemeralId, roundId int64, roundURL string, err error) {
gcp.process(utils.CopyBytesToJS(decryptedMessage),
utils.CopyBytesToJS(msg), utils.CopyBytesToJS(receptionId), ephemeralId,
roundId, utils.JsTrace(err))
roundId, roundURL, utils.JsTrace(err))
}
// String returns a name identifying this processor. Used for debugging.
......
......@@ -132,19 +132,13 @@ func NewOrLoadUd(_ js.Value, args []js.Value) interface{} {
// - args[1] - Javascript object that has functions that implement the
// [bindings.UdNetworkStatus] interface. This is the network follower
// function wrapped in [bindings.UdNetworkStatus].
// - args[2] - JSON of [fact.Fact] username that is registered with UD
// (Uint8Array).
// - args[3] - JSON of [fact.Fact] email address that is registered with UD
// (Uint8Array).
// - args[4] - JSON of [fact.Fact] phone number that is registered with UD
// (Uint8Array).
// - args[5] - The TLS certificate for the UD server this call will connect
// - args[2] - The TLS certificate for the UD server this call will connect
// with. You may use the UD server run by the xx network team by using
// [E2e.GetUdCertFromNdf] (Uint8Array).
// - args[6] - Marshalled bytes of the [contact.Contact] of the server this
// - args[3] - Marshalled bytes of the [contact.Contact] of the server this
// call will connect with. You may use the UD server run by the xx network
// team by using [E2e.GetUdContactFromNdf] (Uint8Array).
// - args[7] - The IP address of the UD server this call will connect with. You
// - args[4] - The IP address of the UD server this call will connect with. You
// may use the UD server run by the xx network team by using
// [E2e.GetUdAddressFromNdf] (string).
//
......@@ -155,15 +149,12 @@ func NewOrLoadUd(_ js.Value, args []js.Value) interface{} {
func NewUdManagerFromBackup(_ js.Value, args []js.Value) interface{} {
e2eID := args[0].Int()
follower := &udNetworkStatus{utils.WrapCB(args[1], "UdNetworkStatus")}
usernameFactJson := utils.CopyBytesToGo(args[2])
emailFactJson := utils.CopyBytesToGo(args[3])
phoneFactJson := utils.CopyBytesToGo(args[4])
cert := utils.CopyBytesToGo(args[5])
contactFile := utils.CopyBytesToGo(args[6])
address := args[7].String()
api, err := bindings.NewUdManagerFromBackup(
e2eID, follower, usernameFactJson, emailFactJson, phoneFactJson, cert,
e2eID, follower, cert,
contactFile, address)
if err != nil {
utils.Throw(utils.TypeError, 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