diff --git a/Makefile b/Makefile
index d21ac4e6dddc60340d3f375f1578ed2676e0601d..646a2c4682dee5b1df49ffc6ab49e326e1daf286 100644
--- a/Makefile
+++ b/Makefile
@@ -18,11 +18,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/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/xx_network/comms@master
+ GOFLAGS="" go get -u gitlab.com/xx_network/primitives@master
master: clean update_master build
diff --git a/client/client.go b/client/client.go
index 7b8d91b5047353df02a57d076ddd308f321e317a..01ed23634bd2244ae521e09a1d64abe5fc78845d 100644
--- a/client/client.go
+++ b/client/client.go
@@ -11,8 +11,8 @@ package client
import (
"github.com/pkg/errors"
- "gitlab.com/elixxir/primitives/id"
"gitlab.com/xx_network/comms/connect"
+ "gitlab.com/xx_network/primitives/id"
)
// Client object used to implement endpoints and top-level comms functionality
diff --git a/client/gateway_test.go b/client/gateway_test.go
index 7cf2b6955cfcad4ba479620749bff4a8ef408d71..4f6b12daeb4de9f40a28ebee9465774ec733a546 100644
--- a/client/gateway_test.go
+++ b/client/gateway_test.go
@@ -10,8 +10,8 @@ package client
import (
"gitlab.com/elixxir/comms/gateway"
pb "gitlab.com/elixxir/comms/mixmessages"
- "gitlab.com/elixxir/primitives/id"
"gitlab.com/xx_network/comms/connect"
+ "gitlab.com/xx_network/primitives/id"
"testing"
)
diff --git a/client/mockServer_test.go b/client/mockServer_test.go
index d0ef14a4f883b5abf68a9c208986e77fa49226df..73079cacac1c399c1d5ec9af4d0106cb311126cd 100644
--- a/client/mockServer_test.go
+++ b/client/mockServer_test.go
@@ -14,9 +14,9 @@ import (
"github.com/pkg/errors"
pb "gitlab.com/elixxir/comms/mixmessages"
"gitlab.com/elixxir/comms/testutils"
- "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"
"sync"
)
diff --git a/client/notificationBot_test.go b/client/notificationBot_test.go
index 8dd06823f40035f24cd1d445ebe1961c72b7525f..70ec1a102e1b15dc738e81bc3153e522c57b29cc 100644
--- a/client/notificationBot_test.go
+++ b/client/notificationBot_test.go
@@ -10,8 +10,8 @@ package client
import (
pb "gitlab.com/elixxir/comms/mixmessages"
"gitlab.com/elixxir/comms/notificationBot"
- "gitlab.com/elixxir/primitives/id"
"gitlab.com/xx_network/comms/connect"
+ "gitlab.com/xx_network/primitives/id"
"testing"
)
diff --git a/client/registration.go b/client/registration.go
index 150f5c754b6a76cb7604c6c0215ca88dc2f892b2..41bac1e91931f25a2fd08846d6da071ae6c73d08 100644
--- a/client/registration.go
+++ b/client/registration.go
@@ -16,10 +16,10 @@ import (
"github.com/pkg/errors"
jww "github.com/spf13/jwalterweatherman"
pb "gitlab.com/elixxir/comms/mixmessages"
- "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"
"google.golang.org/grpc"
"strings"
"time"
diff --git a/client/registration_test.go b/client/registration_test.go
index 360f88f9da02a017a980949ac08d033964c9756b..ec8ea689d6445767733221a5b488c29c4acc909f 100644
--- a/client/registration_test.go
+++ b/client/registration_test.go
@@ -11,9 +11,9 @@ import (
pb "gitlab.com/elixxir/comms/mixmessages"
"gitlab.com/elixxir/comms/registration"
"gitlab.com/elixxir/comms/testutils"
- "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"
"testing"
)
diff --git a/gateway/endpoint.go b/gateway/endpoint.go
index f5f20ecf7122af4a550c30c53bf4408bd9a5ae6c..5a3b74e4028501df54859f91b5fbf911c4bd0cd0 100644
--- a/gateway/endpoint.go
+++ b/gateway/endpoint.go
@@ -12,9 +12,9 @@ package gateway
import (
"github.com/pkg/errors"
pb "gitlab.com/elixxir/comms/mixmessages"
- "gitlab.com/elixxir/primitives/id"
"gitlab.com/xx_network/comms/connect"
"gitlab.com/xx_network/comms/messages"
+ "gitlab.com/xx_network/primitives/id"
"golang.org/x/net/context"
)
diff --git a/gateway/gateway_test.go b/gateway/gateway_test.go
index e0ffb5007649877a1317418e2246d72161898710..b532f3265e812b3dd9cb95f6a5902e157e34d4b2 100644
--- a/gateway/gateway_test.go
+++ b/gateway/gateway_test.go
@@ -12,8 +12,8 @@ import (
"gitlab.com/elixxir/comms/mixmessages"
"gitlab.com/elixxir/comms/node"
"gitlab.com/elixxir/comms/testkeys"
- "gitlab.com/elixxir/primitives/id"
"gitlab.com/xx_network/comms/connect"
+ "gitlab.com/xx_network/primitives/id"
"sync"
"testing"
)
diff --git a/gateway/handler.go b/gateway/handler.go
index 362a2c8b20927872ff2695fe624e7f6ceb21f5d5..897217ee4a37e972954e8c67d0726eb9f960d97f 100644
--- a/gateway/handler.go
+++ b/gateway/handler.go
@@ -13,9 +13,9 @@ import (
"github.com/pkg/errors"
jww "github.com/spf13/jwalterweatherman"
pb "gitlab.com/elixxir/comms/mixmessages"
- "gitlab.com/elixxir/primitives/id"
"gitlab.com/xx_network/comms/connect"
"gitlab.com/xx_network/comms/messages"
+ "gitlab.com/xx_network/primitives/id"
"google.golang.org/grpc/reflection"
"runtime/debug"
)
diff --git a/gateway/registration_test.go b/gateway/registration_test.go
index 0c544bd91515e7920959a702bd4d3f86f25e7bc4..a0b8d10d3e57d9f03a9d3c269d9751201cd6897e 100644
--- a/gateway/registration_test.go
+++ b/gateway/registration_test.go
@@ -10,9 +10,9 @@ package gateway
import (
pb "gitlab.com/elixxir/comms/mixmessages"
"gitlab.com/elixxir/comms/node"
- "gitlab.com/elixxir/primitives/id"
"gitlab.com/xx_network/comms/connect"
"gitlab.com/xx_network/comms/messages"
+ "gitlab.com/xx_network/primitives/id"
"testing"
)
diff --git a/gateway/sendBatch_test.go b/gateway/sendBatch_test.go
index 1af6d2ee64380a7777ea7fe444440712e66859a1..db3f842b223ddc6bd99cc06a00b274f5cfc5fdbd 100644
--- a/gateway/sendBatch_test.go
+++ b/gateway/sendBatch_test.go
@@ -10,8 +10,8 @@ package gateway
import (
pb "gitlab.com/elixxir/comms/mixmessages"
"gitlab.com/elixxir/comms/node"
- "gitlab.com/elixxir/primitives/id"
"gitlab.com/xx_network/comms/connect"
+ "gitlab.com/xx_network/primitives/id"
"testing"
)
diff --git a/go.mod b/go.mod
index 8e9db630e8fc4f0836244a9582f6d8e6483feca7..394104af7237ee93a566a8032fbd8053ab3114c8 100644
--- a/go.mod
+++ b/go.mod
@@ -7,10 +7,11 @@ require (
github.com/pkg/errors v0.9.1
github.com/spf13/jwalterweatherman v1.1.0
github.com/stretchr/testify v1.6.1 // indirect
- gitlab.com/elixxir/crypto v0.0.0-20200721213839-b026955c55c0
- gitlab.com/elixxir/primitives v0.0.0-20200731184040-494269b53b4d
+ gitlab.com/elixxir/crypto v0.0.0-20200804172431-132b6336c177
+ gitlab.com/elixxir/primitives v0.0.0-20200804170709-a1896d262cd9
gitlab.com/xx_network/collections/ring v0.0.0-00010101000000-000000000000
- gitlab.com/xx_network/comms v0.0.0-20200731231107-9e020daf0013
+ gitlab.com/xx_network/comms v0.0.0-20200804172826-ac4a8f923f23
+ gitlab.com/xx_network/primitives v0.0.0-20200803231956-9b192c57ea7c
golang.org/x/crypto v0.0.0-20200707235045-ab33eee955e0 // indirect
golang.org/x/net v0.0.0-20200707034311-ab3426394381
golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae // indirect
diff --git a/go.sum b/go.sum
index 19ce42af917a481329c13f6ec18f014f278587ec..e2e32f743156e374c48ed2ffbb7629a131ee5b6a 100644
--- a/go.sum
+++ b/go.sum
@@ -55,16 +55,24 @@ github.com/zeebo/pcg v0.0.0-20181207190024-3cdc6b625a05/go.mod h1:Gr+78ptB0MwXxm
gitlab.com/elixxir/comms v0.0.0-20200707210150-b8ebd0951d23/go.mod h1:OsWMZ1O/R9fOkm+PoHnR3rkXfFtipGoPs73FuKuurHY=
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-20200803223738-661ca14b6470 h1:WGECBA9PtyUk9RfkpHjcbySoXfByEBTaD5IUHmjGem4=
+gitlab.com/elixxir/crypto v0.0.0-20200803223738-661ca14b6470/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/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-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-20200803203304-a7a1c5e4239d h1:mU4Gk9IivWABbzAuibA4887yANHYOohlWq4Y4BvzR+8=
+gitlab.com/xx_network/comms v0.0.0-20200803203304-a7a1c5e4239d/go.mod h1:Qg7dyO6DHgHzjUM1IQ5nbFoRyzx5wVZAjf4FOTeu8mA=
+gitlab.com/xx_network/comms v0.0.0-20200804172826-ac4a8f923f23 h1:nJ9mxIbEh0RPv68G/7dxZZmJOGUO83Ca9/H+EDU13wk=
+gitlab.com/xx_network/comms v0.0.0-20200804172826-ac4a8f923f23/go.mod h1:Qg7dyO6DHgHzjUM1IQ5nbFoRyzx5wVZAjf4FOTeu8mA=
+gitlab.com/xx_network/primitives v0.0.0-20200803231956-9b192c57ea7c h1:tGe3QtCC6St63FuxVAaDtHSx0BCNqzCsfjbRo5jacWM=
+gitlab.com/xx_network/primitives v0.0.0-20200803231956-9b192c57ea7c/go.mod h1:wtdCMr7DPePz9qwctNoAUzZtbOSHSedcK++3Df3psjA=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI=
diff --git a/mixmessages/roundInfo.go b/mixmessages/roundInfo.go
index 4e8d22fe0420d603669fa1a569f5181e87a8e65e..db3253006080b98c90be1cb8eda7039891c90add 100644
--- a/mixmessages/roundInfo.go
+++ b/mixmessages/roundInfo.go
@@ -12,9 +12,9 @@ package mixmessages
import (
"github.com/pkg/errors"
- "gitlab.com/elixxir/primitives/id"
"gitlab.com/elixxir/primitives/states"
"gitlab.com/xx_network/comms/messages"
+ "gitlab.com/xx_network/primitives/id"
)
// SetSignature sets RoundInfo's signature to the newSig argument
diff --git a/network/dataStructures/circuit.go b/network/dataStructures/circuit.go
index c60ef396b191ee5b20b679c604f8ef29aea4259a..c627f9239bf170d9b36972ef848c77f943858f81 100644
--- a/network/dataStructures/circuit.go
+++ b/network/dataStructures/circuit.go
@@ -9,8 +9,8 @@ package dataStructures
import (
jww "github.com/spf13/jwalterweatherman"
- "gitlab.com/elixxir/primitives/id"
"gitlab.com/xx_network/comms/connect"
+ "gitlab.com/xx_network/primitives/id"
)
type Circuit struct {
diff --git a/network/dataStructures/circuit_test.go b/network/dataStructures/circuit_test.go
index 9ade758ad67af7a136c07a47fcca6474e3599ca1..405ef42f42c2a0dd97b3e18b01f077288cc123b8 100644
--- a/network/dataStructures/circuit_test.go
+++ b/network/dataStructures/circuit_test.go
@@ -9,9 +9,9 @@ package dataStructures
import (
"gitlab.com/elixxir/comms/testkeys"
- "gitlab.com/elixxir/primitives/id"
"gitlab.com/elixxir/primitives/utils"
"gitlab.com/xx_network/comms/connect"
+ "gitlab.com/xx_network/primitives/id"
"reflect"
"testing"
)
diff --git a/network/dataStructures/extendedRoundStorage.go b/network/dataStructures/extendedRoundStorage.go
index 38342548330530febb0a2dd2ce01e4c75cf491f7..5bbda037e331b35caf3ad1e19a39228dee3f713d 100644
--- a/network/dataStructures/extendedRoundStorage.go
+++ b/network/dataStructures/extendedRoundStorage.go
@@ -2,7 +2,7 @@ package dataStructures
import (
pb "gitlab.com/elixxir/comms/mixmessages"
- "gitlab.com/elixxir/primitives/id"
+ "gitlab.com/xx_network/primitives/id"
)
// The ExtendedRoundStorage (ERS) interface allows storing rounds inside of an external database for clients to pull
diff --git a/network/dataStructures/group.go b/network/dataStructures/group.go
index 930c1d9873b21bdab4d563b62959254dde4efe99..642cbe532647d287eddec56979f64f86eb600873 100644
--- a/network/dataStructures/group.go
+++ b/network/dataStructures/group.go
@@ -14,7 +14,7 @@ import (
"github.com/pkg/errors"
"gitlab.com/elixxir/crypto/cyclic"
"gitlab.com/elixxir/crypto/large"
- "gitlab.com/elixxir/primitives/ndf"
+ "gitlab.com/xx_network/primitives/ndf"
"sync"
"testing"
)
diff --git a/network/dataStructures/group_test.go b/network/dataStructures/group_test.go
index 2738693a143b76990e32b2fa1e209563c4e91fb6..6757087dc9d7e9dc4e2b120ab82dfc290dc18460 100644
--- a/network/dataStructures/group_test.go
+++ b/network/dataStructures/group_test.go
@@ -10,7 +10,7 @@ package dataStructures
import (
"gitlab.com/elixxir/crypto/cyclic"
"gitlab.com/elixxir/crypto/large"
- "gitlab.com/elixxir/primitives/ndf"
+ "gitlab.com/xx_network/primitives/ndf"
"reflect"
"testing"
)
diff --git a/network/dataStructures/ipOverride.go b/network/dataStructures/ipOverride.go
index f6d06d8c33676d521901e98660f9a48c48d109a7..fcb05a068cc2bead460b3d3f147c87770ad0e997 100644
--- a/network/dataStructures/ipOverride.go
+++ b/network/dataStructures/ipOverride.go
@@ -8,7 +8,7 @@
package dataStructures
import (
- "gitlab.com/elixxir/primitives/id"
+ "gitlab.com/xx_network/primitives/id"
"sync"
)
diff --git a/network/dataStructures/ipOverride_test.go b/network/dataStructures/ipOverride_test.go
index 9e03e606088a5bc27d7c2c797c1540b697143210..51b57698e631b673dd72bfbc56dfa39aa0bc5c82 100644
--- a/network/dataStructures/ipOverride_test.go
+++ b/network/dataStructures/ipOverride_test.go
@@ -1,7 +1,7 @@
package dataStructures
import (
- "gitlab.com/elixxir/primitives/id"
+ "gitlab.com/xx_network/primitives/id"
"testing"
)
diff --git a/network/dataStructures/ndf.go b/network/dataStructures/ndf.go
index 731439a2eb90572e792ab05e26665b1a958f9834..338df25095ea19dfa100608511877da649a4e2ac 100644
--- a/network/dataStructures/ndf.go
+++ b/network/dataStructures/ndf.go
@@ -14,7 +14,7 @@ import (
"crypto/sha256"
"github.com/pkg/errors"
pb "gitlab.com/elixxir/comms/mixmessages"
- "gitlab.com/elixxir/primitives/ndf"
+ "gitlab.com/xx_network/primitives/ndf"
"sync"
)
diff --git a/network/dataStructures/roundData.go b/network/dataStructures/roundData.go
index 9b39bdd6edd6aaa439a5aa9e5708e79b05ea2279..37eb6a2250162dda046fc3e133ac4f1abe84b0db 100644
--- a/network/dataStructures/roundData.go
+++ b/network/dataStructures/roundData.go
@@ -12,8 +12,8 @@ package dataStructures
import (
"github.com/pkg/errors"
"gitlab.com/elixxir/comms/mixmessages"
- "gitlab.com/elixxir/primitives/id"
"gitlab.com/xx_network/collections/ring"
+ "gitlab.com/xx_network/primitives/id"
)
const RoundInfoBufLen = 500
diff --git a/network/historicalRoundData.go b/network/historicalRoundData.go
index 1dba5e83861d081e4a2ebaffd3873d2dca9f34bf..158d96ff953ea582b73edd8e4067ca487993c850 100644
--- a/network/historicalRoundData.go
+++ b/network/historicalRoundData.go
@@ -3,7 +3,7 @@ package network
import (
"errors"
pb "gitlab.com/elixxir/comms/mixmessages"
- "gitlab.com/elixxir/primitives/id"
+ "gitlab.com/xx_network/primitives/id"
)
// Calls the underlying interface's function to get a specific round from history
diff --git a/network/historicalRoundData_test.go b/network/historicalRoundData_test.go
index 24862048aaf596ae43d3df262f1dd49c64d16cfe..955f330ef820f97d6e9bfbb61bc9d231407a6ad6 100644
--- a/network/historicalRoundData_test.go
+++ b/network/historicalRoundData_test.go
@@ -4,7 +4,7 @@ import (
jww "github.com/spf13/jwalterweatherman"
pb "gitlab.com/elixxir/comms/mixmessages"
ds "gitlab.com/elixxir/comms/network/dataStructures"
- "gitlab.com/elixxir/primitives/id"
+ "gitlab.com/xx_network/primitives/id"
"testing"
)
diff --git a/network/instance.go b/network/instance.go
index 5ff01d8ad32b35769ffba79affa8fdb1f4e44df1..20fbc9eee8099c88ab7c3ec0cbc4fb544cdf31c6 100644
--- a/network/instance.go
+++ b/network/instance.go
@@ -17,9 +17,9 @@ import (
ds "gitlab.com/elixxir/comms/network/dataStructures"
"gitlab.com/elixxir/crypto/cyclic"
"gitlab.com/elixxir/crypto/signature"
- "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"
"testing"
)
diff --git a/network/instance_test.go b/network/instance_test.go
index 6a94f83f29ec1c555e79cd3da96800505633028c..b9ce88c10b555f88426df92b99516092afdecb4d 100644
--- a/network/instance_test.go
+++ b/network/instance_test.go
@@ -14,9 +14,9 @@ import (
"gitlab.com/elixxir/comms/testutils"
"gitlab.com/elixxir/crypto/signature"
"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/primitives/id"
+ "gitlab.com/xx_network/primitives/ndf"
"reflect"
"strings"
"testing"
diff --git a/network/securedNdf.go b/network/securedNdf.go
index 082e7ea183f18f9fd7c10b7805db58a8b3ba7a70..032d9c4d683b59f9de86c44cab43de0edffd51b9 100644
--- a/network/securedNdf.go
+++ b/network/securedNdf.go
@@ -15,7 +15,7 @@ import (
ds "gitlab.com/elixxir/comms/network/dataStructures"
"gitlab.com/elixxir/crypto/signature"
"gitlab.com/elixxir/crypto/signature/rsa"
- "gitlab.com/elixxir/primitives/ndf"
+ "gitlab.com/xx_network/primitives/ndf"
)
// wraps the ndf data structure, expoting all the functionality expect the
diff --git a/network/securedNdf_test.go b/network/securedNdf_test.go
index 2402ea8e69f0fc8e6d1a75b3ec345f0f21aa4814..b02a547f7807dc8aeb69e17033c539031eb55b7c 100644
--- a/network/securedNdf_test.go
+++ b/network/securedNdf_test.go
@@ -14,7 +14,7 @@ import (
"gitlab.com/elixxir/comms/testutils"
"gitlab.com/elixxir/crypto/signature"
"gitlab.com/elixxir/crypto/signature/rsa"
- "gitlab.com/elixxir/primitives/ndf"
+ "gitlab.com/xx_network/primitives/ndf"
"math/rand"
"testing"
)
diff --git a/node/endpoint.go b/node/endpoint.go
index 67e8a5bd04e5cd335bbc79aa2a43cb20e14a15c7..5c0a86bdff0d5a7d5892d032ec6101bde68483f4 100644
--- a/node/endpoint.go
+++ b/node/endpoint.go
@@ -14,9 +14,9 @@ import (
"github.com/golang/protobuf/ptypes"
"github.com/pkg/errors"
pb "gitlab.com/elixxir/comms/mixmessages"
- "gitlab.com/elixxir/primitives/id"
"gitlab.com/xx_network/comms/connect"
"gitlab.com/xx_network/comms/messages"
+ "gitlab.com/xx_network/primitives/id"
"golang.org/x/net/context"
)
diff --git a/node/handler.go b/node/handler.go
index b22ebd74c4a6d80d8118e08c347512a9cface9af..99528be42d26e32031381d921bdf48c37380452f 100644
--- a/node/handler.go
+++ b/node/handler.go
@@ -13,9 +13,9 @@ import (
"github.com/pkg/errors"
jww "github.com/spf13/jwalterweatherman"
"gitlab.com/elixxir/comms/mixmessages"
- "gitlab.com/elixxir/primitives/id"
"gitlab.com/xx_network/comms/connect"
"gitlab.com/xx_network/comms/messages"
+ "gitlab.com/xx_network/primitives/id"
"google.golang.org/grpc/reflection"
"runtime/debug"
)
diff --git a/node/node_test.go b/node/node_test.go
index 5647c116216ed41dba530e3971200a48dd9f5838..27ec34a1f65fadc8e3cc22ee0399f5653efb4ae6 100644
--- a/node/node_test.go
+++ b/node/node_test.go
@@ -10,8 +10,8 @@ package node
import (
"fmt"
"gitlab.com/elixxir/comms/testkeys"
- "gitlab.com/elixxir/primitives/id"
"gitlab.com/xx_network/comms/connect"
+ "gitlab.com/xx_network/primitives/id"
"sync"
"testing"
)
diff --git a/node/phase_test.go b/node/phase_test.go
index d56e0c46d4cc4a9deed43ba7f5141373b3ce181f..305c8c8055c8dee90e9021aa620956cbdcd06170 100644
--- a/node/phase_test.go
+++ b/node/phase_test.go
@@ -12,9 +12,9 @@ import (
"context"
"gitlab.com/elixxir/comms/mixmessages"
"gitlab.com/elixxir/comms/testkeys"
- "gitlab.com/elixxir/primitives/id"
"gitlab.com/xx_network/comms/connect"
"gitlab.com/xx_network/comms/messages"
+ "gitlab.com/xx_network/primitives/id"
"io"
"reflect"
"testing"
diff --git a/node/register_test.go b/node/register_test.go
index d4593eeff970794419923e07428953b636e22ea5..2bee3309ee1f1a6174336132496e6a19d0b579c0 100644
--- a/node/register_test.go
+++ b/node/register_test.go
@@ -10,8 +10,8 @@ package node
import (
pb "gitlab.com/elixxir/comms/mixmessages"
"gitlab.com/elixxir/comms/registration"
- "gitlab.com/elixxir/primitives/id"
"gitlab.com/xx_network/comms/connect"
+ "gitlab.com/xx_network/primitives/id"
"testing"
)
diff --git a/node/send_test.go b/node/send_test.go
index 25e4de406c3c0fb853386147473255c1857c7829..494b99f6581bb703b1d1c00b3d0f729a3045af25 100644
--- a/node/send_test.go
+++ b/node/send_test.go
@@ -11,9 +11,9 @@ import (
"github.com/golang/protobuf/ptypes"
"github.com/pkg/errors"
pb "gitlab.com/elixxir/comms/mixmessages"
- "gitlab.com/elixxir/primitives/id"
"gitlab.com/xx_network/comms/connect"
"gitlab.com/xx_network/comms/messages"
+ "gitlab.com/xx_network/primitives/id"
"testing"
)
diff --git a/notificationBot/handler.go b/notificationBot/handler.go
index a5ffd66599a09e1b8c3671ff0b766504a3fd18e0..92f084ea6ddd867a9156682aee9d54d64381c0b9 100644
--- a/notificationBot/handler.go
+++ b/notificationBot/handler.go
@@ -13,9 +13,9 @@ import (
"github.com/pkg/errors"
jww "github.com/spf13/jwalterweatherman"
pb "gitlab.com/elixxir/comms/mixmessages"
- "gitlab.com/elixxir/primitives/id"
"gitlab.com/xx_network/comms/connect"
"gitlab.com/xx_network/comms/messages"
+ "gitlab.com/xx_network/primitives/id"
"google.golang.org/grpc/reflection"
"runtime/debug"
)
diff --git a/notificationBot/notificationBot_test.go b/notificationBot/notificationBot_test.go
index 7f8da3df45cd3be1acf50318110182493de2f80b..23704fbb4df1c04df1abf21913350759235f1ead 100644
--- a/notificationBot/notificationBot_test.go
+++ b/notificationBot/notificationBot_test.go
@@ -11,8 +11,8 @@ import (
"fmt"
"gitlab.com/elixxir/comms/gateway"
"gitlab.com/elixxir/comms/testkeys"
- "gitlab.com/elixxir/primitives/id"
"gitlab.com/xx_network/comms/connect"
+ "gitlab.com/xx_network/primitives/id"
"sync"
"testing"
)
diff --git a/notificationBot/registerNotification_test.go b/notificationBot/registerNotification_test.go
index 13fdb5a74a42ce9574035f8ab1d970246b74e554..79d1f0b07da9b4acbe830e0071b148b7aa26a240 100644
--- a/notificationBot/registerNotification_test.go
+++ b/notificationBot/registerNotification_test.go
@@ -12,8 +12,8 @@ import (
"gitlab.com/elixxir/comms/gateway"
"gitlab.com/elixxir/comms/mixmessages"
"gitlab.com/elixxir/comms/testkeys"
- "gitlab.com/elixxir/primitives/id"
"gitlab.com/xx_network/comms/connect"
+ "gitlab.com/xx_network/primitives/id"
"testing"
)
diff --git a/registration/endpoint.go b/registration/endpoint.go
index bbf93cc13a6bcacf3fe08f2fa49b6afed3b475b8..ab8d0e3df7e205d175b59aab7c6d2781f479561d 100644
--- a/registration/endpoint.go
+++ b/registration/endpoint.go
@@ -15,9 +15,9 @@ import (
"github.com/pkg/errors"
jww "github.com/spf13/jwalterweatherman"
pb "gitlab.com/elixxir/comms/mixmessages"
- "gitlab.com/elixxir/primitives/id"
"gitlab.com/xx_network/comms/connect"
"gitlab.com/xx_network/comms/messages"
+ "gitlab.com/xx_network/primitives/id"
"golang.org/x/net/context"
)
diff --git a/registration/handler.go b/registration/handler.go
index f999a20b037c00bce542c262b70e62f6f7f28281..f3602fc16bc8b8619467632e83fba4d9ecfc868d 100644
--- a/registration/handler.go
+++ b/registration/handler.go
@@ -13,9 +13,9 @@ import (
"github.com/pkg/errors"
jww "github.com/spf13/jwalterweatherman"
pb "gitlab.com/elixxir/comms/mixmessages"
- "gitlab.com/elixxir/primitives/id"
"gitlab.com/xx_network/comms/connect"
"gitlab.com/xx_network/comms/messages"
+ "gitlab.com/xx_network/primitives/id"
"google.golang.org/grpc/reflection"
"runtime/debug"
)
diff --git a/registration/registration_test.go b/registration/registration_test.go
index d2560fa848540c863aea1030614a9f6b4d9c43fe..131193ec200697730babb2d46c47b5785a38dd6a 100644
--- a/registration/registration_test.go
+++ b/registration/registration_test.go
@@ -12,8 +12,8 @@ import (
"gitlab.com/elixxir/comms/client"
pb "gitlab.com/elixxir/comms/mixmessages"
"gitlab.com/elixxir/comms/testkeys"
- "gitlab.com/elixxir/primitives/id"
"gitlab.com/xx_network/comms/connect"
+ "gitlab.com/xx_network/primitives/id"
"sync"
"testing"
)
diff --git a/testutils/ndf.go b/testutils/ndf.go
index 0bbda9128b4208b7b40e87c492a935ec8f9af33b..b062d1869d12818b8a2263a81f8eba132ae320a1 100644
--- a/testutils/ndf.go
+++ b/testutils/ndf.go
@@ -9,7 +9,7 @@ package testutils
import (
"encoding/base64"
- "gitlab.com/elixxir/primitives/ndf"
+ "gitlab.com/xx_network/primitives/ndf"
)
var (