From 11345b774364315969addef0776da0b745b67b44 Mon Sep 17 00:00:00 2001
From: Sydney Anne Erickson <sydney@elixxir.io>
Date: Tue, 4 Aug 2020 10:32:25 -0700
Subject: [PATCH] Move ID and NDF packages to xxnet primitives repo
---
Makefile | 2 ++
client/client.go | 2 +-
client/gateway_test.go | 2 +-
client/mockServer_test.go | 4 ++--
client/notificationBot_test.go | 2 +-
client/registration.go | 4 ++--
client/registration_test.go | 4 ++--
gateway/endpoint.go | 2 +-
gateway/gateway_test.go | 2 +-
gateway/handler.go | 2 +-
gateway/registration_test.go | 2 +-
gateway/sendBatch_test.go | 2 +-
go.mod | 7 ++++---
go.sum | 16 ++++++++++++----
mixmessages/roundInfo.go | 2 +-
network/dataStructures/circuit.go | 2 +-
network/dataStructures/circuit_test.go | 2 +-
network/dataStructures/extendedRoundStorage.go | 2 +-
network/dataStructures/group.go | 2 +-
network/dataStructures/group_test.go | 2 +-
network/dataStructures/ipOverride.go | 2 +-
network/dataStructures/ipOverride_test.go | 2 +-
network/dataStructures/ndf.go | 2 +-
network/dataStructures/roundData.go | 2 +-
network/historicalRoundData.go | 2 +-
network/historicalRoundData_test.go | 2 +-
network/instance.go | 4 ++--
network/instance_test.go | 4 ++--
network/securedNdf.go | 2 +-
network/securedNdf_test.go | 2 +-
node/endpoint.go | 2 +-
node/handler.go | 2 +-
node/node_test.go | 2 +-
node/phase_test.go | 2 +-
node/register_test.go | 2 +-
node/send_test.go | 2 +-
notificationBot/handler.go | 2 +-
notificationBot/notificationBot_test.go | 2 +-
notificationBot/registerNotification_test.go | 2 +-
registration/endpoint.go | 2 +-
registration/handler.go | 2 +-
registration/registration_test.go | 2 +-
testutils/ndf.go | 2 +-
43 files changed, 63 insertions(+), 52 deletions(-)
diff --git a/Makefile b/Makefile
index d21ac4e6..646a2c46 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 7b8d91b5..01ed2363 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 7cf2b695..4f6b12da 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 d0ef14a4..73079cac 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 8dd06823..70ec1a10 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 150f5c75..41bac1e9 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 360f88f9..ec8ea689 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 f5f20ecf..5a3b74e4 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 e0ffb500..b532f326 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 362a2c8b..897217ee 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 0c544bd9..a0b8d10d 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 1af6d2ee..db3f842b 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 8e9db630..394104af 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 19ce42af..e2e32f74 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 4e8d22fe..db325300 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 c60ef396..c627f923 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 9ade758a..405ef42f 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 38342548..5bbda037 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 930c1d98..642cbe53 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 2738693a..6757087d 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 f6d06d8c..fcb05a06 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 9e03e606..51b57698 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 731439a2..338df250 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 9b39bdd6..37eb6a22 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 1dba5e83..158d96ff 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 24862048..955f330e 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 5ff01d8a..20fbc9ee 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 6a94f83f..b9ce88c1 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 082e7ea1..032d9c4d 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 2402ea8e..b02a547f 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 67e8a5bd..5c0a86bd 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 b22ebd74..99528be4 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 5647c116..27ec34a1 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 d56e0c46..305c8c80 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 d4593eef..2bee3309 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 25e4de40..494b99f6 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 a5ffd665..92f084ea 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 7f8da3df..23704fbb 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 13fdb5a7..79d1f0b0 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 bbf93cc1..ab8d0e3d 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 f999a20b..f3602fc1 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 d2560fa8..131193ec 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 0bbda912..b062d186 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 (
--
GitLab