Remove roundErrors from digest in round info

mixmessages/digesttesthelper.go

@@ -45,7 +45,7 @@ func checkdigest(t *testing.T, gs signature.GenericRsaSignable) {
 		valField := r.Field(i)
 		typeField := r.Type().Field(i)
 
-		if typeField.Name == "EccSignature" || typeField.Name == "Signature" || typeField.Name == "state" || typeField.Name == "sizeCache" || typeField.Name == "unknownFields" || strings.Contains(typeField.Name, "XXX") {
+		if typeField.Name == "EccSignature" || typeField.Name == "Signature" || typeField.Name == "Errors" || typeField.Name == "state" || typeField.Name == "sizeCache" || typeField.Name == "unknownFields" || strings.Contains(typeField.Name, "XXX") {
 			fmt.Printf("Skipping field.\n")
 			continue
 		}
@@ -79,24 +79,6 @@ func checkdigest(t *testing.T, gs signature.GenericRsaSignable) {
 			v := reflect.ValueOf(arr)
 			valField.Set(v)
 
-		case []*RoundError:
-			randNodeId := make([]byte, 33)
-			rand.Read(randNodeId)
-			rea := []*RoundError{
-				{
-					Id:     rand.Uint64(),
-					NodeId: randNodeId,
-					Error:  RandStringRunes(4),
-				},
-				{
-					Id:     rand.Uint64(),
-					NodeId: randNodeId,
-					Error:  RandStringRunes(4),
-				},
-			}
-			v := reflect.ValueOf(rea)
-			valField.Set(v)
-
 		case []*ClientError:
 			randClientId := make([]byte, 33)
 			rand.Read(randClientId)

mixmessages/roundInfo.go

@@ -81,13 +81,6 @@ func (m *RoundInfo) Digest(nonce []byte, h hash.Hash) []byte {
 		h.Write(data)
 	}
 
-	// Hash the
-	for _, roundErr := range m.Errors {
-		sha := crypto.SHA256.New()
-		data := roundErr.Digest(nonce, sha)
-		h.Write(data)
-	}
-
 	// Hash nonce
 	h.Write(nonce)
 

network/dataStructures/round.go

@@ -68,7 +68,8 @@ func (r *Round) Get() *pb.RoundInfo {
 			if err != nil {
 				jww.FATAL.Panicf("Could not validate "+
 					"the roundInfo signature: %+v: %v", r.info, err)
-			}		}
+			}
+		}
 
 		atomic.StoreUint32(r.needsValidation, 1)
 	}

network/dataStructures/roundUpdates_test.go

@@ -13,6 +13,7 @@ import (
 	"testing"
 )
 
+// Unit test
 func TestUpdates_AddRound(t *testing.T) {
 	u := NewUpdates()
 	// Construct a mock round object
@@ -34,6 +35,7 @@ func TestUpdates_AddRound(t *testing.T) {
 	}
 }
 
+// Unit test
 func TestUpdates_GetUpdate(t *testing.T) {
 	u := NewUpdates()
 	updateID := 3
@@ -64,23 +66,31 @@ func TestUpdates_GetUpdate(t *testing.T) {
 	}
 }
 
+// Unit test
 func TestUpdates_GetUpdates(t *testing.T) {
 	u := NewUpdates()
+
+	pubKey, err := testutils.LoadPublicKeyTesting(t)
+	if err != nil {
+		t.Errorf("Failed to load public key: %v", err)
+		t.FailNow()
+	}
+	ecKey, _ := testutils.LoadEllipticPublicKey()
+
 	updateID := 3
 	// Construct a mock round object
 	roundInfoOne := &mixmessages.RoundInfo{
 		ID:       0,
 		UpdateID: uint64(updateID),
 	}
+
+	// Sign the round on the keys
 	if err := testutils.SignRoundInfoRsa(roundInfoOne, t); err != nil {
 		t.Errorf("Failed to sign mock round info: %v", err)
 	}
-	pubKey, err := testutils.LoadPublicKeyTesting(t)
-	if err != nil {
-		t.Errorf("Failed to load public key: %v", err)
-		t.FailNow()
+	if err := testutils.SignRoundInfoEddsa(roundInfoOne, ecKey, t); err != nil {
+		t.Errorf("Failed to sign mock round info: %v", err)
 	}
-	ecKey, _ := testutils.LoadEllipticPublicKey()
 
 	roundOne := NewRound(roundInfoOne, pubKey, ecKey.PublicKey())
 
@@ -92,6 +102,9 @@ func TestUpdates_GetUpdates(t *testing.T) {
 	if err := testutils.SignRoundInfoRsa(roundInfoTwo, t); err != nil {
 		t.Errorf("Failed to sign mock round info: %v", err)
 	}
+	if err := testutils.SignRoundInfoEddsa(roundInfoTwo, ecKey, t); err != nil {
+		t.Errorf("Failed to sign mock round info: %v", err)
+	}
 
 	roundTwo := NewRound(roundInfoTwo, pubKey, ecKey.PublicKey())