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

Merge branch 'XX-4618/GoModMaintanence' into 'master' 

Xx 4618/go mod maintanence

See merge request !12
parents 89b98513 33eff80f
No related branches found
No related tags found
1 merge request!12Xx 4618/go mod maintanence
Expand all Show whitespace changes
Inline Side-by-side
Showing
with 1774 additions and 1281 deletions
connectAuthClient/go.mod
+ 32
− 18
View file @ 6b70c940
module connectAuthClientExample module connectAuthClientExample
go 1.17 go 1.19
require ( require (
github.com/pkg/errors v0.9.1 github.com/pkg/errors v0.9.1
github.com/spf13/jwalterweatherman v1.1.0 github.com/spf13/jwalterweatherman v1.1.0
gitlab.com/elixxir/client v1.5.1-0.20220725172207-3ef87e8c794c gitlab.com/elixxir/client/v4 v4.6.1
gitlab.com/elixxir/crypto v0.0.7-0.20220606201132-c370d5039cea gitlab.com/elixxir/crypto v0.0.7-0.20230214180106-72841fd1e426
) )
require ( require (
filippo.io/edwards25519 v1.0.0 // indirect
git.xx.network/elixxir/grpc-web-go-client v0.0.0-20230214175953-5b5a8c33d28a // indirect
github.com/badoux/checkmail v1.2.1 // indirect github.com/badoux/checkmail v1.2.1 // indirect
github.com/cloudflare/circl v1.1.0 // indirect github.com/cenkalti/backoff/v4 v4.1.3 // indirect
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/elliotchance/orderedmap v1.4.0 // indirect
github.com/golang-collections/collections v0.0.0-20130729185459-604e922904d3 // indirect github.com/golang-collections/collections v0.0.0-20130729185459-604e922904d3 // indirect
github.com/golang/protobuf v1.5.2 // indirect github.com/golang/protobuf v1.5.2 // indirect
github.com/gorilla/websocket v1.5.0 // indirect
github.com/improbable-eng/grpc-web v0.15.0 // indirect
github.com/klauspost/compress v1.15.9 // indirect
github.com/klauspost/cpuid/v2 v2.1.0 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 // indirect github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 // indirect
github.com/rs/cors v1.8.2 // indirect
github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e // indirect github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e // indirect
github.com/soheilhy/cmux v0.1.5 // indirect
github.com/ttacon/builder v0.0.0-20170518171403-c099f663e1c2 // indirect github.com/ttacon/builder v0.0.0-20170518171403-c099f663e1c2 // indirect
github.com/ttacon/libphonenumber v1.2.1 // indirect github.com/ttacon/libphonenumber v1.2.1 // indirect
github.com/tyler-smith/go-bip39 v1.1.0 // indirect github.com/tyler-smith/go-bip39 v1.1.0 // indirect
github.com/zeebo/blake3 v0.2.3 // indirect
gitlab.com/elixxir/bloomfilter v0.0.0-20211222005329-7d931ceead6f // indirect gitlab.com/elixxir/bloomfilter v0.0.0-20211222005329-7d931ceead6f // indirect
gitlab.com/elixxir/comms v0.0.4-0.20220603231314-e47e4af13326 // indirect gitlab.com/elixxir/comms v0.0.4-0.20230310205528-f06faa0d2f0b // indirect
gitlab.com/elixxir/ekv v0.1.7 // indirect gitlab.com/elixxir/ekv v0.2.1 // indirect
gitlab.com/elixxir/primitives v0.0.3-0.20220606195757-40f7a589347f // indirect gitlab.com/elixxir/primitives v0.0.3-0.20230214180039-9a25e2d3969c // indirect
gitlab.com/xx_network/comms v0.0.4-0.20220630163702-f3d372ef6acd // indirect gitlab.com/xx_network/comms v0.0.4-0.20230214180029-5387fb85736d // indirect
gitlab.com/xx_network/crypto v0.0.5-0.20220606200528-3f886fe49e81 // indirect gitlab.com/xx_network/crypto v0.0.5-0.20230214003943-8a09396e95dd // indirect
gitlab.com/xx_network/primitives v0.0.4-0.20220712193914-aebd8544396e // indirect gitlab.com/xx_network/primitives v0.0.4-0.20230310205521-c440e68e34c4 // indirect
gitlab.com/xx_network/ring v0.0.3-0.20220222211904-da613960ad93 // indirect gitlab.com/xx_network/ring v0.0.3-0.20220902183151-a7d3b15bc981 // indirect
golang.org/x/crypto v0.0.0-20220128200615-198e4374d7ed // indirect go.uber.org/atomic v1.10.0 // indirect
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2 // indirect golang.org/x/crypto v0.5.0 // indirect
golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac // indirect golang.org/x/net v0.5.0 // indirect
golang.org/x/text v0.3.6 // indirect golang.org/x/sys v0.4.0 // indirect
google.golang.org/genproto v0.0.0-20210105202744-fe13368bc0e1 // indirect golang.org/x/text v0.6.0 // indirect
google.golang.org/grpc v1.42.0 // indirect google.golang.org/genproto v0.0.0-20220822174746-9e6da59bd2fc // indirect
google.golang.org/protobuf v1.27.1 // indirect google.golang.org/grpc v1.49.0 // indirect
google.golang.org/protobuf v1.28.1 // indirect
nhooyr.io/websocket v1.8.7 // indirect
src.agwa.name/tlshacks v0.0.0-20220518131152-d2c6f4e2b780 // indirect
) )
connectAuthClient/go.sum
+ 317
− 229
View file @ 6b70c940
This diff is collapsed.
connectAuthClient/listener.go
+ 1
− 1
View file @ 6b70c940
...@@ -3,7 +3,7 @@ package main ...@@ -3,7 +3,7 @@ package main
import ( import (
jww "github.com/spf13/jwalterweatherman" jww "github.com/spf13/jwalterweatherman"
"gitlab.com/elixxir/client/e2e/receive" "gitlab.com/elixxir/client/v4/e2e/receive"
) )
// listener implements the receive.Listener interface // listener implements the receive.Listener interface
......
connectAuthClient/main.go
+ 5
− 5
View file @ 6b70c940
...@@ -3,9 +3,9 @@ package main ...@@ -3,9 +3,9 @@ package main
import ( import (
"github.com/pkg/errors" "github.com/pkg/errors"
jww "github.com/spf13/jwalterweatherman" jww "github.com/spf13/jwalterweatherman"
"gitlab.com/elixxir/client/catalog" "gitlab.com/elixxir/client/v4/catalog"
"gitlab.com/elixxir/client/connect" "gitlab.com/elixxir/client/v4/connect"
"gitlab.com/elixxir/client/xxdk" "gitlab.com/elixxir/client/v4/xxdk"
"gitlab.com/elixxir/crypto/contact" "gitlab.com/elixxir/crypto/contact"
"io/fs" "io/fs"
"io/ioutil" "io/ioutil"
...@@ -180,13 +180,13 @@ func main() { ...@@ -180,13 +180,13 @@ func main() {
// Test message // Test message
msgBody := "If this message is sent successfully, we'll have established " + msgBody := "If this message is sent successfully, we'll have established " +
"contact with the server." "contact with the server."
roundIDs, messageID, timeSent, err := handler.SendE2E( e2eReport, err := handler.SendE2E(
catalog.XxMessage, []byte(msgBody), params.Base) catalog.XxMessage, []byte(msgBody), params.Base)
if err != nil { if err != nil {
jww.FATAL.Panicf("Failed to send message: %+v", err) jww.FATAL.Panicf("Failed to send message: %+v", err)
} }
jww.INFO.Printf("Message %v sent in RoundIDs: %+v at %v", jww.INFO.Printf("Message %v sent in RoundIDs: %+v at %v",
messageID, roundIDs, timeSent) e2eReport.MessageId, e2eReport.RoundList, e2eReport.SentTime)
// Keep app running to receive messages------------------------------------ // Keep app running to receive messages------------------------------------
......
connectAuthServer/go.mod
+ 32
− 18
View file @ 6b70c940
module connectAuthServerExample module connectAuthServerExample
go 1.17 go 1.19
require ( require (
github.com/pkg/errors v0.9.1 github.com/pkg/errors v0.9.1
github.com/spf13/jwalterweatherman v1.1.0 github.com/spf13/jwalterweatherman v1.1.0
gitlab.com/elixxir/client v1.5.1-0.20220725172207-3ef87e8c794c gitlab.com/elixxir/client/v4 v4.6.1
gitlab.com/elixxir/crypto v0.0.7-0.20220606201132-c370d5039cea gitlab.com/elixxir/crypto v0.0.7-0.20230214180106-72841fd1e426
gitlab.com/xx_network/primitives v0.0.4-0.20220712193914-aebd8544396e gitlab.com/xx_network/primitives v0.0.4-0.20230310205521-c440e68e34c4
) )
require ( require (
filippo.io/edwards25519 v1.0.0 // indirect
git.xx.network/elixxir/grpc-web-go-client v0.0.0-20230214175953-5b5a8c33d28a // indirect
github.com/badoux/checkmail v1.2.1 // indirect github.com/badoux/checkmail v1.2.1 // indirect
github.com/cloudflare/circl v1.1.0 // indirect github.com/cenkalti/backoff/v4 v4.1.3 // indirect
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/elliotchance/orderedmap v1.4.0 // indirect
github.com/golang-collections/collections v0.0.0-20130729185459-604e922904d3 // indirect github.com/golang-collections/collections v0.0.0-20130729185459-604e922904d3 // indirect
github.com/golang/protobuf v1.5.2 // indirect github.com/golang/protobuf v1.5.2 // indirect
github.com/gorilla/websocket v1.5.0 // indirect
github.com/improbable-eng/grpc-web v0.15.0 // indirect
github.com/klauspost/compress v1.15.9 // indirect
github.com/klauspost/cpuid/v2 v2.1.0 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 // indirect github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 // indirect
github.com/rs/cors v1.8.2 // indirect
github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e // indirect github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e // indirect
github.com/soheilhy/cmux v0.1.5 // indirect
github.com/ttacon/builder v0.0.0-20170518171403-c099f663e1c2 // indirect github.com/ttacon/builder v0.0.0-20170518171403-c099f663e1c2 // indirect
github.com/ttacon/libphonenumber v1.2.1 // indirect github.com/ttacon/libphonenumber v1.2.1 // indirect
github.com/tyler-smith/go-bip39 v1.1.0 // indirect github.com/tyler-smith/go-bip39 v1.1.0 // indirect
github.com/zeebo/blake3 v0.2.3 // indirect
gitlab.com/elixxir/bloomfilter v0.0.0-20211222005329-7d931ceead6f // indirect gitlab.com/elixxir/bloomfilter v0.0.0-20211222005329-7d931ceead6f // indirect
gitlab.com/elixxir/comms v0.0.4-0.20220603231314-e47e4af13326 // indirect gitlab.com/elixxir/comms v0.0.4-0.20230310205528-f06faa0d2f0b // indirect
gitlab.com/elixxir/ekv v0.1.7 // indirect gitlab.com/elixxir/ekv v0.2.1 // indirect
gitlab.com/elixxir/primitives v0.0.3-0.20220606195757-40f7a589347f // indirect gitlab.com/elixxir/primitives v0.0.3-0.20230214180039-9a25e2d3969c // indirect
gitlab.com/xx_network/comms v0.0.4-0.20220630163702-f3d372ef6acd // indirect gitlab.com/xx_network/comms v0.0.4-0.20230214180029-5387fb85736d // indirect
gitlab.com/xx_network/crypto v0.0.5-0.20220606200528-3f886fe49e81 // indirect gitlab.com/xx_network/crypto v0.0.5-0.20230214003943-8a09396e95dd // indirect
gitlab.com/xx_network/ring v0.0.3-0.20220222211904-da613960ad93 // indirect gitlab.com/xx_network/ring v0.0.3-0.20220902183151-a7d3b15bc981 // indirect
golang.org/x/crypto v0.0.0-20220128200615-198e4374d7ed // indirect go.uber.org/atomic v1.10.0 // indirect
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2 // indirect golang.org/x/crypto v0.5.0 // indirect
golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac // indirect golang.org/x/net v0.5.0 // indirect
golang.org/x/text v0.3.6 // indirect golang.org/x/sys v0.4.0 // indirect
google.golang.org/genproto v0.0.0-20210105202744-fe13368bc0e1 // indirect golang.org/x/text v0.6.0 // indirect
google.golang.org/grpc v1.42.0 // indirect google.golang.org/genproto v0.0.0-20220822174746-9e6da59bd2fc // indirect
google.golang.org/protobuf v1.27.1 // indirect google.golang.org/grpc v1.49.0 // indirect
google.golang.org/protobuf v1.28.1 // indirect
nhooyr.io/websocket v1.8.7 // indirect
src.agwa.name/tlshacks v0.0.0-20220518131152-d2c6f4e2b780 // indirect
) )
connectAuthServer/go.sum
+ 317
− 229
View file @ 6b70c940
This diff is collapsed.
connectAuthServer/listener.go
+ 1
− 1
View file @ 6b70c940
...@@ -2,7 +2,7 @@ package main ...@@ -2,7 +2,7 @@ package main
import ( import (
jww "github.com/spf13/jwalterweatherman" jww "github.com/spf13/jwalterweatherman"
"gitlab.com/elixxir/client/e2e/receive" "gitlab.com/elixxir/client/v4/e2e/receive"
) )
// listener adheres to the receive.Listener interface. // listener adheres to the receive.Listener interface.
......
connectAuthServer/main.go
+ 6
− 6
View file @ 6b70c940
...@@ -3,9 +3,9 @@ package main ...@@ -3,9 +3,9 @@ package main
import ( import (
"github.com/pkg/errors" "github.com/pkg/errors"
jww "github.com/spf13/jwalterweatherman" jww "github.com/spf13/jwalterweatherman"
"gitlab.com/elixxir/client/catalog" "gitlab.com/elixxir/client/v4/catalog"
"gitlab.com/elixxir/client/connect" "gitlab.com/elixxir/client/v4/connect"
"gitlab.com/elixxir/client/xxdk" "gitlab.com/elixxir/client/v4/xxdk"
"io/fs" "io/fs"
"io/ioutil" "io/ioutil"
"os" "os"
...@@ -114,13 +114,13 @@ func main() { ...@@ -114,13 +114,13 @@ func main() {
msgBody := "If this message is sent successfully, we'll have " + msgBody := "If this message is sent successfully, we'll have " +
"established contact with the client." "established contact with the client."
roundIDs, messageID, timeSent, err := connection.SendE2E(catalog.NoType, sendReport, err := connection.SendE2E(catalog.NoType,
[]byte(msgBody), e2eParams.Base) []byte(msgBody), e2eParams.Base)
if err != nil { if err != nil {
jww.FATAL.Panicf("Failed to send message: %+v", err) jww.FATAL.Panicf("Failed to send message: %+v", err)
} }
jww.INFO.Printf("Message %v sent in RoundIDs: %+v at %v", messageID, jww.INFO.Printf("Message %v sent in RoundIDs: %+v at %v", sendReport.MessageId,
roundIDs, timeSent) sendReport.RoundList, sendReport.SentTime)
} }
......
connectClient/go.mod
+ 32
− 20
View file @ 6b70c940
module gitlab.com/elixxir/xxdk-examples/connectExample module gitlab.com/elixxir/xxdk-examples/connectExample
go 1.17 go 1.19
require ( require (
github.com/spf13/jwalterweatherman v1.1.0 github.com/spf13/jwalterweatherman v1.1.0
gitlab.com/elixxir/client v1.5.1-0.20220725172207-3ef87e8c794c gitlab.com/elixxir/client/v4 v4.6.1
gitlab.com/elixxir/crypto v0.0.7-0.20220606201132-c370d5039cea gitlab.com/elixxir/crypto v0.0.7-0.20230214180106-72841fd1e426
) )
require ( require (
filippo.io/edwards25519 v1.0.0 // indirect
git.xx.network/elixxir/grpc-web-go-client v0.0.0-20230214175953-5b5a8c33d28a // indirect
github.com/badoux/checkmail v1.2.1 // indirect github.com/badoux/checkmail v1.2.1 // indirect
github.com/cloudflare/circl v1.1.0 // indirect github.com/cenkalti/backoff/v4 v4.1.3 // indirect
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/elliotchance/orderedmap v1.4.0 // indirect
github.com/golang-collections/collections v0.0.0-20130729185459-604e922904d3 // indirect github.com/golang-collections/collections v0.0.0-20130729185459-604e922904d3 // indirect
github.com/golang/protobuf v1.5.2 // indirect github.com/golang/protobuf v1.5.2 // indirect
github.com/gorilla/websocket v1.5.0 // indirect
github.com/improbable-eng/grpc-web v0.15.0 // indirect
github.com/klauspost/compress v1.15.9 // indirect
github.com/klauspost/cpuid/v2 v2.1.0 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 // indirect github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 // indirect
github.com/pkg/errors v0.9.1 // indirect github.com/pkg/errors v0.9.1 // indirect
github.com/rs/cors v1.8.2 // indirect
github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e // indirect github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e // indirect
github.com/stretchr/testify v1.7.1 // indirect github.com/soheilhy/cmux v0.1.5 // indirect
github.com/ttacon/builder v0.0.0-20170518171403-c099f663e1c2 // indirect github.com/ttacon/builder v0.0.0-20170518171403-c099f663e1c2 // indirect
github.com/ttacon/libphonenumber v1.2.1 // indirect github.com/ttacon/libphonenumber v1.2.1 // indirect
github.com/tyler-smith/go-bip39 v1.1.0 // indirect github.com/tyler-smith/go-bip39 v1.1.0 // indirect
github.com/zeebo/blake3 v0.2.3 // indirect
gitlab.com/elixxir/bloomfilter v0.0.0-20211222005329-7d931ceead6f // indirect gitlab.com/elixxir/bloomfilter v0.0.0-20211222005329-7d931ceead6f // indirect
gitlab.com/elixxir/comms v0.0.4-0.20220603231314-e47e4af13326 // indirect gitlab.com/elixxir/comms v0.0.4-0.20230310205528-f06faa0d2f0b // indirect
gitlab.com/elixxir/ekv v0.1.7 // indirect gitlab.com/elixxir/ekv v0.2.1 // indirect
gitlab.com/elixxir/primitives v0.0.3-0.20220606195757-40f7a589347f // indirect gitlab.com/elixxir/primitives v0.0.3-0.20230214180039-9a25e2d3969c // indirect
gitlab.com/xx_network/comms v0.0.4-0.20220630163702-f3d372ef6acd // indirect gitlab.com/xx_network/comms v0.0.4-0.20230214180029-5387fb85736d // indirect
gitlab.com/xx_network/crypto v0.0.5-0.20220606200528-3f886fe49e81 // indirect gitlab.com/xx_network/crypto v0.0.5-0.20230214003943-8a09396e95dd // indirect
gitlab.com/xx_network/primitives v0.0.4-0.20220712193914-aebd8544396e // indirect gitlab.com/xx_network/primitives v0.0.4-0.20230310205521-c440e68e34c4 // indirect
gitlab.com/xx_network/ring v0.0.3-0.20220222211904-da613960ad93 // indirect gitlab.com/xx_network/ring v0.0.3-0.20220902183151-a7d3b15bc981 // indirect
golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4 // indirect go.uber.org/atomic v1.10.0 // indirect
golang.org/x/net v0.0.0-20220420153159-1850ba15e1be // indirect golang.org/x/crypto v0.5.0 // indirect
golang.org/x/sys v0.0.0-20220412211240-33da011f77ad // indirect golang.org/x/net v0.5.0 // indirect
golang.org/x/text v0.3.7 // indirect golang.org/x/sys v0.4.0 // indirect
google.golang.org/genproto v0.0.0-20220421151946-72621c1f0bd3 // indirect golang.org/x/text v0.6.0 // indirect
google.golang.org/grpc v1.45.0 // indirect google.golang.org/genproto v0.0.0-20220822174746-9e6da59bd2fc // indirect
google.golang.org/protobuf v1.28.0 // indirect google.golang.org/grpc v1.49.0 // indirect
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect google.golang.org/protobuf v1.28.1 // indirect
nhooyr.io/websocket v1.8.7 // indirect
src.agwa.name/tlshacks v0.0.0-20220518131152-d2c6f4e2b780 // indirect
) )
connectClient/go.sum
+ 316
− 243
View file @ 6b70c940
This diff is collapsed.
connectClient/listener.go
+ 1
− 1
View file @ 6b70c940
...@@ -3,7 +3,7 @@ package main ...@@ -3,7 +3,7 @@ package main
import ( import (
jww "github.com/spf13/jwalterweatherman" jww "github.com/spf13/jwalterweatherman"
"gitlab.com/elixxir/client/e2e/receive" "gitlab.com/elixxir/client/v4/e2e/receive"
) )
// listener implements the receive.Listener interface // listener implements the receive.Listener interface
......
connectClient/main.go
+ 5
− 5
View file @ 6b70c940
...@@ -4,8 +4,8 @@ package main ...@@ -4,8 +4,8 @@ package main
import ( import (
"errors" "errors"
jww "github.com/spf13/jwalterweatherman" jww "github.com/spf13/jwalterweatherman"
"gitlab.com/elixxir/client/catalog" "gitlab.com/elixxir/client/v4/catalog"
"gitlab.com/elixxir/client/xxdk" "gitlab.com/elixxir/client/v4/xxdk"
"io/fs" "io/fs"
"io/ioutil" "io/ioutil"
"os" "os"
...@@ -13,7 +13,7 @@ import ( ...@@ -13,7 +13,7 @@ import (
"syscall" "syscall"
"time" "time"
"gitlab.com/elixxir/client/connect" "gitlab.com/elixxir/client/v4/connect"
"gitlab.com/elixxir/crypto/contact" "gitlab.com/elixxir/crypto/contact"
) )
...@@ -182,13 +182,13 @@ func main() { ...@@ -182,13 +182,13 @@ func main() {
// Test message // Test message
msgBody := "If this message is sent successfully, we'll have established " + msgBody := "If this message is sent successfully, we'll have established " +
"contact with the server." "contact with the server."
roundIDs, messageID, timeSent, err := handler.SendE2E( sendReport, err := handler.SendE2E(
catalog.XxMessage, []byte(msgBody), params.Base) catalog.XxMessage, []byte(msgBody), params.Base)
if err != nil { if err != nil {
jww.FATAL.Panicf("Failed to send message: %+v", err) jww.FATAL.Panicf("Failed to send message: %+v", err)
} }
jww.INFO.Printf("Message %v sent in RoundIDs: %+v at %v", jww.INFO.Printf("Message %v sent in RoundIDs: %+v at %v",
messageID, roundIDs, timeSent) sendReport.MessageId, sendReport.RoundList, sendReport.SentTime)
// Keep app running to receive messages------------------------------------ // Keep app running to receive messages------------------------------------
......
connectServer/go.mod
+ 32
− 18
View file @ 6b70c940
module gitlab.com/elixxir/xxdk-examples/connectServer module gitlab.com/elixxir/xxdk-examples/connectServer
go 1.17 go 1.19
require ( require (
github.com/spf13/jwalterweatherman v1.1.0 github.com/spf13/jwalterweatherman v1.1.0
gitlab.com/elixxir/client v1.5.1-0.20220725172207-3ef87e8c794c gitlab.com/elixxir/client/v4 v4.6.1
gitlab.com/elixxir/crypto v0.0.7-0.20220606201132-c370d5039cea gitlab.com/elixxir/crypto v0.0.7-0.20230214180106-72841fd1e426
gitlab.com/xx_network/primitives v0.0.4-0.20220712193914-aebd8544396e gitlab.com/xx_network/primitives v0.0.4-0.20230310205521-c440e68e34c4
) )
require ( require (
filippo.io/edwards25519 v1.0.0 // indirect
git.xx.network/elixxir/grpc-web-go-client v0.0.0-20230214175953-5b5a8c33d28a // indirect
github.com/badoux/checkmail v1.2.1 // indirect github.com/badoux/checkmail v1.2.1 // indirect
github.com/cloudflare/circl v1.1.0 // indirect github.com/cenkalti/backoff/v4 v4.1.3 // indirect
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/elliotchance/orderedmap v1.4.0 // indirect
github.com/golang-collections/collections v0.0.0-20130729185459-604e922904d3 // indirect github.com/golang-collections/collections v0.0.0-20130729185459-604e922904d3 // indirect
github.com/golang/protobuf v1.5.2 // indirect github.com/golang/protobuf v1.5.2 // indirect
github.com/gorilla/websocket v1.5.0 // indirect
github.com/improbable-eng/grpc-web v0.15.0 // indirect
github.com/klauspost/compress v1.15.9 // indirect
github.com/klauspost/cpuid/v2 v2.1.0 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 // indirect github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 // indirect
github.com/pkg/errors v0.9.1 // indirect github.com/pkg/errors v0.9.1 // indirect
github.com/rs/cors v1.8.2 // indirect
github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e // indirect github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e // indirect
github.com/soheilhy/cmux v0.1.5 // indirect
github.com/ttacon/builder v0.0.0-20170518171403-c099f663e1c2 // indirect github.com/ttacon/builder v0.0.0-20170518171403-c099f663e1c2 // indirect
github.com/ttacon/libphonenumber v1.2.1 // indirect github.com/ttacon/libphonenumber v1.2.1 // indirect
github.com/tyler-smith/go-bip39 v1.1.0 // indirect github.com/tyler-smith/go-bip39 v1.1.0 // indirect
github.com/zeebo/blake3 v0.2.3 // indirect
gitlab.com/elixxir/bloomfilter v0.0.0-20211222005329-7d931ceead6f // indirect gitlab.com/elixxir/bloomfilter v0.0.0-20211222005329-7d931ceead6f // indirect
gitlab.com/elixxir/comms v0.0.4-0.20220603231314-e47e4af13326 // indirect gitlab.com/elixxir/comms v0.0.4-0.20230310205528-f06faa0d2f0b // indirect
gitlab.com/elixxir/ekv v0.1.7 // indirect gitlab.com/elixxir/ekv v0.2.1 // indirect
gitlab.com/elixxir/primitives v0.0.3-0.20220606195757-40f7a589347f // indirect gitlab.com/elixxir/primitives v0.0.3-0.20230214180039-9a25e2d3969c // indirect
gitlab.com/xx_network/comms v0.0.4-0.20220630163702-f3d372ef6acd // indirect gitlab.com/xx_network/comms v0.0.4-0.20230214180029-5387fb85736d // indirect
gitlab.com/xx_network/crypto v0.0.5-0.20220606200528-3f886fe49e81 // indirect gitlab.com/xx_network/crypto v0.0.5-0.20230214003943-8a09396e95dd // indirect
gitlab.com/xx_network/ring v0.0.3-0.20220222211904-da613960ad93 // indirect gitlab.com/xx_network/ring v0.0.3-0.20220902183151-a7d3b15bc981 // indirect
golang.org/x/crypto v0.0.0-20220128200615-198e4374d7ed // indirect go.uber.org/atomic v1.10.0 // indirect
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2 // indirect golang.org/x/crypto v0.5.0 // indirect
golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac // indirect golang.org/x/net v0.5.0 // indirect
golang.org/x/text v0.3.6 // indirect golang.org/x/sys v0.4.0 // indirect
google.golang.org/genproto v0.0.0-20210105202744-fe13368bc0e1 // indirect golang.org/x/text v0.6.0 // indirect
google.golang.org/grpc v1.42.0 // indirect google.golang.org/genproto v0.0.0-20220822174746-9e6da59bd2fc // indirect
google.golang.org/protobuf v1.27.1 // indirect google.golang.org/grpc v1.49.0 // indirect
google.golang.org/protobuf v1.28.1 // indirect
nhooyr.io/websocket v1.8.7 // indirect
src.agwa.name/tlshacks v0.0.0-20220518131152-d2c6f4e2b780 // indirect
) )
connectServer/go.sum
+ 317
− 229
View file @ 6b70c940
This diff is collapsed.
connectServer/listener.go
+ 1
− 1
View file @ 6b70c940
...@@ -2,7 +2,7 @@ package main ...@@ -2,7 +2,7 @@ package main
import ( import (
jww "github.com/spf13/jwalterweatherman" jww "github.com/spf13/jwalterweatherman"
"gitlab.com/elixxir/client/e2e/receive" "gitlab.com/elixxir/client/v4/e2e/receive"
) )
// listener adheres to the receive.Listener interface. // listener adheres to the receive.Listener interface.
......
connectServer/main.go
+ 6
− 6
View file @ 6b70c940
...@@ -4,8 +4,8 @@ package main ...@@ -4,8 +4,8 @@ package main
import ( import (
"errors" "errors"
jww "github.com/spf13/jwalterweatherman" jww "github.com/spf13/jwalterweatherman"
"gitlab.com/elixxir/client/catalog" "gitlab.com/elixxir/client/v4/catalog"
"gitlab.com/elixxir/client/xxdk" "gitlab.com/elixxir/client/v4/xxdk"
"io/fs" "io/fs"
"io/ioutil" "io/ioutil"
"os" "os"
...@@ -13,7 +13,7 @@ import ( ...@@ -13,7 +13,7 @@ import (
"syscall" "syscall"
"time" "time"
"gitlab.com/elixxir/client/connect" "gitlab.com/elixxir/client/v4/connect"
) )
func main() { func main() {
...@@ -114,13 +114,13 @@ func main() { ...@@ -114,13 +114,13 @@ func main() {
msgBody := "If this message is sent successfully, we'll have " + msgBody := "If this message is sent successfully, we'll have " +
"established contact with the client." "established contact with the client."
roundIDs, messageID, timeSent, err := connection.SendE2E(catalog.NoType, sendReport, err := connection.SendE2E(catalog.NoType,
[]byte(msgBody), e2eParams.Base) []byte(msgBody), e2eParams.Base)
if err != nil { if err != nil {
jww.FATAL.Panicf("Failed to send message: %+v", err) jww.FATAL.Panicf("Failed to send message: %+v", err)
} }
jww.INFO.Printf("Message %v sent in RoundIDs: %+v at %v", messageID, jww.INFO.Printf("Message %v sent in RoundIDs: %+v at %v",
roundIDs, timeSent) sendReport.MessageId, sendReport.RoundList, sendReport.SentTime)
} }
......
e2eClient/auth.go
+ 3
− 3
View file @ 6b70c940
...@@ -2,9 +2,9 @@ package main ...@@ -2,9 +2,9 @@ package main
import ( import (
jww "github.com/spf13/jwalterweatherman" jww "github.com/spf13/jwalterweatherman"
"gitlab.com/elixxir/client/cmix/identity/receptionID" "gitlab.com/elixxir/client/v4/cmix/identity/receptionID"
"gitlab.com/elixxir/client/cmix/rounds" "gitlab.com/elixxir/client/v4/cmix/rounds"
"gitlab.com/elixxir/client/xxdk" "gitlab.com/elixxir/client/v4/xxdk"
"gitlab.com/elixxir/crypto/contact" "gitlab.com/elixxir/crypto/contact"
) )
......
e2eClient/go.mod
+ 32
− 18
View file @ 6b70c940
module gitlab.com/elixxir/xxdk-examples/e2eServer module gitlab.com/elixxir/xxdk-examples/e2eServer
go 1.17 go 1.19
require ( require (
github.com/spf13/jwalterweatherman v1.1.0 github.com/spf13/jwalterweatherman v1.1.0
gitlab.com/elixxir/client v1.5.1-0.20220725172207-3ef87e8c794c gitlab.com/elixxir/client/v4 v4.6.1
gitlab.com/elixxir/crypto v0.0.7-0.20220606201132-c370d5039cea gitlab.com/elixxir/crypto v0.0.7-0.20230214180106-72841fd1e426
gitlab.com/elixxir/primitives v0.0.3-0.20220606195757-40f7a589347f gitlab.com/elixxir/primitives v0.0.3-0.20230214180039-9a25e2d3969c
gitlab.com/xx_network/primitives v0.0.4-0.20220712193914-aebd8544396e gitlab.com/xx_network/primitives v0.0.4-0.20230310205521-c440e68e34c4
) )
require ( require (
filippo.io/edwards25519 v1.0.0 // indirect
git.xx.network/elixxir/grpc-web-go-client v0.0.0-20230214175953-5b5a8c33d28a // indirect
github.com/badoux/checkmail v1.2.1 // indirect github.com/badoux/checkmail v1.2.1 // indirect
github.com/cloudflare/circl v1.1.0 // indirect github.com/cenkalti/backoff/v4 v4.1.3 // indirect
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/elliotchance/orderedmap v1.4.0 // indirect
github.com/golang-collections/collections v0.0.0-20130729185459-604e922904d3 // indirect github.com/golang-collections/collections v0.0.0-20130729185459-604e922904d3 // indirect
github.com/golang/protobuf v1.5.2 // indirect github.com/golang/protobuf v1.5.2 // indirect
github.com/gorilla/websocket v1.5.0 // indirect
github.com/improbable-eng/grpc-web v0.15.0 // indirect
github.com/klauspost/compress v1.15.9 // indirect
github.com/klauspost/cpuid/v2 v2.1.0 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 // indirect github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 // indirect
github.com/pkg/errors v0.9.1 // indirect github.com/pkg/errors v0.9.1 // indirect
github.com/rs/cors v1.8.2 // indirect
github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e // indirect github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e // indirect
github.com/soheilhy/cmux v0.1.5 // indirect
github.com/ttacon/builder v0.0.0-20170518171403-c099f663e1c2 // indirect github.com/ttacon/builder v0.0.0-20170518171403-c099f663e1c2 // indirect
github.com/ttacon/libphonenumber v1.2.1 // indirect github.com/ttacon/libphonenumber v1.2.1 // indirect
github.com/tyler-smith/go-bip39 v1.1.0 // indirect github.com/tyler-smith/go-bip39 v1.1.0 // indirect
github.com/zeebo/blake3 v0.2.3 // indirect
gitlab.com/elixxir/bloomfilter v0.0.0-20211222005329-7d931ceead6f // indirect gitlab.com/elixxir/bloomfilter v0.0.0-20211222005329-7d931ceead6f // indirect
gitlab.com/elixxir/comms v0.0.4-0.20220603231314-e47e4af13326 // indirect gitlab.com/elixxir/comms v0.0.4-0.20230310205528-f06faa0d2f0b // indirect
gitlab.com/elixxir/ekv v0.1.7 // indirect gitlab.com/elixxir/ekv v0.2.1 // indirect
gitlab.com/xx_network/comms v0.0.4-0.20220630163702-f3d372ef6acd // indirect gitlab.com/xx_network/comms v0.0.4-0.20230214180029-5387fb85736d // indirect
gitlab.com/xx_network/crypto v0.0.5-0.20220606200528-3f886fe49e81 // indirect gitlab.com/xx_network/crypto v0.0.5-0.20230214003943-8a09396e95dd // indirect
gitlab.com/xx_network/ring v0.0.3-0.20220222211904-da613960ad93 // indirect gitlab.com/xx_network/ring v0.0.3-0.20220902183151-a7d3b15bc981 // indirect
golang.org/x/crypto v0.0.0-20220128200615-198e4374d7ed // indirect go.uber.org/atomic v1.10.0 // indirect
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2 // indirect golang.org/x/crypto v0.5.0 // indirect
golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac // indirect golang.org/x/net v0.5.0 // indirect
golang.org/x/text v0.3.6 // indirect golang.org/x/sys v0.4.0 // indirect
google.golang.org/genproto v0.0.0-20210105202744-fe13368bc0e1 // indirect golang.org/x/text v0.6.0 // indirect
google.golang.org/grpc v1.42.0 // indirect google.golang.org/genproto v0.0.0-20220822174746-9e6da59bd2fc // indirect
google.golang.org/protobuf v1.27.1 // indirect google.golang.org/grpc v1.49.0 // indirect
google.golang.org/protobuf v1.28.1 // indirect
nhooyr.io/websocket v1.8.7 // indirect
src.agwa.name/tlshacks v0.0.0-20220518131152-d2c6f4e2b780 // indirect
) )
e2eClient/go.sum
+ 317
− 229
View file @ 6b70c940
This diff is collapsed.
e2eClient/listener.go
+ 1
− 1
View file @ 6b70c940
...@@ -3,7 +3,7 @@ package main ...@@ -3,7 +3,7 @@ package main
import ( import (
jww "github.com/spf13/jwalterweatherman" jww "github.com/spf13/jwalterweatherman"
"gitlab.com/elixxir/client/e2e/receive" "gitlab.com/elixxir/client/v4/e2e/receive"
) )
// listener implements the receive.Listener interface // listener implements the receive.Listener interface
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment