diff --git a/go.mod b/go.mod index d713571b20bb4cf81599252a935528aa2057dd08..4e9b3a1357d5d787d32d1386ae324aec846a8d38 100644 --- a/go.mod +++ b/go.mod @@ -7,16 +7,17 @@ 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-20200804182833-984246dea2c4 - gitlab.com/elixxir/primitives v0.0.0-20200804182913-788f47bded40 - gitlab.com/xx_network/comms v0.0.0-20200804225654-09a9af23d699 + gitlab.com/elixxir/crypto v0.0.0-20200806211835-b8ce4472f399 + gitlab.com/elixxir/primitives v0.0.0-20200805174810-86b366d1dd2d + gitlab.com/xx_network/comms v0.0.0-20200806235452-3a82720833ba + gitlab.com/xx_network/crypto v0.0.0-20200806235322-ede3c15881ce gitlab.com/xx_network/primitives v0.0.0-20200804183002-f99f7a7284da gitlab.com/xx_network/ring v0.0.2 golang.org/x/net v0.0.0-20200707034311-ab3426394381 golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae // indirect golang.org/x/text v0.3.3 // indirect google.golang.org/genproto v0.0.0-20200709005830-7a2ca40e9dc3 // indirect - google.golang.org/grpc v1.30.0 + google.golang.org/grpc v1.31.0 google.golang.org/protobuf v1.25.0 // indirect gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 // indirect ) diff --git a/go.sum b/go.sum index e661a7d94821854b7850f8a0bf628a85ff23d630..a34aae65d2133c5b5fce61606b5c63184603c664 100644 --- a/go.sum +++ b/go.sum @@ -54,14 +54,24 @@ 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/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/go.mod h1:cu6uNoANVLV0J6HyTL6KqVtVyh9SHU1RjJhytYlsbVQ= +gitlab.com/elixxir/crypto v0.0.0-20200806211835-b8ce4472f399 h1:U0oQ0cZeq1Wnv+MxZcny3RkMBONphpc1ambIgGbWovs= +gitlab.com/elixxir/crypto v0.0.0-20200806211835-b8ce4472f399/go.mod h1:LthCESQ1AfV1H26URYL9kr+XgXXCE7JfEEPpomFPxIo= 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/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/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/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/xx_network/comms v0.0.0-20200805174823-841427dd5023/go.mod h1:owEcxTRl7gsoM8c3RQ5KAm5GstxrJp5tn+6JfQ4z5Hw= +gitlab.com/xx_network/comms v0.0.0-20200806235452-3a82720833ba h1:7nozLSNBX0CfP53DDiDNLJx9obhYGfGf5na0/c9rMso= +gitlab.com/xx_network/comms v0.0.0-20200806235452-3a82720833ba/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 h1:tGe3QtCC6St63FuxVAaDtHSx0BCNqzCsfjbRo5jacWM= 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= @@ -74,6 +84,8 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnk golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200707235045-ab33eee955e0 h1:eIYIE7EC5/Wv5Kbz8bJPaq+TN3kq3W8S+LSm62vM0DY= golang.org/x/crypto v0.0.0-20200707235045-ab33eee955e0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de h1:ikNHVSjEfnvz6sxdSPCaPt572qowuyMDMJLLm3Db3ig= +golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= diff --git a/mixmessages/ndf_test.go b/mixmessages/ndf_test.go index 3d237cb5dc79f7208fcaf55aae5ce36ee0d03693..5519b15bab7afd70aa7b03f6cc67061ecd8ac396 100644 --- a/mixmessages/ndf_test.go +++ b/mixmessages/ndf_test.go @@ -10,9 +10,9 @@ package mixmessages import ( "bytes" "crypto/rand" - "gitlab.com/elixxir/crypto/signature" - "gitlab.com/elixxir/crypto/signature/rsa" "gitlab.com/xx_network/comms/messages" + "gitlab.com/xx_network/crypto/signature" + "gitlab.com/xx_network/crypto/signature/rsa" "testing" ) diff --git a/mixmessages/roundError_test.go b/mixmessages/roundError_test.go index 8f19518593a9f5e4a6917bede18456a96a663272..8e0fb6d662430364afd574958de1d3894a9bd0fd 100644 --- a/mixmessages/roundError_test.go +++ b/mixmessages/roundError_test.go @@ -10,9 +10,9 @@ package mixmessages import ( "bytes" "crypto/rand" - "gitlab.com/elixxir/crypto/signature" - "gitlab.com/elixxir/crypto/signature/rsa" "gitlab.com/xx_network/comms/messages" + "gitlab.com/xx_network/crypto/signature" + "gitlab.com/xx_network/crypto/signature/rsa" "testing" ) diff --git a/mixmessages/roundInfo_test.go b/mixmessages/roundInfo_test.go index 4a6c5aa154d22b52910d809c25d65b165b3e3e7a..c2120598bbbd6afb8f82ba7a1cb260a535eb42f0 100644 --- a/mixmessages/roundInfo_test.go +++ b/mixmessages/roundInfo_test.go @@ -10,10 +10,10 @@ package mixmessages import ( "bytes" "crypto/rand" - "gitlab.com/elixxir/crypto/signature" - "gitlab.com/elixxir/crypto/signature/rsa" "gitlab.com/elixxir/primitives/states" "gitlab.com/xx_network/comms/messages" + "gitlab.com/xx_network/crypto/signature" + "gitlab.com/xx_network/crypto/signature/rsa" "testing" ) diff --git a/network/instance.go b/network/instance.go index 20fbc9eee8099c88ab7c3ec0cbc4fb544cdf31c6..a4869cd1e00165b03e5ed655cc5b808c97f98032 100644 --- a/network/instance.go +++ b/network/instance.go @@ -16,8 +16,8 @@ import ( pb "gitlab.com/elixxir/comms/mixmessages" ds "gitlab.com/elixxir/comms/network/dataStructures" "gitlab.com/elixxir/crypto/cyclic" - "gitlab.com/elixxir/crypto/signature" "gitlab.com/xx_network/comms/connect" + "gitlab.com/xx_network/crypto/signature" "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 b9ce88c10b555f88426df92b99516092afdecb4d..90762e98ca632781574e343216d33ab9b8ad3378 100644 --- a/network/instance_test.go +++ b/network/instance_test.go @@ -12,9 +12,9 @@ import ( ds "gitlab.com/elixxir/comms/network/dataStructures" "gitlab.com/elixxir/comms/testkeys" "gitlab.com/elixxir/comms/testutils" - "gitlab.com/elixxir/crypto/signature" - "gitlab.com/elixxir/crypto/signature/rsa" "gitlab.com/xx_network/comms/connect" + "gitlab.com/xx_network/crypto/signature" + "gitlab.com/xx_network/crypto/signature/rsa" "gitlab.com/xx_network/primitives/id" "gitlab.com/xx_network/primitives/ndf" "reflect" diff --git a/network/securedNdf.go b/network/securedNdf.go index 032d9c4d683b59f9de86c44cab43de0edffd51b9..36acb7a1a6aec9bed4d7a20ee6396a195f846502 100644 --- a/network/securedNdf.go +++ b/network/securedNdf.go @@ -13,8 +13,8 @@ import ( "github.com/pkg/errors" pb "gitlab.com/elixxir/comms/mixmessages" ds "gitlab.com/elixxir/comms/network/dataStructures" - "gitlab.com/elixxir/crypto/signature" - "gitlab.com/elixxir/crypto/signature/rsa" + "gitlab.com/xx_network/crypto/signature" + "gitlab.com/xx_network/crypto/signature/rsa" "gitlab.com/xx_network/primitives/ndf" ) diff --git a/network/securedNdf_test.go b/network/securedNdf_test.go index b02a547f7807dc8aeb69e17033c539031eb55b7c..5f9537d3eba491ec7a097a2e3093812332449322 100644 --- a/network/securedNdf_test.go +++ b/network/securedNdf_test.go @@ -12,8 +12,8 @@ import ( pb "gitlab.com/elixxir/comms/mixmessages" ds "gitlab.com/elixxir/comms/network/dataStructures" "gitlab.com/elixxir/comms/testutils" - "gitlab.com/elixxir/crypto/signature" - "gitlab.com/elixxir/crypto/signature/rsa" + "gitlab.com/xx_network/crypto/signature" + "gitlab.com/xx_network/crypto/signature/rsa" "gitlab.com/xx_network/primitives/ndf" "math/rand" "testing"