diff --git a/Makefile b/Makefile index b8d85b2d4b167ff0347162df66cc69dda12755e3..9c16bd45cb615fabfce834ad0a8e2cdf5518218d 100644 --- a/Makefile +++ b/Makefile @@ -24,12 +24,14 @@ update_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 + GOFLAGS="" go get -u gitlab.com/xx_network/primitives@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 + GOFLAGS="" go get -u gitlab.com/xx_network/primitives@master master: clean update_master build version diff --git a/api/client.go b/api/client.go index 820c3457a9e3ffc7b5627b867580592cd8df483e..096940e9a86e956b69682fed49a82167c3b63225 100644 --- a/api/client.go +++ b/api/client.go @@ -27,10 +27,10 @@ import ( "gitlab.com/elixxir/crypto/large" "gitlab.com/elixxir/crypto/signature/rsa" "gitlab.com/elixxir/crypto/tls" - "gitlab.com/elixxir/primitives/id" - "gitlab.com/elixxir/primitives/ndf" "gitlab.com/elixxir/primitives/switchboard" "gitlab.com/xx_network/comms/connect" + "gitlab.com/xx_network/primitives/id" + "gitlab.com/xx_network/primitives/ndf" goio "io" "strings" "testing" diff --git a/api/client_test.go b/api/client_test.go index bebd23da966c191ed8c45900a0626f25c54b4932..eae9cc49891a122cb5b3dcd44fa332608fcf09f4 100644 --- a/api/client_test.go +++ b/api/client_test.go @@ -22,7 +22,7 @@ import ( "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/primitives/id" "reflect" "testing" "time" diff --git a/api/connect.go b/api/connect.go index 928e47f63b522974a51d4fd6b9f1744482b8fb81..212df62a74048e8f40279a75b64653f37a7a7207 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/primitives/id" - "gitlab.com/elixxir/primitives/ndf" "gitlab.com/elixxir/primitives/version" "gitlab.com/xx_network/comms/connect" + "gitlab.com/xx_network/primitives/id" + "gitlab.com/xx_network/primitives/ndf" ) var ErrNoPermissioning = errors.New("No Permissioning In NDF") diff --git a/api/mockserver.go b/api/mockserver.go index 0e487eefab28de3cc65da1e82d430c3b2102764e..c0007a1357392a7cef0e9eebe820cba26b8181f7 100644 --- a/api/mockserver.go +++ b/api/mockserver.go @@ -19,10 +19,10 @@ import ( "gitlab.com/elixxir/crypto/e2e" "gitlab.com/elixxir/crypto/large" "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" + "gitlab.com/xx_network/primitives/id" + "gitlab.com/xx_network/primitives/ndf" "sync" "time" ) @@ -297,7 +297,7 @@ func (m *GatewayHandler) CheckMessages(userId *id.ID, func (m *GatewayHandler) PutMessage(msg *pb.GatewaySlot, ipaddr string) (*pb.GatewaySlotResponse, error) { m.LastReceivedMessage = *msg.Message return &pb.GatewaySlotResponse{ - Accepted:true, + Accepted: true, }, nil } diff --git a/api/mockserver_test.go b/api/mockserver_test.go index 093f29e5e3ecf977ed401f2d00c2fe861c1ac14f..62e5950bc042b97ac1a72dd782d0beb759353108 100644 --- a/api/mockserver_test.go +++ b/api/mockserver_test.go @@ -16,9 +16,9 @@ import ( pb "gitlab.com/elixxir/comms/mixmessages" "gitlab.com/elixxir/comms/notificationBot" "gitlab.com/elixxir/comms/registration" - "gitlab.com/elixxir/primitives/id" - "gitlab.com/elixxir/primitives/ndf" "gitlab.com/xx_network/comms/connect" + "gitlab.com/xx_network/primitives/id" + "gitlab.com/xx_network/primitives/ndf" "os" "strings" "testing" diff --git a/api/ndf_test.go b/api/ndf_test.go index 3a113b52c6cc323f4e478fc3fdf3c24991281823..22b3f3c2d55c6449a782c833c830d6075d7f1252 100644 --- a/api/ndf_test.go +++ b/api/ndf_test.go @@ -12,7 +12,7 @@ import ( "encoding/base64" "fmt" "gitlab.com/elixxir/crypto/signature/rsa" - "gitlab.com/elixxir/primitives/ndf" + "gitlab.com/xx_network/primitives/ndf" "reflect" "testing" ) diff --git a/api/notifications.go b/api/notifications.go index 5d27bf73d22387c378b66f738478dfb927c6ba0f..a7587f4f80c632995dd0cb4c885a5a6189bc7d2e 100644 --- a/api/notifications.go +++ b/api/notifications.go @@ -3,7 +3,7 @@ package api import ( "github.com/pkg/errors" "gitlab.com/elixxir/comms/mixmessages" - "gitlab.com/elixxir/primitives/id" + "gitlab.com/xx_network/primitives/id" ) // RegisterForNotifications sends a message to notification bot indicating it diff --git a/api/private.go b/api/private.go index bc76f0f36d6f02080c16698ceab5c73a6f6b7caa..bc0f6256f896f351b727ac0d724328ad8ac1f089 100644 --- a/api/private.go +++ b/api/private.go @@ -22,9 +22,9 @@ import ( "gitlab.com/elixxir/crypto/large" "gitlab.com/elixxir/crypto/signature/rsa" "gitlab.com/elixxir/crypto/xx" - "gitlab.com/elixxir/primitives/id" - "gitlab.com/elixxir/primitives/ndf" "gitlab.com/xx_network/comms/messages" + "gitlab.com/xx_network/primitives/id" + "gitlab.com/xx_network/primitives/ndf" ) const PermissioningAddrID = "Permissioning" diff --git a/api/register.go b/api/register.go index 921738be22150f4fa06a187a0f375a622ce2aaa7..407dacc234086238961f8071ca525aa5f0bf5211 100644 --- a/api/register.go +++ b/api/register.go @@ -18,8 +18,8 @@ import ( "gitlab.com/elixxir/crypto/registration" "gitlab.com/elixxir/crypto/signature/rsa" "gitlab.com/elixxir/crypto/tls" - "gitlab.com/elixxir/primitives/id" - "gitlab.com/elixxir/primitives/ndf" + "gitlab.com/xx_network/primitives/id" + "gitlab.com/xx_network/primitives/ndf" "sync" "time" ) diff --git a/api/register_test.go b/api/register_test.go index 5c0ab24a56d6029c89c04e737dfc2e39dc4641eb..fc875765356a0e8bc4ba61d2eac7c7aff171e8af 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/primitives/id" "gitlab.com/xx_network/comms/connect" + "gitlab.com/xx_network/primitives/id" "testing" ) diff --git a/bindings/client.go b/bindings/client.go index 480a55fe8ec810be1e112cb91265b90f8e99d13f..b4656017f9d2ea687fb7933d52f6d4cd250d72e1 100644 --- a/bindings/client.go +++ b/bindings/client.go @@ -14,7 +14,7 @@ import ( "gitlab.com/elixxir/client/globals" "gitlab.com/elixxir/client/parse" "gitlab.com/elixxir/crypto/csprng" - "gitlab.com/elixxir/primitives/id" + "gitlab.com/xx_network/primitives/id" "io" "math/big" "strings" diff --git a/bindings/client_test.go b/bindings/client_test.go index c3f2e70df79c9c6717edabd718b1fa46a3e48598..e27368ac1e3ac1a02f0c90ae7a996b1c9625053d 100644 --- a/bindings/client_test.go +++ b/bindings/client_test.go @@ -23,10 +23,10 @@ import ( "gitlab.com/elixxir/crypto/cyclic" "gitlab.com/elixxir/crypto/large" "gitlab.com/elixxir/crypto/signature/rsa" - "gitlab.com/elixxir/primitives/id" - "gitlab.com/elixxir/primitives/ndf" "gitlab.com/xx_network/comms/connect" "gitlab.com/xx_network/comms/messages" + "gitlab.com/xx_network/primitives/id" + "gitlab.com/xx_network/primitives/ndf" "math/rand" "os" "reflect" @@ -850,7 +850,7 @@ func (m *GatewayHandler) CheckMessages(userId *id.ID, func (m *GatewayHandler) PutMessage(msg *pb.GatewaySlot, ipaddr string) (*pb.GatewaySlotResponse, error) { m.LastReceivedMessage = *msg.Message return &pb.GatewaySlotResponse{ - Accepted:true, + Accepted: true, }, nil } diff --git a/bots/bots.go b/bots/bots.go index 6cf0bdc3cee88b91aa0bc11a279cf0789a3a39ce..815e183370da872d587fb893445d0824326b43a9 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/primitives/id" "gitlab.com/elixxir/primitives/switchboard" "gitlab.com/xx_network/comms/connect" + "gitlab.com/xx_network/primitives/id" ) var session user.Session diff --git a/bots/bots_test.go b/bots/bots_test.go index 6f0c7edba4e04504b780cf8039028940a7e25986..f827bf3d46c53c053347d5f70ae52ce2ade6cb03 100644 --- a/bots/bots_test.go +++ b/bots/bots_test.go @@ -20,8 +20,8 @@ import ( "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" + "gitlab.com/xx_network/primitives/id" "os" "strings" "testing" diff --git a/bots/userDiscovery.go b/bots/userDiscovery.go index d84976c955d24e3814939419a7d3c8541dae07fc..cf447b976e102fd805a530d53ab375edf77ef4cc 100644 --- a/bots/userDiscovery.go +++ b/bots/userDiscovery.go @@ -17,7 +17,7 @@ import ( "gitlab.com/elixxir/client/globals" "gitlab.com/elixxir/client/parse" "gitlab.com/elixxir/crypto/hash" - "gitlab.com/elixxir/primitives/id" + "gitlab.com/xx_network/primitives/id" "strings" "time" ) diff --git a/cmd/root.go b/cmd/root.go index 825cb3218ef90899680dff436a6f9d2f6478a3d5..ebf02de19ba7f9382dbaf031d1f87969ad0a1611 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -21,9 +21,9 @@ import ( "gitlab.com/elixxir/client/parse" "gitlab.com/elixxir/client/user" "gitlab.com/elixxir/crypto/signature/rsa" - "gitlab.com/elixxir/primitives/id" "gitlab.com/elixxir/primitives/switchboard" "gitlab.com/elixxir/primitives/utils" + "gitlab.com/xx_network/primitives/id" "io/ioutil" "os" "strconv" diff --git a/cmd/udb.go b/cmd/udb.go index ed39e5d8be21880cc3b3540c64d214c8f6e87b12..9935a5382ce96f36434576c641a4a18f25aa11de 100644 --- a/cmd/udb.go +++ b/cmd/udb.go @@ -9,7 +9,7 @@ package cmd import ( "gitlab.com/elixxir/client/api" "gitlab.com/elixxir/client/globals" - "gitlab.com/elixxir/primitives/id" + "gitlab.com/xx_network/primitives/id" "strings" "time" ) diff --git a/crypto/encryptdecrypt_test.go b/crypto/encryptdecrypt_test.go index 7cc9ad2c852126e10e63b560486946d7864f3066..3e7d30506a5504abee1f285806fb9eda01d7192b 100644 --- a/crypto/encryptdecrypt_test.go +++ b/crypto/encryptdecrypt_test.go @@ -16,8 +16,8 @@ import ( "gitlab.com/elixxir/crypto/hash" "gitlab.com/elixxir/crypto/large" "gitlab.com/elixxir/primitives/format" - "gitlab.com/elixxir/primitives/id" "gitlab.com/xx_network/comms/connect" + "gitlab.com/xx_network/primitives/id" "golang.org/x/crypto/blake2b" "os" "testing" diff --git a/globals/version_vars.go b/globals/version_vars.go index c3523d28d87ae11b502bf1636e5a5d9ee461bb8f..e95dd6b1a04bb53afb655120b36fc3cc848be32a 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-08-03 10:45:37.897014448 -0700 PDT m=+0.010920997 +// 2020-08-04 16:00:18.998691 -0700 PDT m=+0.035383254 package globals -const GITVERSION = `eacc031 Merge branch 'release' of gitlab.com:elixxir/client into XX-2431/ClientAuth` +const GITVERSION = `8a10037 rerun go mod` const SEMVER = "1.4.0" const DEPENDENCIES = `module gitlab.com/elixxir/client @@ -22,17 +22,15 @@ 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-20200731222525-4309a98f7b4d - gitlab.com/elixxir/crypto v0.0.0-20200721213839-b026955c55c0 + gitlab.com/elixxir/comms v0.0.0-20200804225939-84dbe3cccc62 + gitlab.com/elixxir/crypto v0.0.0-20200804182833-984246dea2c4 gitlab.com/elixxir/ekv v0.0.0-20200729182028-159355ea5842 - gitlab.com/elixxir/primitives v0.0.0-20200731184040-494269b53b4d - gitlab.com/xx_network/comms v0.0.0-20200731231107-9e020daf0013 + gitlab.com/elixxir/primitives v0.0.0-20200804182913-788f47bded40 + gitlab.com/xx_network/comms v0.0.0-20200804225654-09a9af23d699 + gitlab.com/xx_network/primitives v0.0.0-20200804183002-f99f7a7284da golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899 gopkg.in/ini.v1 v1.52.0 // indirect ) -replace ( - gitlab.com/xx_network/collections/ring => gitlab.com/xx_network/collections/ring.git v0.0.1 - google.golang.org/grpc => github.com/grpc/grpc-go v1.27.1 -) +replace google.golang.org/grpc => github.com/grpc/grpc-go v1.27.1 ` diff --git a/go.mod b/go.mod index 14162fb373aa7a704990e640ea6db883f51d0be2..7fe01e5267e8e28d82d95a0296787c554937e50c 100644 --- a/go.mod +++ b/go.mod @@ -15,16 +15,14 @@ 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-20200731222525-4309a98f7b4d - gitlab.com/elixxir/crypto v0.0.0-20200721213839-b026955c55c0 + gitlab.com/elixxir/comms v0.0.0-20200804225939-84dbe3cccc62 + gitlab.com/elixxir/crypto v0.0.0-20200804182833-984246dea2c4 gitlab.com/elixxir/ekv v0.0.0-20200729182028-159355ea5842 - gitlab.com/elixxir/primitives v0.0.0-20200731184040-494269b53b4d - gitlab.com/xx_network/comms v0.0.0-20200731231107-9e020daf0013 + gitlab.com/elixxir/primitives v0.0.0-20200804182913-788f47bded40 + gitlab.com/xx_network/comms v0.0.0-20200804225654-09a9af23d699 + gitlab.com/xx_network/primitives v0.0.0-20200804183002-f99f7a7284da golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899 gopkg.in/ini.v1 v1.52.0 // indirect ) -replace ( - gitlab.com/xx_network/collections/ring => gitlab.com/xx_network/collections/ring.git v0.0.1 - google.golang.org/grpc => github.com/grpc/grpc-go v1.27.1 -) +replace google.golang.org/grpc => github.com/grpc/grpc-go v1.27.1 diff --git a/go.sum b/go.sum index aac5d375356af78a845041eef41667b11aec9cf9..4d50a28ad8544acf1b3e43c4cc99a1f5e5722f7b 100644 --- a/go.sum +++ b/go.sum @@ -161,25 +161,25 @@ github.com/zeebo/assert v0.0.0-20181109011804-10f827ce2ed6/go.mod h1:yssERNPivll github.com/zeebo/assert v1.1.0/go.mod h1:Pq9JiuJQpG8JLJdtkwrJESF0Foym2/D9XMU5ciN/wJ0= github.com/zeebo/blake3 v0.0.4/go.mod h1:YOZo8A49yNqM0X/Y+JmDUZshJWLt1laHsNSn5ny2i34= github.com/zeebo/pcg v0.0.0-20181207190024-3cdc6b625a05/go.mod h1:Gr+78ptB0MwXxm//LBaEvBiaXY7hXJ6KGe2V32X2F6E= -gitlab.com/elixxir/comms v0.0.0-20200707210150-b8ebd0951d23/go.mod h1:OsWMZ1O/R9fOkm+PoHnR3rkXfFtipGoPs73FuKuurHY= -gitlab.com/elixxir/comms v0.0.0-20200731222525-4309a98f7b4d h1:DR9dZn8NVTgTesOyQhFCnyLtySPp8ajVjv+GYfkjSbg= -gitlab.com/elixxir/comms v0.0.0-20200731222525-4309a98f7b4d/go.mod h1:wYiItOoVbs3LuM8eAR1mqGoMX1TY3NFkDMv0slxyH+U= -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/crypto v0.0.0-20200721213839-b026955c55c0 h1:bXpAX607nE2edN7ei8CIAcHuD0kJxDdGFusK51qlxN4= -gitlab.com/elixxir/crypto v0.0.0-20200721213839-b026955c55c0/go.mod h1:LHBAaEf48a0/AjU118rjoworH0LgXifhAqmNX3ZRvME= +gitlab.com/elixxir/comms v0.0.0-20200804225939-84dbe3cccc62 h1:Xpz8ToqH2fMfZRhWZ+qLRpE2LQD3ct14ciF1S4Ma5Uk= +gitlab.com/elixxir/comms v0.0.0-20200804225939-84dbe3cccc62/go.mod h1:Wc6fZyP/M4sBjnzb9pRScLeqwMOCv6DRXoTOd07bO3g= +gitlab.com/elixxir/crypto v0.0.0-20200804182833-984246dea2c4 h1:28ftZDeYEko7xptCZzeFWS1Iam95dj46TWFVVlKmw6A= +gitlab.com/elixxir/crypto v0.0.0-20200804182833-984246dea2c4/go.mod h1:ucm9SFKJo+K0N2GwRRpaNr+tKXMIOVWzmyUD0SbOu2c= gitlab.com/elixxir/ekv v0.0.0-20200729182028-159355ea5842 h1:m1zDQ6UadpuMnV7nvnyR+DUXE3AisRnVjajTb1xZE4c= gitlab.com/elixxir/ekv v0.0.0-20200729182028-159355ea5842/go.mod h1:bXY0kgbV5BHYda4YY5/hiG5bjimGK+R3PYub5yM9C/s= -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/elixxir/primitives v0.0.0-20200731184040-494269b53b4d h1:OKWTmYN5q8XVHo8JXThIH0TCuvl/fLXR7MGVacpqfRg= gitlab.com/elixxir/primitives v0.0.0-20200731184040-494269b53b4d/go.mod h1:OQgUZq7SjnE0b+8+iIAT2eqQF+2IFHn73tOo+aV11mg= -gitlab.com/xx_network/collections/ring.git v0.0.1 h1:3JLw2pgaOm57WWtjw6dvqvbud4DtoKxwYjEA95hNwgE= -gitlab.com/xx_network/collections/ring.git v0.0.1/go.mod h1:M61MlPiyB23ni0L1DJ8QErcUjOcnKEfbCpl75vE7Ej0= -gitlab.com/xx_network/comms v0.0.0-20200730220144-eea32e8b696d h1:P4ceawldsxuwQ6LZHnUnemtiOJI9/QquYi8QkFuUbtI= -gitlab.com/xx_network/comms v0.0.0-20200730220144-eea32e8b696d/go.mod h1:76OCijGBxYOBV5Kt7z6K7vNg3n9I57aCQMmI8GTpoEM= -gitlab.com/xx_network/comms v0.0.0-20200731231107-9e020daf0013 h1:sis9BdA5VNXUAamga/tpr4qHcJ01qugbMt6wBmaGyJ4= -gitlab.com/xx_network/comms v0.0.0-20200731231107-9e020daf0013/go.mod h1:ECW83bFGaOzZMM8axIWX6BsYpXakiM0Zf4Snp7H9+yI= +gitlab.com/elixxir/primitives v0.0.0-20200804170709-a1896d262cd9 h1:o0P00afLOlI3/98DR3G5IfGSTAO1ab/uzhPYzxE/Kcg= +gitlab.com/elixxir/primitives v0.0.0-20200804170709-a1896d262cd9/go.mod h1:p0VelQda72OzoUckr1O+vPW0AiFe0nyKQ6gYcmFSuF8= +gitlab.com/elixxir/primitives v0.0.0-20200804182913-788f47bded40 h1:S1cyRivF4MywQX10K8cGXux6Pbwy5dbWhsxs56G+8hs= +gitlab.com/elixxir/primitives v0.0.0-20200804182913-788f47bded40/go.mod h1:tzdFFvb1ESmuTCOl1z6+yf6oAICDxH2NPUemVgoNLxc= +gitlab.com/xx_network/comms v0.0.0-20200804225654-09a9af23d699 h1:e9rzUjMxt/4iQ5AVXVgwANvbgxxXgWEbvApgd6P72jU= +gitlab.com/xx_network/comms v0.0.0-20200804225654-09a9af23d699/go.mod h1:owEcxTRl7gsoM8c3RQ5KAm5GstxrJp5tn+6JfQ4z5Hw= +gitlab.com/xx_network/primitives v0.0.0-20200803231956-9b192c57ea7c/go.mod h1:wtdCMr7DPePz9qwctNoAUzZtbOSHSedcK++3Df3psjA= +gitlab.com/xx_network/primitives v0.0.0-20200804183002-f99f7a7284da h1:CCVslUwNC7Ul7NG5nu3ThGTSVUt1TxNRX+47f5TUwnk= +gitlab.com/xx_network/primitives v0.0.0-20200804183002-f99f7a7284da/go.mod h1:OK9xevzWCaPO7b1wiluVJGk7R5ZsuC7pHY5hteZFQug= +gitlab.com/xx_network/ring v0.0.2 h1:TlPjlbFdhtJrwvRgIg4ScdngMTaynx/ByHBRZiXCoL0= +gitlab.com/xx_network/ring v0.0.2/go.mod h1:aLzpP2TiZTQut/PVHR40EJAomzugDdHXetbieRClXIM= 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= @@ -203,8 +203,6 @@ golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73r golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= 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= @@ -224,8 +222,6 @@ golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7w 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= @@ -240,8 +236,6 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= 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= diff --git a/io/collate.go b/io/collate.go index c2d74635ed915576f807767f4f17d065e5b928aa..ae8edda7b2897d4b2563de0d089021581377570f 100644 --- a/io/collate.go +++ b/io/collate.go @@ -13,7 +13,7 @@ import ( "gitlab.com/elixxir/client/globals" "gitlab.com/elixxir/client/parse" "gitlab.com/elixxir/primitives/format" - "gitlab.com/elixxir/primitives/id" + "gitlab.com/xx_network/primitives/id" "sync" "time" ) diff --git a/io/collate_test.go b/io/collate_test.go index 274497f2519a478511de3c8f24ceffd1d2bb5195..31d78c3f1627d47d5a8035acd2e026686d99ef4e 100644 --- a/io/collate_test.go +++ b/io/collate_test.go @@ -11,7 +11,7 @@ import ( "encoding/hex" "gitlab.com/elixxir/client/parse" "gitlab.com/elixxir/primitives/format" - "gitlab.com/elixxir/primitives/id" + "gitlab.com/xx_network/primitives/id" "math/rand" "testing" "time" diff --git a/io/interface.go b/io/interface.go index 3352147ee359249751df963abe00487a6fd579e1..57e9cc9897c084a3413e11cd88875377632c4c4d 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/primitives/id" "gitlab.com/xx_network/comms/connect" + "gitlab.com/xx_network/primitives/id" "time" ) diff --git a/io/receive.go b/io/receive.go index ef5c5dbcba7c66037efa0d67935e762916c3cd07..1d7dd25890234e13a2ac65e7c5556ec42166b688 100644 --- a/io/receive.go +++ b/io/receive.go @@ -17,9 +17,9 @@ import ( 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" + "gitlab.com/xx_network/primitives/id" "strings" "time" ) diff --git a/io/receptionManager.go b/io/receptionManager.go index 467ab0ebd069c22dcad1600d90e5e9967afd1205..4386a28cc10613d6d4050175b5a1dd1b07ff4845 100644 --- a/io/receptionManager.go +++ b/io/receptionManager.go @@ -13,7 +13,7 @@ import ( "github.com/pkg/errors" "gitlab.com/elixxir/client/parse" "gitlab.com/elixxir/comms/client" - "gitlab.com/elixxir/primitives/id" + "gitlab.com/xx_network/primitives/id" "sync" "time" ) diff --git a/io/send.go b/io/send.go index 48da90e9d56036d7e9c180f874a8022f920368ef..74d008e18a969bc58603c1aa3247fada8749d6e4 100644 --- a/io/send.go +++ b/io/send.go @@ -22,8 +22,8 @@ import ( "gitlab.com/elixxir/crypto/e2e" "gitlab.com/elixxir/crypto/hash" "gitlab.com/elixxir/primitives/format" - "gitlab.com/elixxir/primitives/id" "gitlab.com/xx_network/comms/connect" + "gitlab.com/xx_network/primitives/id" "time" ) diff --git a/keyStore/keyManager.go b/keyStore/keyManager.go index a6938702fa624f69145c159f74a883ae46da1e7e..eedcd5702ca5a21d4dace16a9b4e46a40d2ec696 100644 --- a/keyStore/keyManager.go +++ b/keyStore/keyManager.go @@ -9,7 +9,7 @@ import ( "gitlab.com/elixxir/crypto/cyclic" "gitlab.com/elixxir/crypto/e2e" "gitlab.com/elixxir/primitives/format" - "gitlab.com/elixxir/primitives/id" + "gitlab.com/xx_network/primitives/id" "sync/atomic" ) diff --git a/keyStore/keyManager_test.go b/keyStore/keyManager_test.go index 3851e03e3e978539768f1d759ada70c3017b5ca0..1163b9185333e980f035c7b4497f2bcf7a5cfe9c 100644 --- a/keyStore/keyManager_test.go +++ b/keyStore/keyManager_test.go @@ -8,7 +8,7 @@ import ( "gitlab.com/elixxir/crypto/cyclic" "gitlab.com/elixxir/crypto/e2e" "gitlab.com/elixxir/crypto/large" - "gitlab.com/elixxir/primitives/id" + "gitlab.com/xx_network/primitives/id" "testing" ) diff --git a/keyStore/keyStore.go b/keyStore/keyStore.go index 8256cbde527b7025ea1842974b6c62df2b9de427..8efba3a8ad03fd2ea32005d82318fdd7b1481ee4 100644 --- a/keyStore/keyStore.go +++ b/keyStore/keyStore.go @@ -8,7 +8,7 @@ import ( "gitlab.com/elixxir/crypto/cyclic" "gitlab.com/elixxir/crypto/e2e" "gitlab.com/elixxir/primitives/format" - "gitlab.com/elixxir/primitives/id" + "gitlab.com/xx_network/primitives/id" "sync" ) diff --git a/keyStore/keyStore_test.go b/keyStore/keyStore_test.go index ee334ff3ad7147cb1d6ba2f02423f4f5f1705b4a..53891da174ab1d284892c676f166e591e96a6b08 100644 --- a/keyStore/keyStore_test.go +++ b/keyStore/keyStore_test.go @@ -5,7 +5,7 @@ import ( "encoding/gob" "github.com/pkg/errors" "gitlab.com/elixxir/primitives/format" - "gitlab.com/elixxir/primitives/id" + "gitlab.com/xx_network/primitives/id" "testing" ) diff --git a/keyStore/recieveKeyManagerBuffer_test.go b/keyStore/recieveKeyManagerBuffer_test.go index a9caec7d1dba38af6a53253a26b64b518df0688b..e4680eeb8a451b31ea42950a094eb78e5754b578 100644 --- a/keyStore/recieveKeyManagerBuffer_test.go +++ b/keyStore/recieveKeyManagerBuffer_test.go @@ -3,7 +3,7 @@ package keyStore import ( "bytes" "encoding/gob" - "gitlab.com/elixxir/primitives/id" + "gitlab.com/xx_network/primitives/id" "testing" ) diff --git a/keyStore/rekeyManager.go b/keyStore/rekeyManager.go index cfb0442141a2ac3f93c871d1d35decb953e4afb0..64e87ef466dfde92e449a94b1a152d9c1d78f5b5 100644 --- a/keyStore/rekeyManager.go +++ b/keyStore/rekeyManager.go @@ -2,7 +2,7 @@ package keyStore import ( "gitlab.com/elixxir/crypto/cyclic" - "gitlab.com/elixxir/primitives/id" + "gitlab.com/xx_network/primitives/id" "sync" ) diff --git a/keyStore/rekeyManager_test.go b/keyStore/rekeyManager_test.go index 87072da6f788bbc5c7e6aae38fea5e7e0c8d6b96..a41a5ed5a2289b9ee3e80d817a76f298c6e29922 100644 --- a/keyStore/rekeyManager_test.go +++ b/keyStore/rekeyManager_test.go @@ -3,7 +3,7 @@ package keyStore import ( "gitlab.com/elixxir/crypto/cyclic" "gitlab.com/elixxir/crypto/large" - "gitlab.com/elixxir/primitives/id" + "gitlab.com/xx_network/primitives/id" "testing" ) diff --git a/parse/message.go b/parse/message.go index 9e626dc2c524e9660275ee74854769b0852cd689..c6f01dba8d011050f79b69da5c235ba7bfc26faa 100644 --- a/parse/message.go +++ b/parse/message.go @@ -8,7 +8,7 @@ package parse import ( "crypto/sha256" - "gitlab.com/elixxir/primitives/id" + "gitlab.com/xx_network/primitives/id" "time" ) diff --git a/parse/message_test.go b/parse/message_test.go index 15933f84cfa7c526a2b4cf1dd33af1c63eca751f..6f4ddc224bc4b1b79ba435c1697107de934f99dc 100644 --- a/parse/message_test.go +++ b/parse/message_test.go @@ -7,7 +7,7 @@ package parse import ( - "gitlab.com/elixxir/primitives/id" + "gitlab.com/xx_network/primitives/id" "reflect" "testing" "time" diff --git a/rekey/rekey.go b/rekey/rekey.go index b013ad245f9b5d53994e4466756d81eb525ef831..737c94656efde87f3a7a2b16755e211b5545428f 100644 --- a/rekey/rekey.go +++ b/rekey/rekey.go @@ -14,9 +14,9 @@ import ( "gitlab.com/elixxir/crypto/e2e" "gitlab.com/elixxir/crypto/hash" "gitlab.com/elixxir/primitives/format" - "gitlab.com/elixxir/primitives/id" "gitlab.com/elixxir/primitives/switchboard" "gitlab.com/xx_network/comms/connect" + "gitlab.com/xx_network/primitives/id" ) var session user.Session diff --git a/rekey/rekey_test.go b/rekey/rekey_test.go index cd9019f5f82024a89e7fb1da845745effdbfd892..43d430ec0ef9307c757b37ca737b622bcba876f5 100644 --- a/rekey/rekey_test.go +++ b/rekey/rekey_test.go @@ -16,8 +16,8 @@ import ( "gitlab.com/elixxir/crypto/hash" "gitlab.com/elixxir/crypto/large" "gitlab.com/elixxir/crypto/signature/rsa" - "gitlab.com/elixxir/primitives/id" "gitlab.com/xx_network/comms/connect" + "gitlab.com/xx_network/primitives/id" "os" "testing" "time" diff --git a/user/regCode.go b/user/regCode.go index 65094ad616ef680f8ea7a193d505c45e00cc1dc8..1914d03a26a27b36f6574c5a3b806b7d6b07d7e4 100644 --- a/user/regCode.go +++ b/user/regCode.go @@ -2,7 +2,7 @@ package user import ( "encoding/base32" - "gitlab.com/elixxir/primitives/id" + "gitlab.com/xx_network/primitives/id" "golang.org/x/crypto/blake2b" ) diff --git a/user/session.go b/user/session.go index 04665d6579c272144b08d222d7d7e911c882881b..6852269eeba22a5212571cc7575fbdec8a62d035 100644 --- a/user/session.go +++ b/user/session.go @@ -20,9 +20,9 @@ import ( "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" + "gitlab.com/xx_network/primitives/id" "io" "sync" "sync/atomic" diff --git a/user/session_test.go b/user/session_test.go index ddf7201574ec3eb66bd06c5bb87c8932d4ccd5e5..d0a2805a25d8e8bb9b3ff08c05057cf57f80f972 100644 --- a/user/session_test.go +++ b/user/session_test.go @@ -15,8 +15,8 @@ import ( "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" + "gitlab.com/xx_network/primitives/id" "math/rand" "reflect" "testing" diff --git a/user/sessionv1.go b/user/sessionv1.go index 3f470aa558447c8edf0aad156db45e6a23d52d21..e6bfcf41666fae2067a9adabfe2beb433108c09f 100644 --- a/user/sessionv1.go +++ b/user/sessionv1.go @@ -10,8 +10,8 @@ import ( "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/primitives/id" "sync" ) diff --git a/user/user.go b/user/user.go index 45e0bc65cf265247df30e08c830ee87d958f006c..e0fd215fafe43556ccdad059dba92d9391ce24b5 100644 --- a/user/user.go +++ b/user/user.go @@ -11,7 +11,7 @@ import ( "encoding/binary" "gitlab.com/elixxir/client/globals" "gitlab.com/elixxir/crypto/cyclic" - "gitlab.com/elixxir/primitives/id" + "gitlab.com/xx_network/primitives/id" ) // Globally instantiated Registry diff --git a/user/user_test.go b/user/user_test.go index 52d303e432c7c0a686b30406db2b130a7b46ce73..6f20a4b8c7e823e27ccbecf79145878e56de73bd 100644 --- a/user/user_test.go +++ b/user/user_test.go @@ -10,7 +10,7 @@ import ( "crypto/sha256" "gitlab.com/elixxir/crypto/cyclic" "gitlab.com/elixxir/crypto/large" - "gitlab.com/elixxir/primitives/id" + "gitlab.com/xx_network/primitives/id" "testing" ) diff --git a/version_vars.go.bak b/version_vars.go.bak index 766e1c9b13bb096954c1fad0d3169f7357b4dc2b..2edb6b9853fa3114313140e0aebe758b6652b497 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-08-03 10:45:37.897014448 -0700 PDT m=+0.010920997 +// 2020-08-04 16:00:18.998691 -0700 PDT m=+0.035383254 package cmd -const GITVERSION = `eacc031 Merge branch 'release' of gitlab.com:elixxir/client into XX-2431/ClientAuth` +const GITVERSION = `8a10037 rerun go mod` const SEMVER = "1.4.0" const DEPENDENCIES = `module gitlab.com/elixxir/client @@ -22,17 +22,15 @@ 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-20200731222525-4309a98f7b4d - gitlab.com/elixxir/crypto v0.0.0-20200721213839-b026955c55c0 + gitlab.com/elixxir/comms v0.0.0-20200804225939-84dbe3cccc62 + gitlab.com/elixxir/crypto v0.0.0-20200804182833-984246dea2c4 gitlab.com/elixxir/ekv v0.0.0-20200729182028-159355ea5842 - gitlab.com/elixxir/primitives v0.0.0-20200731184040-494269b53b4d - gitlab.com/xx_network/comms v0.0.0-20200731231107-9e020daf0013 + gitlab.com/elixxir/primitives v0.0.0-20200804182913-788f47bded40 + gitlab.com/xx_network/comms v0.0.0-20200804225654-09a9af23d699 + gitlab.com/xx_network/primitives v0.0.0-20200804183002-f99f7a7284da golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899 gopkg.in/ini.v1 v1.52.0 // indirect ) -replace ( - gitlab.com/xx_network/collections/ring => gitlab.com/xx_network/collections/ring.git v0.0.1 - google.golang.org/grpc => github.com/grpc/grpc-go v1.27.1 -) +replace google.golang.org/grpc => github.com/grpc/grpc-go v1.27.1 `