From a0047d3adc6d7dff030289441070c0477adb99b2 Mon Sep 17 00:00:00 2001
From: Sydney Anne Erickson <sydney@elixxir.io>
Date: Tue, 4 Aug 2020 11:07:19 -0700
Subject: [PATCH] Use xxn primitives ID and NDF packages
---
Makefile | 2 ++
api/client.go | 4 ++--
api/client_test.go | 2 +-
api/connect.go | 4 ++--
api/mockserver.go | 6 +++---
api/mockserver_test.go | 4 ++--
api/ndf_test.go | 2 +-
api/notifications.go | 2 +-
api/private.go | 4 ++--
api/register.go | 4 ++--
api/register_test.go | 2 +-
bindings/client.go | 2 +-
bindings/client_test.go | 6 +++---
bots/bots.go | 2 +-
bots/bots_test.go | 2 +-
bots/userDiscovery.go | 2 +-
cmd/root.go | 2 +-
cmd/udb.go | 2 +-
crypto/encryptdecrypt_test.go | 2 +-
globals/version_vars.go | 13 +++++++------
go.mod | 9 +++++----
go.sum | 20 ++++++++++++--------
io/collate.go | 2 +-
io/collate_test.go | 2 +-
io/interface.go | 2 +-
io/receive.go | 2 +-
io/receptionManager.go | 2 +-
io/send.go | 2 +-
keyStore/keyManager.go | 2 +-
keyStore/keyManager_test.go | 2 +-
keyStore/keyStore.go | 2 +-
keyStore/keyStore_test.go | 2 +-
keyStore/recieveKeyManagerBuffer_test.go | 2 +-
keyStore/rekeyManager.go | 2 +-
keyStore/rekeyManager_test.go | 2 +-
parse/message.go | 2 +-
parse/message_test.go | 2 +-
rekey/rekey.go | 2 +-
rekey/rekey_test.go | 2 +-
user/regCode.go | 2 +-
user/session.go | 2 +-
user/session_test.go | 2 +-
user/sessionv1.go | 2 +-
user/user.go | 2 +-
user/user_test.go | 2 +-
version_vars.go.bak | 13 +++++++------
46 files changed, 83 insertions(+), 74 deletions(-)
diff --git a/Makefile b/Makefile
index b8d85b2d4..9c16bd45c 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 820c3457a..096940e9a 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 bebd23da9..eae9cc498 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 928e47f63..212df62a7 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 0e487eefa..c0007a135 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 093f29e5e..62e5950bc 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 3a113b52c..22b3f3c2d 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 5d27bf73d..a7587f4f8 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 bc76f0f36..bc0f6256f 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 921738be2..407dacc23 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 5c0ab24a5..fc8757653 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 480a55fe8..b4656017f 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 c3f2e70df..e27368ac1 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 6cf0bdc3c..815e18337 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 6f0c7edba..f827bf3d4 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 d84976c95..cf447b976 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 825cb3218..ebf02de19 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 ed39e5d8b..9935a5382 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 7cc9ad2c8..3e7d30506 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 c3523d28d..c75ae1e4d 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 11:06:16.096627 -0700 PDT m=+0.021776277
package globals
-const GITVERSION = `eacc031 Merge branch 'release' of gitlab.com:elixxir/client into XX-2431/ClientAuth`
+const GITVERSION = `fe3e8ed Merge branch 'Nigel/ClientAuthentication' into 'release'`
const SEMVER = "1.4.0"
const DEPENDENCIES = `module gitlab.com/elixxir/client
@@ -22,11 +22,12 @@ 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-20200804173225-11345b774364
+ gitlab.com/elixxir/crypto v0.0.0-20200804172431-132b6336c177
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-20200804170709-a1896d262cd9
+ gitlab.com/xx_network/comms v0.0.0-20200804173440-47aa0850e752
+ gitlab.com/xx_network/primitives v0.0.0-20200804174346-bfd30843a99b
golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899
gopkg.in/ini.v1 v1.52.0 // indirect
)
diff --git a/go.mod b/go.mod
index 14162fb37..f9bcfa6a2 100644
--- a/go.mod
+++ b/go.mod
@@ -15,11 +15,12 @@ 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-20200804173225-11345b774364
+ gitlab.com/elixxir/crypto v0.0.0-20200804172431-132b6336c177
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-20200804170709-a1896d262cd9
+ gitlab.com/xx_network/comms v0.0.0-20200804173440-47aa0850e752
+ gitlab.com/xx_network/primitives v0.0.0-20200804174346-bfd30843a99b
golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899
gopkg.in/ini.v1 v1.52.0 // indirect
)
diff --git a/go.sum b/go.sum
index aac5d3753..743a0b195 100644
--- a/go.sum
+++ b/go.sum
@@ -162,24 +162,28 @@ github.com/zeebo/assert v1.1.0/go.mod h1:Pq9JiuJQpG8JLJdtkwrJESF0Foym2/D9XMU5ciN
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/comms v0.0.0-20200804173225-11345b774364 h1:/MYOVCT9v9o6QDe9VS/xGQKcIBf5pFP1DNA2KuqDe08=
+gitlab.com/elixxir/comms v0.0.0-20200804173225-11345b774364/go.mod h1:o70rWpTfo0Aa2LIHxjROCRvMmWDMgT63nW3qCRuc+Oc=
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/crypto v0.0.0-20200804172431-132b6336c177 h1:d9jvcPRphQg10B4VCfouYuUTOyb4YVcK8Q3JiQ2vS1Y=
+gitlab.com/elixxir/crypto v0.0.0-20200804172431-132b6336c177/go.mod h1:pfSkSwO6hMM2emQowlDKQ5lQ3zGXqTLLssyPT1VTYCw=
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/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/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/xx_network/comms v0.0.0-20200804172826-ac4a8f923f23/go.mod h1:Qg7dyO6DHgHzjUM1IQ5nbFoRyzx5wVZAjf4FOTeu8mA=
+gitlab.com/xx_network/comms v0.0.0-20200804173440-47aa0850e752 h1:D5gDCaKHJhg+UxTYBC3j3rotBRMHTT3mVOt6KQ4xzwE=
+gitlab.com/xx_network/comms v0.0.0-20200804173440-47aa0850e752/go.mod h1:kvYZ3HnfRvrjDp/hXR3P01kKOuXjq08dQEdVBDuyOQs=
+gitlab.com/xx_network/primitives v0.0.0-20200803231956-9b192c57ea7c/go.mod h1:wtdCMr7DPePz9qwctNoAUzZtbOSHSedcK++3Df3psjA=
+gitlab.com/xx_network/primitives v0.0.0-20200804174346-bfd30843a99b h1:nZnayke+H8ddamTbJnKz1Dw0qjy1fWICviWO46Q5IBc=
+gitlab.com/xx_network/primitives v0.0.0-20200804174346-bfd30843a99b/go.mod h1:wtdCMr7DPePz9qwctNoAUzZtbOSHSedcK++3Df3psjA=
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=
diff --git a/io/collate.go b/io/collate.go
index c2d74635e..ae8edda7b 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 274497f25..31d78c3f1 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 3352147ee..57e9cc989 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 ef5c5dbcb..1d7dd2589 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 467ab0ebd..4386a28cc 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 48da90e9d..74d008e18 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 a6938702f..eedcd5702 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 3851e03e3..1163b9185 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 8256cbde5..8efba3a8a 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 ee334ff3a..53891da17 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 a9caec7d1..e4680eeb8 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 cfb044214..64e87ef46 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 87072da6f..a41a5ed5a 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 9e626dc2c..c6f01dba8 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 15933f84c..6f4ddc224 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 b013ad245..737c94656 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 cd9019f5f..43d430ec0 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 65094ad61..1914d03a2 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 04665d657..6852269ee 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 ddf720157..d0a2805a2 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 3f470aa55..e6bfcf416 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 45e0bc65c..e0fd215fa 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 52d303e43..6f20a4b8c 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 766e1c9b1..c0b38feff 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 11:06:16.096627 -0700 PDT m=+0.021776277
package cmd
-const GITVERSION = `eacc031 Merge branch 'release' of gitlab.com:elixxir/client into XX-2431/ClientAuth`
+const GITVERSION = `fe3e8ed Merge branch 'Nigel/ClientAuthentication' into 'release'`
const SEMVER = "1.4.0"
const DEPENDENCIES = `module gitlab.com/elixxir/client
@@ -22,11 +22,12 @@ 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-20200804173225-11345b774364
+ gitlab.com/elixxir/crypto v0.0.0-20200804172431-132b6336c177
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-20200804170709-a1896d262cd9
+ gitlab.com/xx_network/comms v0.0.0-20200804173440-47aa0850e752
+ gitlab.com/xx_network/primitives v0.0.0-20200804174346-bfd30843a99b
golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899
gopkg.in/ini.v1 v1.52.0 // indirect
)
--
GitLab