From 6d165a6bb177fdcacd23fa3bb28723bb240e725e Mon Sep 17 00:00:00 2001
From: josh <josh@elixxir.io>
Date: Mon, 30 Nov 2020 13:47:59 -0800
Subject: [PATCH] Update imports for genericSignable refactor
---
go.mod | 4 ++--
go.sum | 4 ++++
network/instance.go | 5 ++---
network/instance_test.go | 2 +-
network/securedNdf.go | 2 +-
network/securedNdf_test.go | 2 +-
6 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/go.mod b/go.mod
index 88bf1ad0..72682aff 100644
--- a/go.mod
+++ b/go.mod
@@ -13,8 +13,8 @@ require (
github.com/zeebo/pcg v1.0.0 // indirect
gitlab.com/elixxir/crypto v0.0.5-0.20201125005724-bcc603df02d3
gitlab.com/elixxir/primitives v0.0.3-0.20201116174806-97f190989704
- gitlab.com/xx_network/comms v0.0.4-0.20201119231004-a67d08045535
- gitlab.com/xx_network/crypto v0.0.5-0.20201124194022-366c10b1bce0
+ gitlab.com/xx_network/comms v0.0.4-0.20201130190834-365ddae56e7b
+ gitlab.com/xx_network/crypto v0.0.5-0.20201130191038-b4f77b62e2c2
gitlab.com/xx_network/primitives v0.0.3-0.20201116234927-44e42fc91e7c
gitlab.com/xx_network/ring v0.0.2
golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897 // indirect
diff --git a/go.sum b/go.sum
index f47fd0b9..084b4ca8 100644
--- a/go.sum
+++ b/go.sum
@@ -79,10 +79,14 @@ gitlab.com/elixxir/primitives v0.0.3-0.20201116174806-97f190989704/go.mod h1:3fx
gitlab.com/xx_network/comms v0.0.0-20200805174823-841427dd5023/go.mod h1:owEcxTRl7gsoM8c3RQ5KAm5GstxrJp5tn+6JfQ4z5Hw=
gitlab.com/xx_network/comms v0.0.4-0.20201119231004-a67d08045535 h1:3KoNUndePTAUMlX1xc+zk0wuOZMb/xJMUVuhS+HisdA=
gitlab.com/xx_network/comms v0.0.4-0.20201119231004-a67d08045535/go.mod h1:YViGbRj7FjJYoaO4NpALGEd9dK/l8uUT000FEBbUTL8=
+gitlab.com/xx_network/comms v0.0.4-0.20201130190834-365ddae56e7b h1:QAVpPy+aS6bSPs6BYcHGu+TGv/r8oPoNMLSlj4Ems6U=
+gitlab.com/xx_network/comms v0.0.4-0.20201130190834-365ddae56e7b/go.mod h1:YViGbRj7FjJYoaO4NpALGEd9dK/l8uUT000FEBbUTL8=
gitlab.com/xx_network/crypto v0.0.3/go.mod h1:DF2HYvvCw9wkBybXcXAgQMzX+MiGbFPjwt3t17VRqRE=
gitlab.com/xx_network/crypto v0.0.4 h1:lpKOL5mTJ2awWMfgBy30oD/UvJVrWZzUimSHlOdZZxo=
gitlab.com/xx_network/crypto v0.0.4/go.mod h1:+lcQEy+Th4eswFgQDwT0EXKp4AXrlubxalwQFH5O0Mk=
gitlab.com/xx_network/crypto v0.0.5-0.20201124194022-366c10b1bce0/go.mod h1:+lcQEy+Th4eswFgQDwT0EXKp4AXrlubxalwQFH5O0Mk=
+gitlab.com/xx_network/crypto v0.0.5-0.20201130191038-b4f77b62e2c2 h1:bFNiKUoiWpno/gPNWbBsIbTjO1yJmhzj/VlXjnqEBAQ=
+gitlab.com/xx_network/crypto v0.0.5-0.20201130191038-b4f77b62e2c2/go.mod h1:+lcQEy+Th4eswFgQDwT0EXKp4AXrlubxalwQFH5O0Mk=
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/go.mod h1:OK9xevzWCaPO7b1wiluVJGk7R5ZsuC7pHY5hteZFQug=
gitlab.com/xx_network/primitives v0.0.2 h1:Aqe0rg2yGhioEGCHvBRyEKHwS4GS8q/pqKwCDRkc4qA=
diff --git a/network/instance.go b/network/instance.go
index a8612bcb..a10ec53a 100644
--- a/network/instance.go
+++ b/network/instance.go
@@ -19,7 +19,7 @@ import (
"gitlab.com/elixxir/crypto/cyclic"
"gitlab.com/elixxir/primitives/states"
"gitlab.com/xx_network/comms/connect"
- "gitlab.com/xx_network/crypto/signature"
+ "gitlab.com/xx_network/comms/signature"
"gitlab.com/xx_network/primitives/id"
"gitlab.com/xx_network/primitives/ndf"
"testing"
@@ -511,7 +511,7 @@ func (i *Instance) GetLastUpdateID() int {
// get the most recent round id
func (i *Instance) GetLastRoundID() id.Round {
- return i.roundData.GetLastRoundID()-1
+ return i.roundData.GetLastRoundID() - 1
}
// Update gateway hosts based on most complete ndf
@@ -619,7 +619,6 @@ func (i *Instance) updateConns(def *ndf.NetworkDefinition, isGateway, isNode boo
}
}
-
} else if host.GetAddress() != addr {
host.UpdateAddress(addr)
}
diff --git a/network/instance_test.go b/network/instance_test.go
index 30f51ba3..5cf031d3 100644
--- a/network/instance_test.go
+++ b/network/instance_test.go
@@ -14,7 +14,7 @@ import (
"gitlab.com/elixxir/comms/testutils"
"gitlab.com/elixxir/primitives/states"
"gitlab.com/xx_network/comms/connect"
- "gitlab.com/xx_network/crypto/signature"
+ "gitlab.com/xx_network/comms/signature"
"gitlab.com/xx_network/crypto/signature/rsa"
"gitlab.com/xx_network/primitives/id"
"gitlab.com/xx_network/primitives/ndf"
diff --git a/network/securedNdf.go b/network/securedNdf.go
index 36acb7a1..d98cef79 100644
--- a/network/securedNdf.go
+++ b/network/securedNdf.go
@@ -13,7 +13,7 @@ import (
"github.com/pkg/errors"
pb "gitlab.com/elixxir/comms/mixmessages"
ds "gitlab.com/elixxir/comms/network/dataStructures"
- "gitlab.com/xx_network/crypto/signature"
+ "gitlab.com/xx_network/comms/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 5f9537d3..a210b7b2 100644
--- a/network/securedNdf_test.go
+++ b/network/securedNdf_test.go
@@ -12,7 +12,7 @@ import (
pb "gitlab.com/elixxir/comms/mixmessages"
ds "gitlab.com/elixxir/comms/network/dataStructures"
"gitlab.com/elixxir/comms/testutils"
- "gitlab.com/xx_network/crypto/signature"
+ "gitlab.com/xx_network/comms/signature"
"gitlab.com/xx_network/crypto/signature/rsa"
"gitlab.com/xx_network/primitives/ndf"
"math/rand"
--
GitLab