Use xxn primitives ID and NDF packages

Makefile

@@ -20,12 +20,14 @@ build:
 
 update_release:
 	GOFLAGS="" go get -u gitlab.com/elixxir/primitives@release
+	GOFLAGS="" go get -u gitlab.com/xx_network/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/elixxir/client@release
 
 update_master:
 	GOFLAGS="" go get -u gitlab.com/elixxir/primitives@master
+	GOFLAGS="" go get -u gitlab.com/xx_network/primitives@release
 	GOFLAGS="" go get -u gitlab.com/elixxir/crypto@master
 	GOFLAGS="" go get -u gitlab.com/elixxir/comms@master
 	GOFLAGS="" go get -u gitlab.com/elixxir/client@master

cmd/udb.go

@@ -18,8 +18,8 @@ import (
 	"gitlab.com/elixxir/client/user"
 	"gitlab.com/elixxir/comms/mixmessages"
 	"gitlab.com/elixxir/crypto/csprng"
-	"gitlab.com/elixxir/primitives/id"
-	"gitlab.com/elixxir/primitives/ndf"
+	" gitlab.com/xx_network/primitives/id"
+	" gitlab.com/xx_network/primitives/ndf"
 	"gitlab.com/elixxir/user-discovery-bot/udb"
 	"math/big"
 	"os"

go.mod

@@ -18,9 +18,10 @@ require (
 	github.com/spf13/jwalterweatherman v1.1.0
 	github.com/spf13/viper v1.7.0
 	gitlab.com/elixxir/client v1.2.1-0.20200730222826-df9c2c68f271
-	gitlab.com/elixxir/comms v0.0.0-20200730220537-60dbe58afe94
-	gitlab.com/elixxir/crypto v0.0.0-20200707005343-97f868cbd930
-	gitlab.com/elixxir/primitives v0.0.0-20200706165052-9fe7a4fb99a3
+	gitlab.com/elixxir/comms v0.0.0-20200804173225-11345b774364
+	gitlab.com/elixxir/crypto v0.0.0-20200804182833-984246dea2c4
+	gitlab.com/elixxir/primitives v0.0.0-20200804182913-788f47bded40
+	gitlab.com/xx_network/primitives v0.0.0-20200804183002-f99f7a7284da // indirect
 	golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de // indirect
 	golang.org/x/sys v0.0.0-20200728102440-3e129f6d46b1 // indirect
 	google.golang.org/genproto v0.0.0-20200730144737-007c33dbd381 // indirect

go.sum

@@ -105,6 +105,7 @@ github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/ad
 github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=
 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
 github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
+github.com/grpc/grpc-go v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
 github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q=
 github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8=
 github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
@@ -254,18 +255,46 @@ github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1
 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=
+github.com/zeebo/assert v0.0.0-20181109011804-10f827ce2ed6/go.mod h1:yssERNPivllc1yU3BvpjYI5BUW+zglcz6QWqeVRL5t0=
+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/client v1.2.1-0.20200730222826-df9c2c68f271 h1:UZZPsDF32Hpwx7qO04bO8V7MKgtE3fMb9RT8ELIj1dM=
 gitlab.com/elixxir/client v1.2.1-0.20200730222826-df9c2c68f271/go.mod h1:a6AKq+cT9kHygJf/TfkVTiFkK9M301PnsU40VbwnGnw=
 gitlab.com/elixxir/comms v0.0.0-20200707210150-b8ebd0951d23/go.mod h1:OsWMZ1O/R9fOkm+PoHnR3rkXfFtipGoPs73FuKuurHY=
 gitlab.com/elixxir/comms v0.0.0-20200730220537-60dbe58afe94 h1:AY3Nm9QXAh8jRUyKdX0jsay4A4j4z7/ofJgJKbvIFmc=
 gitlab.com/elixxir/comms v0.0.0-20200730220537-60dbe58afe94/go.mod h1:rlB+AA0mNMRq9GIR587cNw5RX4Cr8VOiVpZkFTTcukQ=
+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-20200804172431-132b6336c177 h1:d9jvcPRphQg10B4VCfouYuUTOyb4YVcK8Q3JiQ2vS1Y=
+gitlab.com/elixxir/crypto v0.0.0-20200804172431-132b6336c177/go.mod h1:pfSkSwO6hMM2emQowlDKQ5lQ3zGXqTLLssyPT1VTYCw=
+gitlab.com/elixxir/crypto v0.0.0-20200804181908-c06f93aeec5b h1:x2ilVfBjzgI5y2G6GADZyCMLph1BlF5z7TO/8fYL5aI=
+gitlab.com/elixxir/crypto v0.0.0-20200804181908-c06f93aeec5b/go.mod h1:RUjMK+1PDlx5HreLcm2l53lWeXFO7VDg8p6vM1YKMjI=
+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/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/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/elixxir/primitives v0.0.0-20200804182322-65eba77774cb h1:QTMsP2b5BHAUs7ZI5rvtWqq+9WRGN6vzf8fOVk3hP2w=
+gitlab.com/elixxir/primitives v0.0.0-20200804182322-65eba77774cb/go.mod h1:d8jMHHRtAwL8CanHb4Sff6epQthpk2eRsxRB6cnZpfI=
+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/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-20200804172826-ac4a8f923f23/go.mod h1:Qg7dyO6DHgHzjUM1IQ5nbFoRyzx5wVZAjf4FOTeu8mA=
+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=
+gitlab.com/xx_network/primitives v0.0.0-20200804181800-b22f59fba9f9 h1:8ZEF6fGvhbG051SbSAElWk53kZnZkY5CR3Sy6R8xQdM=
+gitlab.com/xx_network/primitives v0.0.0-20200804181800-b22f59fba9f9/go.mod h1:7+BcRWU2Gcax/0Ae0nQpmuty6lGnd+f+oXpdsCUk6ww=
+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=
 go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
 go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
 go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
@@ -351,6 +380,7 @@ golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 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=

storage/database.go

@@ -9,7 +9,7 @@ import (
 	"github.com/go-pg/pg"
 	"github.com/go-pg/pg/orm"
 	"gitlab.com/elixxir/client/globals"
-	"gitlab.com/elixxir/primitives/id"
+	" gitlab.com/xx_network/primitives/id"
 )
 
 // Struct implementing the Database Interface with an underlying DB

storage/dbBackend.go

@@ -11,7 +11,7 @@ package storage
 import (
 	"fmt"
 	"github.com/pkg/errors"
-	"gitlab.com/elixxir/primitives/id"
+	" gitlab.com/xx_network/primitives/id"
 )
 
 // Insert or Update a User into the database

storage/mapBackend.go

@@ -12,7 +12,7 @@ import (
 	"bytes"
 	"fmt"
 	"github.com/pkg/errors"
-	"gitlab.com/elixxir/primitives/id"
+	" gitlab.com/xx_network/primitives/id"
 	"strings"
 	"sync"
 )

storage/mapBackend_test.go

@@ -7,7 +7,7 @@
 package storage
 
 import (
-	"gitlab.com/elixxir/primitives/id"
+	" gitlab.com/xx_network/primitives/id"
 	"reflect"
 	"testing"
 )

udb/receive.go

@@ -13,7 +13,7 @@ import (
 	"gitlab.com/elixxir/client/api"
 	"gitlab.com/elixxir/client/cmixproto"
 	"gitlab.com/elixxir/client/parse"
-	"gitlab.com/elixxir/primitives/id"
+	" gitlab.com/xx_network/primitives/id"
 	"gitlab.com/elixxir/primitives/switchboard"
 )
 

udb/register.go

@@ -13,7 +13,7 @@ import (
 	"gitlab.com/elixxir/client/cmixproto"
 	"gitlab.com/elixxir/client/globals"
 	"gitlab.com/elixxir/crypto/csprng"
-	"gitlab.com/elixxir/primitives/id"
+	" gitlab.com/xx_network/primitives/id"
 	"gitlab.com/elixxir/user-discovery-bot/fingerprint"
 	"gitlab.com/elixxir/user-discovery-bot/storage"
 	"strings"

udb/register_test.go

@@ -17,8 +17,8 @@ import (
 	"gitlab.com/elixxir/client/parse"
 	"gitlab.com/elixxir/client/user"
 	"gitlab.com/elixxir/comms/gateway"
-	"gitlab.com/elixxir/primitives/id"
-	"gitlab.com/elixxir/primitives/ndf"
+	" gitlab.com/xx_network/primitives/id"
+	" gitlab.com/xx_network/primitives/ndf"
 	fingerprint2 "gitlab.com/elixxir/user-discovery-bot/fingerprint"
 	"gitlab.com/elixxir/user-discovery-bot/storage"
 	"math/rand"

udb/search.go

@@ -11,7 +11,7 @@ import (
 	"encoding/base64"
 	"fmt"
 	"gitlab.com/elixxir/client/cmixproto"
-	"gitlab.com/elixxir/primitives/id"
+	" gitlab.com/xx_network/primitives/id"
 	"gitlab.com/elixxir/user-discovery-bot/storage"
 )
 

udb/search_test.go

@@ -9,7 +9,7 @@ package udb
 import (
 	"fmt"
 	"gitlab.com/elixxir/client/cmixproto"
-	"gitlab.com/elixxir/primitives/id"
+	" gitlab.com/xx_network/primitives/id"
 	"gitlab.com/elixxir/user-discovery-bot/storage"
 	"testing"
 )

udb/send.go

@@ -11,7 +11,7 @@ import (
 	"gitlab.com/elixxir/client/api"
 	"gitlab.com/elixxir/client/cmixproto"
 	"gitlab.com/elixxir/client/parse"
-	"gitlab.com/elixxir/primitives/id"
+	" gitlab.com/xx_network/primitives/id"
 )
 
 // Sender interface -- the api is broken here (does not return the error), so