Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
X
xxdk-wasm
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
elixxir
xxdk-wasm
Commits
70b4a370
Commit
70b4a370
authored
2 years ago
by
benjamin
Browse files
Options
Downloads
Patches
Plain Diff
fix for client release merge
parent
794ddfce
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!60
Revert "Fail a test to be sure it works"
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
go.mod
+17
-0
17 additions, 0 deletions
go.mod
go.sum
+311
-0
311 additions, 0 deletions
go.sum
wasm/group.go
+2
-2
2 additions, 2 deletions
wasm/group.go
wasm/ud.go
+4
-13
4 additions, 13 deletions
wasm/ud.go
with
334 additions
and
15 deletions
go.mod
+
17
−
0
View file @
70b4a370
...
...
@@ -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.
Click to expand it.
go.sum
+
311
−
0
View file @
70b4a370
This diff is collapsed.
Click to expand it.
wasm/group.go
+
2
−
2
View file @
70b4a370
...
...
@@ -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.
...
...
This diff is collapsed.
Click to expand it.
wasm/ud.go
+
4
−
13
View file @
70b4a370
...
...
@@ -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
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment