diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 61bc3bfe8c5400f557e390044ce8efd2d6652f72..939c429d956d80ba7afb9d650f9b4cacf6d4df3d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -21,7 +21,7 @@ before_script:
- ssh-keyscan -t rsa gitlab.com > ~/.ssh/known_hosts
- git config --global url."git@gitlab.com:".insteadOf "https://gitlab.com/"
- export PATH=$HOME/go/bin:$PATH
- - export GOPRIVATE=gitlab.com/elixxir/*
+ - export GOPRIVATE=gitlab.com/elixxir/*,gitlab.com/xx_network/*
stages:
diff --git a/Makefile b/Makefile
index 9d21f23d70beaee01c3dea7e3792581b44081123..b8d85b2d4b167ff0347162df66cc69dda12755e3 100644
--- a/Makefile
+++ b/Makefile
@@ -23,11 +23,13 @@ update_release:
GOFLAGS="" go get -u gitlab.com/elixxir/primitives@release
GOFLAGS="" go get -u gitlab.com/elixxir/crypto@release
GOFLAGS="" go get -u gitlab.com/elixxir/comms@release
+ GOFLAGS="" go get -u gitlab.com/xx_network/comms@release
update_master:
GOFLAGS="" go get -u gitlab.com/elixxir/primitives@master
GOFLAGS="" go get -u gitlab.com/elixxir/crypto@master
GOFLAGS="" go get -u gitlab.com/elixxir/comms@master
+ GOFLAGS="" go get -u gitlab.com/xx_network/comms@master
master: clean update_master build version
diff --git a/api/client.go b/api/client.go
index ba3506e95d3a11cb7c5b86e73457081a2ff0886b..820c3457a9e3ffc7b5627b867580592cd8df483e 100644
--- a/api/client.go
+++ b/api/client.go
@@ -23,7 +23,6 @@ import (
"gitlab.com/elixxir/client/parse"
"gitlab.com/elixxir/client/rekey"
"gitlab.com/elixxir/client/user"
- "gitlab.com/elixxir/comms/connect"
"gitlab.com/elixxir/crypto/cyclic"
"gitlab.com/elixxir/crypto/large"
"gitlab.com/elixxir/crypto/signature/rsa"
@@ -31,6 +30,7 @@ import (
"gitlab.com/elixxir/primitives/id"
"gitlab.com/elixxir/primitives/ndf"
"gitlab.com/elixxir/primitives/switchboard"
+ "gitlab.com/xx_network/comms/connect"
goio "io"
"strings"
"testing"
diff --git a/api/connect.go b/api/connect.go
index 4782f5cf3d040d7028f9b0e4d46bf3d70be7bde9..578ee3e05f6250bf69fc5d40ad8085317eb7131a 100644
--- a/api/connect.go
+++ b/api/connect.go
@@ -11,10 +11,10 @@ import (
"github.com/pkg/errors"
"gitlab.com/elixxir/client/globals"
"gitlab.com/elixxir/client/io"
- "gitlab.com/elixxir/comms/connect"
"gitlab.com/elixxir/primitives/id"
"gitlab.com/elixxir/primitives/ndf"
"gitlab.com/elixxir/primitives/version"
+ "gitlab.com/xx_network/comms/connect"
)
var ErrNoPermissioning = errors.New("No Permissioning In NDF")
diff --git a/api/mockserver.go b/api/mockserver.go
index 699999074cf903e12b5353ae7fa36200df06543b..ca0d86e8e580d6c0890331111940f2e68bfea0df 100644
--- a/api/mockserver.go
+++ b/api/mockserver.go
@@ -14,7 +14,6 @@ import (
"gitlab.com/elixxir/client/cmixproto"
"gitlab.com/elixxir/client/globals"
"gitlab.com/elixxir/client/parse"
- "gitlab.com/elixxir/comms/connect"
pb "gitlab.com/elixxir/comms/mixmessages"
"gitlab.com/elixxir/crypto/cyclic"
"gitlab.com/elixxir/crypto/e2e"
@@ -22,6 +21,8 @@ import (
"gitlab.com/elixxir/primitives/format"
"gitlab.com/elixxir/primitives/id"
"gitlab.com/elixxir/primitives/ndf"
+ "gitlab.com/xx_network/comms/connect"
+ "gitlab.com/xx_network/comms/messages"
"sync"
"time"
)
@@ -300,7 +301,7 @@ func (m *GatewayHandler) PutMessage(msg *pb.Slot, ipaddr string) error {
func (m *GatewayHandler) ConfirmNonce(message *pb.RequestRegistrationConfirmation, ipaddr string) (*pb.RegistrationConfirmation, error) {
regConfirmation := &pb.RegistrationConfirmation{
- ClientSignedByServer: &pb.RSASignature{},
+ ClientSignedByServer: &messages.RSASignature{},
}
return regConfirmation, nil
diff --git a/api/private.go b/api/private.go
index 528dedea53517c15747b5d1868b050aca488f6d4..bc76f0f36d6f02080c16698ceab5c73a6f6b7caa 100644
--- a/api/private.go
+++ b/api/private.go
@@ -24,6 +24,7 @@ import (
"gitlab.com/elixxir/crypto/xx"
"gitlab.com/elixxir/primitives/id"
"gitlab.com/elixxir/primitives/ndf"
+ "gitlab.com/xx_network/comms/messages"
)
const PermissioningAddrID = "Permissioning"
@@ -137,11 +138,11 @@ func (cl *Client) requestNonce(salt, regHash []byte,
&pb.NonceRequest{
Salt: salt,
ClientRSAPubKey: string(rsa.CreatePublicKeyPem(publicKeyRSA)),
- ClientSignedByServer: &pb.RSASignature{
+ ClientSignedByServer: &messages.RSASignature{
Signature: regHash,
},
ClientDHPubKey: publicKeyDH.Bytes(),
- RequestSignature: &pb.RSASignature{
+ RequestSignature: &messages.RSASignature{
Signature: signed,
},
}) // TODO: modify this to return server DH
@@ -183,7 +184,7 @@ func (cl *Client) confirmNonce(UID, nonce []byte,
// TODO: This returns a receipt that can be used to speed up registration
msg := &pb.RequestRegistrationConfirmation{
UserID: UID,
- NonceSignedByClient: &pb.RSASignature{
+ NonceSignedByClient: &messages.RSASignature{
Signature: sig,
},
}
diff --git a/api/register_test.go b/api/register_test.go
index f53dca59aaffbcf23d8dd9c1156efac166d6e0f2..5c0ab24a56d6029c89c04e737dfc2e39dc4641eb 100644
--- a/api/register_test.go
+++ b/api/register_test.go
@@ -9,8 +9,8 @@ import (
"crypto/sha256"
"gitlab.com/elixxir/client/globals"
"gitlab.com/elixxir/client/user"
- "gitlab.com/elixxir/comms/connect"
"gitlab.com/elixxir/primitives/id"
+ "gitlab.com/xx_network/comms/connect"
"testing"
)
diff --git a/bindings/client_test.go b/bindings/client_test.go
index f14020047ec09895c924839008ca7055bed2b48a..f59ee64034c0b680752c0133cd9adf84eb00eca0 100644
--- a/bindings/client_test.go
+++ b/bindings/client_test.go
@@ -17,13 +17,13 @@ import (
"gitlab.com/elixxir/client/globals"
"gitlab.com/elixxir/client/parse"
"gitlab.com/elixxir/client/user"
- "gitlab.com/elixxir/comms/connect"
"gitlab.com/elixxir/comms/gateway"
pb "gitlab.com/elixxir/comms/mixmessages"
"gitlab.com/elixxir/comms/registration"
"gitlab.com/elixxir/crypto/signature/rsa"
"gitlab.com/elixxir/primitives/id"
"gitlab.com/elixxir/primitives/ndf"
+ "gitlab.com/xx_network/comms/connect"
"math/rand"
"os"
"reflect"
diff --git a/bots/bots.go b/bots/bots.go
index ed67cf578bf376836f0f17eb67f975c6a6f1c8d4..6cf0bdc3cee88b91aa0bc11a279cf0789a3a39ce 100644
--- a/bots/bots.go
+++ b/bots/bots.go
@@ -6,9 +6,9 @@ import (
"gitlab.com/elixxir/client/io"
"gitlab.com/elixxir/client/parse"
"gitlab.com/elixxir/client/user"
- "gitlab.com/elixxir/comms/connect"
"gitlab.com/elixxir/primitives/id"
"gitlab.com/elixxir/primitives/switchboard"
+ "gitlab.com/xx_network/comms/connect"
)
var session user.Session
diff --git a/bots/bots_test.go b/bots/bots_test.go
index e381417c7f671f2dfe45f371d07d2ddca97a1e10..6f0c7edba4e04504b780cf8039028940a7e25986 100644
--- a/bots/bots_test.go
+++ b/bots/bots_test.go
@@ -17,11 +17,11 @@ import (
"gitlab.com/elixxir/client/globals"
"gitlab.com/elixxir/client/parse"
"gitlab.com/elixxir/client/user"
- "gitlab.com/elixxir/comms/connect"
"gitlab.com/elixxir/crypto/cyclic"
"gitlab.com/elixxir/crypto/large"
"gitlab.com/elixxir/primitives/format"
"gitlab.com/elixxir/primitives/id"
+ "gitlab.com/xx_network/comms/connect"
"os"
"strings"
"testing"
diff --git a/crypto/encrypt.go b/crypto/encrypt.go
index 7cfe6fe504820f8943b49507a286e1af567a2ac2..7686521401474733e45bc47b508e90501d4ef8ea 100644
--- a/crypto/encrypt.go
+++ b/crypto/encrypt.go
@@ -9,12 +9,12 @@ package crypto
import (
"gitlab.com/elixxir/client/globals"
"gitlab.com/elixxir/client/user"
- "gitlab.com/elixxir/comms/connect"
"gitlab.com/elixxir/crypto/cmix"
"gitlab.com/elixxir/crypto/cyclic"
"gitlab.com/elixxir/crypto/e2e"
"gitlab.com/elixxir/crypto/hash"
"gitlab.com/elixxir/primitives/format"
+ "gitlab.com/xx_network/comms/connect"
)
// CMIX Encrypt performs the encryption
diff --git a/crypto/encryptdecrypt_test.go b/crypto/encryptdecrypt_test.go
index 6e899bfe3f1fe8902e4f24339ed95ad115788518..7cc9ad2c852126e10e63b560486946d7864f3066 100644
--- a/crypto/encryptdecrypt_test.go
+++ b/crypto/encryptdecrypt_test.go
@@ -10,7 +10,6 @@ import (
"bytes"
"encoding/binary"
"gitlab.com/elixxir/client/user"
- "gitlab.com/elixxir/comms/connect"
pb "gitlab.com/elixxir/comms/mixmessages"
"gitlab.com/elixxir/crypto/cmix"
"gitlab.com/elixxir/crypto/cyclic"
@@ -18,6 +17,7 @@ import (
"gitlab.com/elixxir/crypto/large"
"gitlab.com/elixxir/primitives/format"
"gitlab.com/elixxir/primitives/id"
+ "gitlab.com/xx_network/comms/connect"
"golang.org/x/crypto/blake2b"
"os"
"testing"
diff --git a/globals/version_vars.go b/globals/version_vars.go
index 5f9f43dc9c8d4dedd94c45e554ebe551b5b06e8a..2550d5fbb7bfcccc71945cfae45ae777c6e0ab88 100644
--- a/globals/version_vars.go
+++ b/globals/version_vars.go
@@ -1,9 +1,9 @@
// Code generated by go generate; DO NOT EDIT.
// This file was generated by robots at
-// 2020-07-08 17:10:58.006288504 +0000 UTC m=+0.004864279
+// 2020-07-13 18:24:01.075203 -0400 EDT m=+0.019600533
package globals
-const GITVERSION = `f74eb9a run make release`
+const GITVERSION = `14124a0 run make release`
const SEMVER = "1.3.0"
const DEPENDENCIES = `module gitlab.com/elixxir/client
@@ -22,10 +22,11 @@ require (
github.com/spf13/jwalterweatherman v1.1.0
github.com/spf13/pflag v1.0.5 // indirect
github.com/spf13/viper v1.6.2
- gitlab.com/elixxir/comms v0.0.0-20200708163924-9117e02f0d19
+ gitlab.com/elixxir/comms v0.0.0-20200713211810-fc01d622fa7f
gitlab.com/elixxir/crypto v0.0.0-20200707005343-97f868cbd930
gitlab.com/elixxir/primitives v0.0.0-20200706165052-9fe7a4fb99a3
- golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37
+ gitlab.com/xx_network/comms v0.0.0-20200710221038-0746770adb7c
+ golang.org/x/crypto v0.0.0-20200707235045-ab33eee955e0
gopkg.in/ini.v1 v1.52.0 // indirect
)
`
diff --git a/go.mod b/go.mod
index 3f78869e46d4e3a4d89047f5ca438076f8cea091..2984457f7bbc4a0ab3288066294be7fb08efede9 100644
--- a/go.mod
+++ b/go.mod
@@ -15,9 +15,10 @@ require (
github.com/spf13/jwalterweatherman v1.1.0
github.com/spf13/pflag v1.0.5 // indirect
github.com/spf13/viper v1.6.2
- gitlab.com/elixxir/comms v0.0.0-20200708163924-9117e02f0d19
+ gitlab.com/elixxir/comms v0.0.0-20200713211810-fc01d622fa7f
gitlab.com/elixxir/crypto v0.0.0-20200707005343-97f868cbd930
gitlab.com/elixxir/primitives v0.0.0-20200706165052-9fe7a4fb99a3
- golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37
+ gitlab.com/xx_network/comms v0.0.0-20200710221038-0746770adb7c
+ golang.org/x/crypto v0.0.0-20200707235045-ab33eee955e0
gopkg.in/ini.v1 v1.52.0 // indirect
)
diff --git a/go.sum b/go.sum
index 99c875cb23eb2fcf7495d22badff82e9426f8f17..c4e7f0aac2a0de99836ee5c70ec7e20eaca49a0f 100644
--- a/go.sum
+++ b/go.sum
@@ -63,6 +63,8 @@ github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw
github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4=
github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.0 h1:/QaMHBdZ26BB3SSst0Iwl10Epc+xhTquomWX0oZEB6w=
+github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
github.com/gopherjs/gopherjs v0.0.0-20200217142428-fce0ec30dd00 h1:l5lAOZEym3oK3SQ2HBHWsJUfbNBiTXJDeW2QDxw9AQ0=
github.com/gopherjs/gopherjs v0.0.0-20200217142428-fce0ec30dd00/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
@@ -150,18 +152,25 @@ github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4=
github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
+github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=
+github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s=
github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc=
github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
-gitlab.com/elixxir/comms v0.0.0-20200708163924-9117e02f0d19 h1:t/fWbCePjVqLLGjn332LuuoUTRMxLXGdlt4Xeb8evRM=
-gitlab.com/elixxir/comms v0.0.0-20200708163924-9117e02f0d19/go.mod h1:OsWMZ1O/R9fOkm+PoHnR3rkXfFtipGoPs73FuKuurHY=
+gitlab.com/elixxir/comms v0.0.0-20200707210150-b8ebd0951d23/go.mod h1:OsWMZ1O/R9fOkm+PoHnR3rkXfFtipGoPs73FuKuurHY=
+gitlab.com/elixxir/comms v0.0.0-20200713211810-fc01d622fa7f h1:fHP3O4giCQ7UFRuQp3b2bXzk0pYFeprIqS6MprAL3UU=
+gitlab.com/elixxir/comms v0.0.0-20200713211810-fc01d622fa7f/go.mod h1:3oNzl6QuYxOuSkVZdMKkllW0dZRdDoejzeCLSTezlNM=
gitlab.com/elixxir/crypto v0.0.0-20200707005343-97f868cbd930 h1:9qzfwyR12OYgn3j30qcHZHHVfWshWnH54lcAHppEROQ=
gitlab.com/elixxir/crypto v0.0.0-20200707005343-97f868cbd930/go.mod h1:LHBAaEf48a0/AjU118rjoworH0LgXifhAqmNX3ZRvME=
gitlab.com/elixxir/primitives v0.0.0-20200706165052-9fe7a4fb99a3 h1:GTfflZBNLeBq3UApYog0J3+hytdkoRsDduGQji2wyEU=
gitlab.com/elixxir/primitives v0.0.0-20200706165052-9fe7a4fb99a3/go.mod h1:OQgUZq7SjnE0b+8+iIAT2eqQF+2IFHn73tOo+aV11mg=
+gitlab.com/xx_network/comms v0.0.0-20200709165104-1fcde4b1729d h1:Vpg93y1f3AzFHfZFqMjbrNpRSfUCjmOg0rMLqY0venE=
+gitlab.com/xx_network/comms v0.0.0-20200709165104-1fcde4b1729d/go.mod h1:CX2wQaDwnnk68etjJzIzyJ9Qfxl01KuTKKLpgXRhIYY=
+gitlab.com/xx_network/comms v0.0.0-20200710221038-0746770adb7c h1:CrjMh1b94pNLVk0Xb/E5k3jatSexbuwIry+14oWrHDA=
+gitlab.com/xx_network/comms v0.0.0-20200710221038-0746770adb7c/go.mod h1:CX2wQaDwnnk68etjJzIzyJ9Qfxl01KuTKKLpgXRhIYY=
go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
@@ -170,6 +179,9 @@ golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnf
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37 h1:cg5LA/zNPRzIXIWSCxQW10Rvpy94aQh3LT/ShoCpkHw=
golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20200707235045-ab33eee955e0 h1:eIYIE7EC5/Wv5Kbz8bJPaq+TN3kq3W8S+LSm62vM0DY=
+golang.org/x/crypto v0.0.0-20200707235045-ab33eee955e0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
@@ -184,6 +196,8 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn
golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
golang.org/x/net v0.0.0-20200513185701-a91f0712d120 h1:EZ3cVSzKOlJxAd8e8YAJ7no8nNypTxexh/YE/xW3ZEY=
golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20200707034311-ab3426394381 h1:VXak5I6aEWmAXeQjA+QSZzlgNrpq9mjcfDemuexIKsU=
+golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -199,9 +213,13 @@ golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7w
golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200519105757-fe76b779f299 h1:DYfZAGf2WMFjMxbgTjaC+2HC7NkNAQs+6Q8b9WEB/F4=
golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae h1:Ih9Yo4hSPImZOpfGuA4bR/ORKTAbhZo2AbWNRCnevdo=
+golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
+golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k=
+golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
@@ -218,6 +236,9 @@ google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoA
google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
google.golang.org/genproto v0.0.0-20200514193133-8feb7f20f2a2 h1:RwW6+LxyOQJ7oeoZ76GIJlwt/O0J5cN2fk+q/jK27kQ=
google.golang.org/genproto v0.0.0-20200514193133-8feb7f20f2a2/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U=
+google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
+google.golang.org/genproto v0.0.0-20200709005830-7a2ca40e9dc3 h1:JwLN1jVnmIsfE4HkDVe2AblFAbo0Z+4cjteDSOnv6oE=
+google.golang.org/genproto v0.0.0-20200709005830-7a2ca40e9dc3/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
@@ -225,6 +246,8 @@ google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQ
google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
google.golang.org/grpc v1.29.1 h1:EC2SB8S04d2r73uptxphDSUG+kTKVgjRPF+N3xpxRB4=
google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk=
+google.golang.org/grpc v1.30.0 h1:M5a8xTlYTxwMn5ZFkwhRabsygDY5G8TYLyQDBxJNAxE=
+google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
@@ -235,6 +258,10 @@ google.golang.org/protobuf v1.22.0 h1:cJv5/xdbk1NnMPR1VP9+HU6gupuG9MLBoH1r6RHZ2M
google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
google.golang.org/protobuf v1.23.0 h1:4MY060fB1DLGMB/7MBTLnwQUY6+F09GEiz6SsrNqyzM=
google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4=
+google.golang.org/protobuf v1.25.0 h1:Ejskq+SyPohKW+1uil0JJMtmHCgJPJ/qWTxr8qp+R4c=
+google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
@@ -250,5 +277,8 @@ gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 h1:tQIYjPdBoyREyB9XMu+nnTclpTYkz2zFM+lzLJFO4gQ=
+gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
diff --git a/io/interface.go b/io/interface.go
index c0e0673e7bde79e83486efe9c87ace3de7a8b102..3352147ee359249751df963abe00487a6fd579e1 100644
--- a/io/interface.go
+++ b/io/interface.go
@@ -9,8 +9,8 @@ package io
import (
"gitlab.com/elixxir/client/parse"
"gitlab.com/elixxir/client/user"
- "gitlab.com/elixxir/comms/connect"
"gitlab.com/elixxir/primitives/id"
+ "gitlab.com/xx_network/comms/connect"
"time"
)
diff --git a/io/receive.go b/io/receive.go
index a59d2498a18e32db04db943180cd78f5f5aaf03c..ef5c5dbcba7c66037efa0d67935e762916c3cd07 100644
--- a/io/receive.go
+++ b/io/receive.go
@@ -14,12 +14,12 @@ import (
"gitlab.com/elixxir/client/globals"
"gitlab.com/elixxir/client/parse"
"gitlab.com/elixxir/client/user"
- "gitlab.com/elixxir/comms/connect"
pb "gitlab.com/elixxir/comms/mixmessages"
"gitlab.com/elixxir/crypto/e2e"
"gitlab.com/elixxir/primitives/format"
"gitlab.com/elixxir/primitives/id"
"gitlab.com/elixxir/primitives/switchboard"
+ "gitlab.com/xx_network/comms/connect"
"strings"
"time"
)
diff --git a/io/send.go b/io/send.go
index d123f946960ace5f71ae4a984a02536cc4b68e3e..f4d5fc97507ce718c6bdf66704facc797746a143 100644
--- a/io/send.go
+++ b/io/send.go
@@ -15,13 +15,13 @@ import (
"gitlab.com/elixxir/client/keyStore"
"gitlab.com/elixxir/client/parse"
"gitlab.com/elixxir/client/user"
- "gitlab.com/elixxir/comms/connect"
pb "gitlab.com/elixxir/comms/mixmessages"
"gitlab.com/elixxir/crypto/cmix"
"gitlab.com/elixxir/crypto/csprng"
"gitlab.com/elixxir/crypto/e2e"
"gitlab.com/elixxir/primitives/format"
"gitlab.com/elixxir/primitives/id"
+ "gitlab.com/xx_network/comms/connect"
"time"
)
diff --git a/rekey/rekey.go b/rekey/rekey.go
index 044e428a5ad77443f663e1bb6dd20d2c1f42e57f..b013ad245f9b5d53994e4466756d81eb525ef831 100644
--- a/rekey/rekey.go
+++ b/rekey/rekey.go
@@ -9,7 +9,6 @@ import (
"gitlab.com/elixxir/client/keyStore"
"gitlab.com/elixxir/client/parse"
"gitlab.com/elixxir/client/user"
- "gitlab.com/elixxir/comms/connect"
"gitlab.com/elixxir/crypto/cyclic"
"gitlab.com/elixxir/crypto/diffieHellman"
"gitlab.com/elixxir/crypto/e2e"
@@ -17,6 +16,7 @@ import (
"gitlab.com/elixxir/primitives/format"
"gitlab.com/elixxir/primitives/id"
"gitlab.com/elixxir/primitives/switchboard"
+ "gitlab.com/xx_network/comms/connect"
)
var session user.Session
diff --git a/rekey/rekey_test.go b/rekey/rekey_test.go
index 7112b3386942b27f138c87ea2a1329ce6ba26049..cd9019f5f82024a89e7fb1da845745effdbfd892 100644
--- a/rekey/rekey_test.go
+++ b/rekey/rekey_test.go
@@ -9,7 +9,6 @@ import (
"gitlab.com/elixxir/client/keyStore"
"gitlab.com/elixxir/client/parse"
"gitlab.com/elixxir/client/user"
- "gitlab.com/elixxir/comms/connect"
"gitlab.com/elixxir/crypto/csprng"
"gitlab.com/elixxir/crypto/cyclic"
"gitlab.com/elixxir/crypto/diffieHellman"
@@ -18,6 +17,7 @@ import (
"gitlab.com/elixxir/crypto/large"
"gitlab.com/elixxir/crypto/signature/rsa"
"gitlab.com/elixxir/primitives/id"
+ "gitlab.com/xx_network/comms/connect"
"os"
"testing"
"time"
diff --git a/user/session.go b/user/session.go
index 342bffb3afaf5f8d8e471acbc384ce28994c1f0a..04665d6579c272144b08d222d7d7e911c882881b 100644
--- a/user/session.go
+++ b/user/session.go
@@ -17,12 +17,12 @@ import (
"github.com/pkg/errors"
"gitlab.com/elixxir/client/globals"
"gitlab.com/elixxir/client/keyStore"
- "gitlab.com/elixxir/comms/connect"
"gitlab.com/elixxir/crypto/cyclic"
"gitlab.com/elixxir/crypto/signature/rsa"
"gitlab.com/elixxir/primitives/format"
"gitlab.com/elixxir/primitives/id"
"gitlab.com/elixxir/primitives/switchboard"
+ "gitlab.com/xx_network/comms/connect"
"io"
"sync"
"sync/atomic"
diff --git a/user/session_test.go b/user/session_test.go
index 370dc25374039cd38a042a14d080c2dcd758df46..ddf7201574ec3eb66bd06c5bb87c8932d4ccd5e5 100644
--- a/user/session_test.go
+++ b/user/session_test.go
@@ -11,12 +11,12 @@ import (
"crypto/sha256"
"encoding/gob"
"gitlab.com/elixxir/client/globals"
- "gitlab.com/elixxir/comms/connect"
"gitlab.com/elixxir/crypto/cyclic"
"gitlab.com/elixxir/crypto/large"
"gitlab.com/elixxir/crypto/signature/rsa"
"gitlab.com/elixxir/primitives/format"
"gitlab.com/elixxir/primitives/id"
+ "gitlab.com/xx_network/comms/connect"
"math/rand"
"reflect"
"testing"
diff --git a/version_vars.go.bak b/version_vars.go.bak
index 0c12b1ee2aaebfffe7c41841eac6298a2f059526..7e3a3aefecf6dbc8ed1700f14ef545e0966e990c 100644
--- a/version_vars.go.bak
+++ b/version_vars.go.bak
@@ -1,9 +1,9 @@
// Code generated by go generate; DO NOT EDIT.
// This file was generated by robots at
-// 2020-07-08 17:10:58.006288504 +0000 UTC m=+0.004864279
+// 2020-07-13 18:24:01.075203 -0400 EDT m=+0.019600533
package cmd
-const GITVERSION = `f74eb9a run make release`
+const GITVERSION = `14124a0 run make release`
const SEMVER = "1.3.0"
const DEPENDENCIES = `module gitlab.com/elixxir/client
@@ -22,10 +22,11 @@ require (
github.com/spf13/jwalterweatherman v1.1.0
github.com/spf13/pflag v1.0.5 // indirect
github.com/spf13/viper v1.6.2
- gitlab.com/elixxir/comms v0.0.0-20200708163924-9117e02f0d19
+ gitlab.com/elixxir/comms v0.0.0-20200713211810-fc01d622fa7f
gitlab.com/elixxir/crypto v0.0.0-20200707005343-97f868cbd930
gitlab.com/elixxir/primitives v0.0.0-20200706165052-9fe7a4fb99a3
- golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37
+ gitlab.com/xx_network/comms v0.0.0-20200710221038-0746770adb7c
+ golang.org/x/crypto v0.0.0-20200707235045-ab33eee955e0
gopkg.in/ini.v1 v1.52.0 // indirect
)
`