refactor submitter

Author: Manav-Aggarwal

block/submitter.go

@@ -199,14 +199,13 @@ func (m *Manager) createSignedDataFromBatch(batch *coresequencer.Batch) (*types.
 func (m *Manager) submitDataToDA(ctx context.Context, signedData *types.SignedData) error {
 	var backoff time.Duration
 	attempt := 0
-	submitted := false
 
 	// Store initial values to be able to reset or compare later
 	initialGasPrice := m.gasPrice
 	gasPrice := initialGasPrice
 
 daSubmitRetryLoop:
-	for !submitted && attempt < maxSubmitAttempts {
+	for attempt < maxSubmitAttempts {
 		// Wait for backoff duration or exit if context is done
 		select {
 		case <-ctx.Done():
@@ -234,8 +233,6 @@ daSubmitRetryLoop:
 				"gasPrice", gasPrice,
 				"height", res.Height)
 
-			submitted = true
-
 			// Reset submission parameters after success
 			backoff = 0
 
@@ -274,11 +271,5 @@ daSubmitRetryLoop:
 	}
 
 	// Return error if not all transactions were submitted after all attempts
-	if !submitted {
-		return fmt.Errorf(
-			"failed to submit data to DA layer after %d attempts",
-			attempt,
-		)
-	}
-	return nil
+	return fmt.Errorf("failed to submit data to DA layer after %d attempts", attempt)
 }

node/full.go

@@ -381,7 +381,7 @@ func (n *FullNode) Run(parentCtx context.Context) error {
 		spawnWorker(func() { n.blockManager.AggregationLoop(ctx, errCh) })
 		spawnWorker(func() { n.reaper.Start(ctx) })
 		spawnWorker(func() { n.blockManager.HeaderSubmissionLoop(ctx) })
-		spawnWorker(func() { n.blockManager.BatchSubmissionLoop(ctx) })
+		spawnWorker(func() { n.blockManager.DataSubmissionLoop(ctx) })
 		spawnWorker(func() { n.blockManager.DAIncluderLoop(ctx, errCh) })
 	} else {
 		spawnWorker(func() { n.blockManager.RetrieveLoop(ctx) })