fix: address lint errors after rebase

Author: fridrik01

testing/simulated/blob_fetcher_integration_test.go

@@ -56,9 +56,10 @@ func (s *SimulatedSuite) TestBlobFetcher_MultiNodeFetch() {
 	s.InitializeChain(s.T())
 
 	// Move chain forward one block
-	blsSigner := simulated.GetBlsSigner(s.HomeDir)
+	nodeAddress, err := s.SimComet.GetNodeAddress()
+	s.Require().NoError(err)
 	startTime := time.Now()
-	_, _, _ = s.MoveChainToHeight(s.T(), 1, 1, blsSigner, startTime)
+	_, _, _ = s.MoveChainToHeight(s.T(), 1, 1, nodeAddress, startTime)
 
 	// Create test blobs
 	testSlot := math.Slot(100)
@@ -125,7 +126,7 @@ func (s *SimulatedSuite) TestBlobFetcher_MultiNodeFetch() {
 
 	// Queue blob request, wait for it to be downloaded and validate
 	s.Require().NoError(node1Fetcher.QueueBlobRequest(block))
-	time.Sleep(200 * time.Millisecond)
+	time.Sleep(500 * time.Millisecond)
 	storedSidecars, err := node1Store.GetBlobSidecars(testSlot)
 	s.Require().NoError(err)
 	s.Require().Len(storedSidecars, 2)

testing/simulated/malicious_proposer_test.go

@@ -557,7 +557,7 @@ func testBuildInvalidBlock(
 	pubkey, err := blsSigner.GetPubKey()
 	r.NoError(err)
 
-	signedBlk, sidecars, err := builder.SimComet.Comet.Blockchain.ParseBeaconBlock(
+	signedBlk, sidecars, err := builder.SimComet.Comet.Blockchain.ParseProcessProposalRequest(
 		&types.ProcessProposalRequest{
 			Txs:             PrepReq.Txs,
 			Height:          PrepReq.Height,

testing/simulated/pectra_fork_test.go

@@ -221,10 +221,9 @@ func (s *PectraForkSuite) TestTimestampFork_ELAndCLInSync_IsSuccessful() {
 		// set consensus time for the next block to match
 		// the timestamp of the payload built optimistically.
 		forkVersion := s.Geth.TestNode.ChainSpec.ActiveForkVersionForTimestamp(math.U64(consensusTime.Unix())) //#nosec: G115
-		blk, _, err := encoding.ExtractBlobsAndBlockFromRequest(
-			processRequest,
+		blk, err := encoding.UnmarshalBeaconBlockFromABCIRequest(
+			processRequest.GetTxs(),
 			blockchain.BeaconBlockTxIndex,
-			blockchain.BlobSidecarsTxIndex,
 			forkVersion,
 		)
 		s.Require().NoError(err)

testing/simulated/utils.go

@@ -256,10 +256,9 @@ func (s *SharedAccessors) MoveChainToHeight(
 		// set consensus time for the next block to match
 		// the timestamp of the payload built optimistically.
 		forkVersion := s.TestNode.ChainSpec.ActiveForkVersionForTimestamp(math.U64(proposalTime.Unix())) //#nosec: G115
-		blk, _, err := encoding.ExtractBlobsAndBlockFromRequest(
-			processReq,
+		blk, err := encoding.UnmarshalBeaconBlockFromABCIRequest(
+			processReq.GetTxs(),
 			blockchain.BeaconBlockTxIndex,
-			blockchain.BlobSidecarsTxIndex,
 			forkVersion,
 		)
 		require.NoError(t, err)