Merge branch 'master' into rp/comments-about-extending

celestiaorg · Jun 22, 2023 · b18292e · b18292e
2 parents da4e3f5 + 328fe4d
commit b18292e
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 25 deletions.
diff --git a/datasquare_test.go b/datasquare_test.go
@@ -151,9 +151,8 @@ func TestLazyRootGeneration(t *testing.T) {
 	err = square.computeRoots()
 	assert.NoError(t, err)
 
-	if !reflect.DeepEqual(square.rowRoots, rowRoots) && !reflect.DeepEqual(square.colRoots, colRoots) {
-		t.Error("getRowRoot or getColRoot did not produce identical roots to computeRoots")
-	}
+	assert.Equal(t, square.rowRoots, rowRoots)
+	assert.Equal(t, square.colRoots, colRoots)
 }
 
 func TestComputeRoots(t *testing.T) {

diff --git a/extendeddatacrossword.go b/extendeddatacrossword.go
@@ -332,9 +332,8 @@ func (eds *ExtendedDataSquare) prerepairSanityCheck(
 
 	for i := uint(0); i < eds.width; i++ {
 		i := i
-		rowIsComplete := noMissingData(eds.row(i), noShareInsertion)
-		colIsComplete := noMissingData(eds.col(i), noShareInsertion)
 
+		rowIsComplete := noMissingData(eds.row(i), noShareInsertion)
 		// if there's no missing data in this row
 		if rowIsComplete {
 			errs.Go(func() error {
@@ -348,37 +347,32 @@ func (eds *ExtendedDataSquare) prerepairSanityCheck(
 				}
 				return nil
 			})
-		}
-
-		// if there's no missing data in this col
-		if colIsComplete {
 			errs.Go(func() error {
-				// ensure that the roots are equal
-				colRoot, err := eds.getColRoot(i)
+				parityShares, err := eds.codec.Encode(eds.rowSlice(i, 0, eds.originalDataWidth))
 				if err != nil {
 					return err
 				}
-				if !bytes.Equal(colRoots[i], colRoot) {
-					return fmt.Errorf("bad root input: col %d expected %v got %v", i, colRoots[i], colRoot)
+				if !bytes.Equal(flattenChunks(parityShares), flattenChunks(eds.rowSlice(i, eds.originalDataWidth, eds.originalDataWidth))) {
+					return &ErrByzantineData{Row, i, eds.row(i)}
 				}
 				return nil
 			})
 		}
 
-		if rowIsComplete {
+		colIsComplete := noMissingData(eds.col(i), noShareInsertion)
+		// if there's no missing data in this col
+		if colIsComplete {
 			errs.Go(func() error {
-				parityShares, err := eds.codec.Encode(eds.rowSlice(i, 0, eds.originalDataWidth))
+				// ensure that the roots are equal
+				colRoot, err := eds.getColRoot(i)
 				if err != nil {
 					return err
 				}
-				if !bytes.Equal(flattenChunks(parityShares), flattenChunks(eds.rowSlice(i, eds.originalDataWidth, eds.originalDataWidth))) {
-					return &ErrByzantineData{Row, i, eds.row(i)}
+				if !bytes.Equal(colRoots[i], colRoot) {
+					return fmt.Errorf("bad root input: col %d expected %v got %v", i, colRoots[i], colRoot)
 				}
 				return nil
 			})
-		}
-
-		if colIsComplete {
 			errs.Go(func() error {
 				parityShares, err := eds.codec.Encode(eds.colSlice(0, i, eds.originalDataWidth))
 				if err != nil {

diff --git a/extendeddatacrossword_test.go b/extendeddatacrossword_test.go
@@ -177,12 +177,11 @@ func TestCorruptedEdsReturnsErrByzantineData(t *testing.T) {
 		shareSize int
 		cells     [][]byte
 		values    [][]byte
-		axis      Axis
 	}{
-		{"BadRow/OriginalData", bufferSize, [][]byte{{0, 0}}, [][]byte{corruptChunk}, Row},
-		{"BadRow/ExtendedData", bufferSize, [][]byte{{0, 3}}, [][]byte{corruptChunk}, Row},
-		{"BadColumn/OriginalData", bufferSize, [][]byte{{0, 0}, {0, 1}, {0, 2}, {0, 3}}, [][]byte{corruptChunk, nil, nil, nil}, Col},
-		{"BadColumn/OriginalData", bufferSize, [][]byte{{3, 0}, {0, 1}, {0, 2}, {0, 3}}, [][]byte{corruptChunk, nil, nil, nil}, Col},
+		{"BadRow/OriginalData", bufferSize, [][]byte{{0, 0}}, [][]byte{corruptChunk}},
+		{"BadRow/ExtendedData", bufferSize, [][]byte{{0, 3}}, [][]byte{corruptChunk}},
+		{"BadColumn/OriginalData", bufferSize, [][]byte{{0, 0}, {0, 1}, {0, 2}, {0, 3}}, [][]byte{corruptChunk, nil, nil, nil}},
+		{"BadColumn/OriginalData", bufferSize, [][]byte{{3, 0}, {0, 1}, {0, 2}, {0, 3}}, [][]byte{corruptChunk, nil, nil, nil}},
 	}
 
 	for codecName, codec := range codecs {