From b8fb49f4b111709574c860ba2fcf67fd9ec6e20c Mon Sep 17 00:00:00 2001 From: Sydney Anne Erickson <sydney@elixxir.io> Date: Tue, 18 Aug 2020 10:50:55 -0700 Subject: [PATCH] Fix imports --- api/client.go | 4 ++-- api/client_test.go | 2 +- api/ndf_test.go | 2 +- api/notifications_test.go | 2 +- api/private.go | 2 +- api/private_test.go | 2 +- api/register.go | 4 ++-- bindings/client_test.go | 2 +- cmd/root.go | 2 +- go.mod | 12 +++++++----- go.sum | 14 ++++++++++++++ rekey/rekey_test.go | 2 +- user/session.go | 2 +- user/session_test.go | 2 +- user/sessionv1.go | 2 +- 15 files changed, 36 insertions(+), 20 deletions(-) diff --git a/api/client.go b/api/client.go index cd4e6f17e..41d7a63d8 100644 --- a/api/client.go +++ b/api/client.go @@ -27,10 +27,10 @@ import ( "gitlab.com/elixxir/client/user" "gitlab.com/elixxir/crypto/cyclic" "gitlab.com/elixxir/crypto/large" - "gitlab.com/elixxir/crypto/signature/rsa" - "gitlab.com/elixxir/crypto/tls" "gitlab.com/elixxir/primitives/switchboard" "gitlab.com/xx_network/comms/connect" + "gitlab.com/xx_network/crypto/signature/rsa" + "gitlab.com/xx_network/crypto/tls" "gitlab.com/xx_network/primitives/id" "gitlab.com/xx_network/primitives/ndf" goio "io" diff --git a/api/client_test.go b/api/client_test.go index d20eb0eab..d79b5f3e7 100644 --- a/api/client_test.go +++ b/api/client_test.go @@ -21,8 +21,8 @@ import ( "gitlab.com/elixxir/crypto/e2e" "gitlab.com/elixxir/crypto/hash" "gitlab.com/elixxir/crypto/large" - "gitlab.com/elixxir/crypto/signature/rsa" "gitlab.com/elixxir/primitives/format" + "gitlab.com/xx_network/crypto/signature/rsa" "gitlab.com/xx_network/primitives/id" "reflect" "testing" diff --git a/api/ndf_test.go b/api/ndf_test.go index 22b3f3c2d..82be06228 100644 --- a/api/ndf_test.go +++ b/api/ndf_test.go @@ -11,7 +11,7 @@ import ( "crypto/rand" "encoding/base64" "fmt" - "gitlab.com/elixxir/crypto/signature/rsa" + "gitlab.com/xx_network/crypto/signature/rsa" "gitlab.com/xx_network/primitives/ndf" "reflect" "testing" diff --git a/api/notifications_test.go b/api/notifications_test.go index c3c72945a..f283f7e55 100644 --- a/api/notifications_test.go +++ b/api/notifications_test.go @@ -1,7 +1,7 @@ package api import ( - "gitlab.com/elixxir/crypto/signature/rsa" + "gitlab.com/xx_network/crypto/signature/rsa" "testing" ) diff --git a/api/private.go b/api/private.go index c01b5a282..3eb4ad027 100644 --- a/api/private.go +++ b/api/private.go @@ -21,9 +21,9 @@ import ( "gitlab.com/elixxir/crypto/diffieHellman" "gitlab.com/elixxir/crypto/e2e" "gitlab.com/elixxir/crypto/large" - "gitlab.com/elixxir/crypto/signature/rsa" "gitlab.com/elixxir/crypto/xx" "gitlab.com/xx_network/comms/messages" + "gitlab.com/xx_network/crypto/signature/rsa" "gitlab.com/xx_network/primitives/id" "gitlab.com/xx_network/primitives/ndf" ) diff --git a/api/private_test.go b/api/private_test.go index 514a19a50..54e1e7da9 100644 --- a/api/private_test.go +++ b/api/private_test.go @@ -9,7 +9,7 @@ import ( "bytes" "gitlab.com/elixxir/client/user" "gitlab.com/elixxir/crypto/csprng" - "gitlab.com/elixxir/crypto/signature/rsa" + "gitlab.com/xx_network/crypto/signature/rsa" "reflect" "testing" ) diff --git a/api/register.go b/api/register.go index 9103b8b0c..08302c477 100644 --- a/api/register.go +++ b/api/register.go @@ -16,8 +16,8 @@ import ( "gitlab.com/elixxir/crypto/cyclic" "gitlab.com/elixxir/crypto/hash" "gitlab.com/elixxir/crypto/registration" - "gitlab.com/elixxir/crypto/signature/rsa" - "gitlab.com/elixxir/crypto/tls" + "gitlab.com/xx_network/crypto/signature/rsa" + "gitlab.com/xx_network/crypto/tls" "gitlab.com/xx_network/primitives/id" "gitlab.com/xx_network/primitives/ndf" "os" diff --git a/bindings/client_test.go b/bindings/client_test.go index f4d8bb1d0..90c0a01ba 100644 --- a/bindings/client_test.go +++ b/bindings/client_test.go @@ -24,9 +24,9 @@ import ( "gitlab.com/elixxir/comms/registration" "gitlab.com/elixxir/crypto/cyclic" "gitlab.com/elixxir/crypto/large" - "gitlab.com/elixxir/crypto/signature/rsa" "gitlab.com/xx_network/comms/connect" "gitlab.com/xx_network/comms/messages" + "gitlab.com/xx_network/crypto/signature/rsa" "gitlab.com/xx_network/primitives/id" "gitlab.com/xx_network/primitives/ndf" "math/rand" diff --git a/cmd/root.go b/cmd/root.go index ed8473d55..6f509c5b3 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -21,9 +21,9 @@ import ( "gitlab.com/elixxir/client/io" "gitlab.com/elixxir/client/parse" "gitlab.com/elixxir/client/user" - "gitlab.com/elixxir/crypto/signature/rsa" "gitlab.com/elixxir/primitives/switchboard" "gitlab.com/elixxir/primitives/utils" + "gitlab.com/xx_network/crypto/signature/rsa" "gitlab.com/xx_network/primitives/id" "io/ioutil" "os" diff --git a/go.mod b/go.mod index dd4027a24..653c7dd53 100644 --- a/go.mod +++ b/go.mod @@ -15,12 +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-20200805174832-240bba97beaa - gitlab.com/elixxir/crypto v0.0.0-20200805174804-bdf909f2a16d + gitlab.com/elixxir/comms v0.0.0-20200813225502-e879259ca741 + gitlab.com/elixxir/crypto v0.0.0-20200811195343-de268a55c7c4 gitlab.com/elixxir/ekv v0.1.1 - gitlab.com/elixxir/primitives v0.0.0-20200805174810-86b366d1dd2d - gitlab.com/xx_network/comms v0.0.0-20200805174823-841427dd5023 - gitlab.com/xx_network/primitives v0.0.0-20200804183002-f99f7a7284da + gitlab.com/elixxir/primitives v0.0.0-20200812191102-31c01f08b4dc + gitlab.com/xx_network/comms v0.0.0-20200812204124-8dc2a2a1b9ca + gitlab.com/xx_network/crypto v0.0.0-20200806235322-ede3c15881ce + gitlab.com/xx_network/primitives v0.0.0-20200812183720-516a65a4a9b2 + gitlab.com/xx_network/ring v0.0.2 golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de golang.org/x/sys v0.0.0-20200806125547-5acd03effb82 // indirect gopkg.in/ini.v1 v1.52.0 // indirect diff --git a/go.sum b/go.sum index 6daefd75f..23dce4145 100644 --- a/go.sum +++ b/go.sum @@ -163,10 +163,15 @@ github.com/zeebo/blake3 v0.0.4/go.mod h1:YOZo8A49yNqM0X/Y+JmDUZshJWLt1laHsNSn5ny github.com/zeebo/pcg v0.0.0-20181207190024-3cdc6b625a05/go.mod h1:Gr+78ptB0MwXxm//LBaEvBiaXY7hXJ6KGe2V32X2F6E= gitlab.com/elixxir/comms v0.0.0-20200805174832-240bba97beaa h1:yn5FW/zPPKb0DYbN1HvhudYkCrXhpBK4CrZGeUKCGu4= gitlab.com/elixxir/comms v0.0.0-20200805174832-240bba97beaa/go.mod h1:Wc6fZyP/M4sBjnzb9pRScLeqwMOCv6DRXoTOd07bO3g= +gitlab.com/elixxir/comms v0.0.0-20200813225502-e879259ca741 h1:yIjgre8xSDpnhJkDzTr1lgR7NC1bPWCk2Sgn8udiS2A= +gitlab.com/elixxir/comms v0.0.0-20200813225502-e879259ca741/go.mod h1:hEi6dhcR1v6TGcp3tBy+QFuE25zux206xymuB+PpUqs= 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/crypto v0.0.0-20200805174804-bdf909f2a16d h1:3+o6r8a0o9/HIpBzlGCCiwuPN8OdEX3cHzdnCNqKDAw= gitlab.com/elixxir/crypto v0.0.0-20200805174804-bdf909f2a16d/go.mod h1:cu6uNoANVLV0J6HyTL6KqVtVyh9SHU1RjJhytYlsbVQ= +gitlab.com/elixxir/crypto v0.0.0-20200806211835-b8ce4472f399/go.mod h1:LthCESQ1AfV1H26URYL9kr+XgXXCE7JfEEPpomFPxIo= +gitlab.com/elixxir/crypto v0.0.0-20200811195343-de268a55c7c4 h1:KlaR5JBxj3oSxSsL3Rax2Rt494sxldM0hxzlr+fBy34= +gitlab.com/elixxir/crypto v0.0.0-20200811195343-de268a55c7c4/go.mod h1:LthCESQ1AfV1H26URYL9kr+XgXXCE7JfEEPpomFPxIo= gitlab.com/elixxir/ekv v0.1.1 h1:Em3rF8sv+tNbQGXbcpYzAS2blWRAP708JGhYlkN74Kg= gitlab.com/elixxir/ekv v0.1.1/go.mod h1:bXY0kgbV5BHYda4YY5/hiG5bjimGK+R3PYub5yM9C/s= gitlab.com/elixxir/primitives v0.0.0-20200731184040-494269b53b4d h1:OKWTmYN5q8XVHo8JXThIH0TCuvl/fLXR7MGVacpqfRg= @@ -178,13 +183,22 @@ gitlab.com/elixxir/primitives v0.0.0-20200804182913-788f47bded40/go.mod h1:tzdFF gitlab.com/elixxir/primitives v0.0.0-20200804231232-ad79a9e8f113/go.mod h1:tzdFFvb1ESmuTCOl1z6+yf6oAICDxH2NPUemVgoNLxc= gitlab.com/elixxir/primitives v0.0.0-20200805174810-86b366d1dd2d h1:ky5oz0D2EmOzk2n/A6Ugwj7S1B6rftxMJwc19sjGkz8= gitlab.com/elixxir/primitives v0.0.0-20200805174810-86b366d1dd2d/go.mod h1:tzdFFvb1ESmuTCOl1z6+yf6oAICDxH2NPUemVgoNLxc= +gitlab.com/elixxir/primitives v0.0.0-20200812191102-31c01f08b4dc h1:43innow2sbJLflB73gwS8gg1meInFXNA1LGYeeDQ6lw= +gitlab.com/elixxir/primitives v0.0.0-20200812191102-31c01f08b4dc/go.mod h1:pJx2DZk9s8vVMnLN7x0hIPngDjbNSdOP6kk3RLlRxHg= 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/comms v0.0.0-20200805174823-841427dd5023 h1:fQPaxyuXyH3vl8qFlFDBEx8rlEzBnXBNy74K8ItFRM4= gitlab.com/xx_network/comms v0.0.0-20200805174823-841427dd5023/go.mod h1:owEcxTRl7gsoM8c3RQ5KAm5GstxrJp5tn+6JfQ4z5Hw= +gitlab.com/xx_network/comms v0.0.0-20200812204124-8dc2a2a1b9ca h1:Z1ubeattVNEdW5f4jl2KXVyEHoRKKZOV0393bg56xV0= +gitlab.com/xx_network/comms v0.0.0-20200812204124-8dc2a2a1b9ca/go.mod h1:idLzPGYig57XE7xuU93OlIF9s6NgSJj7OArQvsd5DjY= +gitlab.com/xx_network/crypto v0.0.0-20200806202113-978fa1984bbf/go.mod h1:i0df/q6dDCBiscgD51fMoS2U2TBrm6LcyN822JmB5Tw= +gitlab.com/xx_network/crypto v0.0.0-20200806235322-ede3c15881ce h1:gypNBUl2guESEv4MDgH+miwYqR4jPoWM8dLt2Zs5gIs= +gitlab.com/xx_network/crypto v0.0.0-20200806235322-ede3c15881ce/go.mod h1:i0df/q6dDCBiscgD51fMoS2U2TBrm6LcyN822JmB5Tw= 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/primitives v0.0.0-20200812183720-516a65a4a9b2 h1:Jvv2fLk+2ULDCXiVTPI8Jlg2fBrmq2NSA+dlsN5t2Pk= +gitlab.com/xx_network/primitives v0.0.0-20200812183720-516a65a4a9b2/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= diff --git a/rekey/rekey_test.go b/rekey/rekey_test.go index 43d430ec0..e39432809 100644 --- a/rekey/rekey_test.go +++ b/rekey/rekey_test.go @@ -15,8 +15,8 @@ import ( "gitlab.com/elixxir/crypto/e2e" "gitlab.com/elixxir/crypto/hash" "gitlab.com/elixxir/crypto/large" - "gitlab.com/elixxir/crypto/signature/rsa" "gitlab.com/xx_network/comms/connect" + "gitlab.com/xx_network/crypto/signature/rsa" "gitlab.com/xx_network/primitives/id" "os" "testing" diff --git a/user/session.go b/user/session.go index 89e9bb9d0..55f5744b6 100644 --- a/user/session.go +++ b/user/session.go @@ -18,9 +18,9 @@ import ( "gitlab.com/elixxir/client/globals" "gitlab.com/elixxir/client/keyStore" "gitlab.com/elixxir/crypto/cyclic" - "gitlab.com/elixxir/crypto/signature/rsa" "gitlab.com/elixxir/primitives/format" "gitlab.com/elixxir/primitives/switchboard" + "gitlab.com/xx_network/crypto/signature/rsa" "gitlab.com/xx_network/primitives/id" "io" "sync" diff --git a/user/session_test.go b/user/session_test.go index 08176cf53..f37465d16 100644 --- a/user/session_test.go +++ b/user/session_test.go @@ -13,8 +13,8 @@ import ( "gitlab.com/elixxir/client/globals" "gitlab.com/elixxir/crypto/cyclic" "gitlab.com/elixxir/crypto/large" - "gitlab.com/elixxir/crypto/signature/rsa" "gitlab.com/elixxir/primitives/format" + "gitlab.com/xx_network/crypto/signature/rsa" "gitlab.com/xx_network/primitives/id" "math/rand" "reflect" diff --git a/user/sessionv1.go b/user/sessionv1.go index e6bfcf416..9dd071acb 100644 --- a/user/sessionv1.go +++ b/user/sessionv1.go @@ -8,9 +8,9 @@ import ( "gitlab.com/elixxir/client/globals" "gitlab.com/elixxir/client/keyStore" "gitlab.com/elixxir/crypto/cyclic" - "gitlab.com/elixxir/crypto/signature/rsa" "gitlab.com/elixxir/primitives/format" "gitlab.com/elixxir/primitives/switchboard" + "gitlab.com/xx_network/crypto/signature/rsa" "gitlab.com/xx_network/primitives/id" "sync" ) -- GitLab