verifyRPCDataColumnSidecars: Integrate SidecarRootAndSignatureAligned test.

Author: nalepae

beacon-chain/sync/data_column_sidecars.go

@@ -987,7 +987,7 @@ func verifyDataColumnSidecarsByPeer(
 // requirements for data column sidecars received via the by root request.
 func verifyRPCDataColumnSidecars(
 	newVerifier verification.NewDataColumnsVerifier,
-	_ map[[fieldparams.RootLength]byte]blocks.ROBlock,
+	roBlockByRoot map[[fieldparams.RootLength]byte]blocks.ROBlock,
 	roDataColumns []blocks.RODataColumn,
 ) ([]blocks.VerifiedRODataColumn, error) {
 	verifier := newVerifier(roDataColumns, verification.RPCDataColumnSidecarRequirements)
@@ -996,6 +996,10 @@ func verifyRPCDataColumnSidecars(
 		return nil, errors.Wrap(err, "valid fields")
 	}
 
+	if err := verifier.SidecarRootAndSignatureAligned(roBlockByRoot); err != nil {
+		return nil, errors.Wrap(err, "sidecar root and signature aligned")
+	}
+
 	if err := verifier.SidecarInclusionProven(); err != nil {
 		return nil, errors.Wrap(err, "sidecar inclusion proven")
 	}

beacon-chain/sync/data_column_sidecars_test.go

@@ -792,7 +792,12 @@ func TestVerifyDataColumnSidecarsByPeer(t *testing.T) {
 		require.NoError(t, err)
 
 		newDataColumnsVerifier := newDataColumnsVerifierFromInitializer(initializer)
-		actual, err := verifyDataColumnSidecarsByPeer(p2p, newDataColumnsVerifier, nil, roDataColumnsByPeer)
+
+		roBlockByRoot := createRoBlockByRoot(t, map[[fieldparams.RootLength]byte]primitives.Slot{
+			roDataColumnSidecars[0].BlockRoot(): roDataColumnSidecars[0].Slot(),
+		})
+
+		actual, err := verifyDataColumnSidecarsByPeer(p2p, newDataColumnsVerifier, roBlockByRoot, roDataColumnsByPeer)
 		require.NoError(t, err)
 
 		require.Equal(t, stop-start, len(actual))
@@ -837,7 +842,12 @@ func TestVerifyDataColumnSidecarsByPeer(t *testing.T) {
 		require.NoError(t, err)
 
 		newDataColumnsVerifier := newDataColumnsVerifierFromInitializer(initializer)
-		actual, err := verifyDataColumnSidecarsByPeer(p2p, newDataColumnsVerifier, nil, roDataColumnsByPeer)
+
+		roBlockByRoot := createRoBlockByRoot(t, map[[fieldparams.RootLength]byte]primitives.Slot{
+			roDataColumnSidecars[0].BlockRoot(): roDataColumnSidecars[0].Slot(),
+		})
+
+		actual, err := verifyDataColumnSidecarsByPeer(p2p, newDataColumnsVerifier, roBlockByRoot, roDataColumnsByPeer)
 		require.NoError(t, err)
 
 		require.Equal(t, middle-start, len(actual))

beacon-chain/verification/data_column.go

@@ -47,6 +47,7 @@ var (
 		RequireValidFields,
 		RequireSidecarInclusionProven,
 		RequireSidecarKzgProofVerified,
+		RequireSidecarRootAndSignatureAligned,
 	}
 
 	// SpectestDataColumnSidecarRequirements is used by the forkchoice spectests when verifying data columns used in the on_block tests.
@@ -536,18 +537,18 @@ func (dv *RODataColumnsVerifier) SidecarRootAndSignatureAligned(roBlockByRoot ma
 
 // state retrieves the state of the corresponding root from the cache if possible, else retrieves it from the state by rooter.
 func (dv *RODataColumnsVerifier) state(ctx context.Context, root [fieldparams.RootLength]byte) (state.BeaconState, error) {
-	// If the parent root is already in the cache, return it.
+	// If the root is already in the cache, return it.
 	if st, ok := dv.stateByRoot[root]; ok {
 		return st, nil
 	}
 
-	// Retrieve the parent state from the state by rooter.
+	// Retrieve the state from the state by rooter.
 	st, err := dv.sr.StateByRoot(ctx, root)
 	if err != nil {
 		return nil, errors.Wrap(err, "state by root")
 	}
 
-	// Store the parent state in the cache.
+	// Store the state in the cache.
 	dv.stateByRoot[root] = st
 
 	return st, nil