Make deepsource happy.

prysmaticlabs · Jul 8, 2024 · 330a87e · 330a87e
1 parent 2b53418
commit 330a87e
Show file tree

Hide file tree

Showing 3 changed files with 70 additions and 66 deletions.
diff --git a/beacon-chain/core/peerdas/helpers_test.go b/beacon-chain/core/peerdas/helpers_test.go
@@ -50,16 +50,16 @@ func GetRandBlob(seed int64) kzg.Blob {
 	return blob
 }
 
-func GenerateCommitmentAndProof(blob kzg.Blob) (kzg.Commitment, kzg.Proof, error) {
+func GenerateCommitmentAndProof(blob kzg.Blob) (*kzg.Commitment, *kzg.Proof, error) {
 	commitment, err := kzg.BlobToKZGCommitment(&blob)
 	if err != nil {
-		return kzg.Commitment{}, kzg.Proof{}, err
+		return nil, nil, err
 	}
 	proof, err := kzg.ComputeBlobKZGProof(&blob, commitment)
 	if err != nil {
-		return kzg.Commitment{}, kzg.Proof{}, err
+		return nil, nil, err
 	}
-	return commitment, proof, err
+	return &commitment, &proof, err
 }
 
 func TestVerifyDataColumnSidecarKZGProofs(t *testing.T) {

diff --git a/beacon-chain/sync/data_columns_sampling.go b/beacon-chain/sync/data_columns_sampling.go
@@ -173,7 +173,7 @@ func (s *Service) sampleDataColumnsFromPeer(
 	retrievedColumns := make(map[uint64]bool, len(roDataColumns))
 
 	for _, roDataColumn := range roDataColumns {
-		if verified := verifyColumn(roDataColumn, root, pid, requestedColumns); verified {
+		if verifyColumn(roDataColumn, root, pid, requestedColumns) {
 			retrievedColumns[roDataColumn.ColumnIndex] = true
 		}
 	}
@@ -378,69 +378,73 @@ func (s *Service) DataColumnSamplingRoutine(ctx context.Context) {
 	for {
 		select {
 		case e := <-stateChannel:
-			if e.Type != statefeed.BlockProcessed {
-				continue
-			}
+			s.processEvent(e, nonCustodyColums, samplesCount)
 
-			data, ok := e.Data.(*statefeed.BlockProcessedData)
-			if !ok {
-				log.Error("Event feed data is not of type *statefeed.BlockProcessedData")
-				continue
-			}
+		case <-s.ctx.Done():
+			log.Debug("Context closed, exiting goroutine")
+			return
 
-			if !data.Verified {
-				// We only process blocks that have been verified
-				log.Error("Data is not verified")
-				continue
-			}
+		case err := <-stateSub.Err():
+			log.WithError(err).Error("Subscription to state feed failed")
+		}
+	}
+}
 
-			if data.SignedBlock.Version() < version.Deneb {
-				log.Debug("Pre Deneb block, skipping data column sampling")
-				continue
-			}
+func (s *Service) processEvent(e *feed.Event, nonCustodyColums map[uint64]bool, samplesCount uint64) {
+	if e.Type != statefeed.BlockProcessed {
+		return
+	}
 
-			// Get the commitments for this block.
-			commitments, err := data.SignedBlock.Block().Body().BlobKzgCommitments()
-			if err != nil {
-				log.WithError(err).Error("Failed to get blob KZG commitments")
-				continue
-			}
+	data, ok := e.Data.(*statefeed.BlockProcessedData)
+	if !ok {
+		log.Error("Event feed data is not of type *statefeed.BlockProcessedData")
+		return
+	}
 
-			// Skip if there are no commitments.
-			if len(commitments) == 0 {
-				log.Debug("No commitments in block, skipping data column sampling")
-				continue
-			}
+	if !data.Verified {
+		// We only process blocks that have been verified
+		log.Error("Data is not verified")
+		return
+	}
 
-			// Ramdomize all columns.
-			randomizedColumns := randomizeColumns(nonCustodyColums)
+	if data.SignedBlock.Version() < version.Deneb {
+		log.Debug("Pre Deneb block, skipping data column sampling")
+		return
+	}
 
-			// Sample data columns with incremental DAS.
-			ok, _, err = s.incrementalDAS(data.BlockRoot, randomizedColumns, samplesCount)
-			if err != nil {
-				log.WithError(err).Error("Error during incremental DAS")
-			}
+	// Get the commitments for this block.
+	commitments, err := data.SignedBlock.Block().Body().BlobKzgCommitments()
+	if err != nil {
+		log.WithError(err).Error("Failed to get blob KZG commitments")
+		return
+	}
 
-			if ok {
-				log.WithFields(logrus.Fields{
-					"root":        fmt.Sprintf("%#x", data.BlockRoot),
-					"columns":     randomizedColumns,
-					"sampleCount": samplesCount,
-				}).Debug("Data column sampling successful")
-			} else {
-				log.WithFields(logrus.Fields{
-					"root":        fmt.Sprintf("%#x", data.BlockRoot),
-					"columns":     randomizedColumns,
-					"sampleCount": samplesCount,
-				}).Warning("Data column sampling failed")
-			}
+	// Skip if there are no commitments.
+	if len(commitments) == 0 {
+		log.Debug("No commitments in block, skipping data column sampling")
+		return
+	}
 
-		case <-s.ctx.Done():
-			log.Debug("Context closed, exiting goroutine")
-			return
+	// Ramdomize all columns.
+	randomizedColumns := randomizeColumns(nonCustodyColums)
 
-		case err := <-stateSub.Err():
-			log.WithError(err).Error("Subscription to state feed failed")
-		}
+	// Sample data columns with incremental DAS.
+	ok, _, err = s.incrementalDAS(data.BlockRoot, randomizedColumns, samplesCount)
+	if err != nil {
+		log.WithError(err).Error("Error during incremental DAS")
+	}
+
+	if ok {
+		log.WithFields(logrus.Fields{
+			"root":        fmt.Sprintf("%#x", data.BlockRoot),
+			"columns":     randomizedColumns,
+			"sampleCount": samplesCount,
+		}).Debug("Data column sampling successful")
+	} else {
+		log.WithFields(logrus.Fields{
+			"root":        fmt.Sprintf("%#x", data.BlockRoot),
+			"columns":     randomizedColumns,
+			"sampleCount": samplesCount,
+		}).Warning("Data column sampling failed")
 	}
 }
diff --git a/beacon-chain/sync/data_columns_sampling_test.go b/beacon-chain/sync/data_columns_sampling_test.go
@@ -144,16 +144,16 @@ func getRandBlob(seed int64) kzg.Blob {
 	return blob
 }
 
-func generateCommitmentAndProof(blob kzg.Blob) (kzg.Commitment, kzg.Proof, error) {
-	commitment, err := kzg.BlobToKZGCommitment(&blob)
+func generateCommitmentAndProof(blob *kzg.Blob) (*kzg.Commitment, *kzg.Proof, error) {
+	commitment, err := kzg.BlobToKZGCommitment(blob)
 	if err != nil {
-		return kzg.Commitment{}, kzg.Proof{}, err
+		return nil, nil, err
 	}
-	proof, err := kzg.ComputeBlobKZGProof(&blob, commitment)
+	proof, err := kzg.ComputeBlobKZGProof(blob, commitment)
 	if err != nil {
-		return kzg.Commitment{}, kzg.Proof{}, err
+		return nil, nil, err
 	}
-	return commitment, proof, err
+	return &commitment, &proof, err
 }
 
 func TestIncrementalDAS(t *testing.T) {
@@ -173,7 +173,7 @@ func TestIncrementalDAS(t *testing.T) {
 	for i := int64(0); i < blobCount; i++ {
 		blob := getRandBlob(int64(i))
 
-		kzgCommitment, kzgProof, err := generateCommitmentAndProof(blob)
+		kzgCommitment, kzgProof, err := generateCommitmentAndProof(&blob)
 		require.NoError(t, err)
 
 		blobs[i] = blob