fix(cmd): fix some context close issues (#650)

taikoxyz · Mar 20, 2024 · f561847 · f561847
1 parent 13c6ac2
commit f561847
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/driver/driver.go b/driver/driver.go
@@ -122,7 +122,10 @@ func (d *Driver) eventLoop() {
 
 	// doSyncWithBackoff performs a synchronising operation with a backoff strategy.
 	doSyncWithBackoff := func() {
-		if err := backoff.Retry(d.doSync, backoff.NewConstantBackOff(d.RetryInterval)); err != nil {
+		if err := backoff.Retry(
+			d.doSync,
+			backoff.WithContext(backoff.NewConstantBackOff(d.RetryInterval), d.ctx),
+		); err != nil {
 			log.Error("Sync L2 execution engine's block chain error", "error", err)
 		}
 	}
@@ -192,7 +195,7 @@ func (d *Driver) reportProtocolStatus() {
 			maxNumBlocks = configs.BlockMaxProposals
 			return nil
 		},
-		backoff.NewConstantBackOff(d.RetryInterval),
+		backoff.WithContext(backoff.NewConstantBackOff(d.RetryInterval), d.ctx),
 	); err != nil {
 		log.Error("Failed to get protocol state variables", "error", err)
 		return

diff --git a/pkg/chain_iterator/block_batch_iterator.go b/pkg/chain_iterator/block_batch_iterator.go
@@ -156,7 +156,7 @@ func (i *BlockBatchIterator) Iter() error {
 		return nil
 	}
 
-	if err := backoff.Retry(iterOp, backoff.NewConstantBackOff(i.retryInterval)); err != nil {
+	if err := backoff.Retry(iterOp, backoff.WithContext(backoff.NewConstantBackOff(i.retryInterval), i.ctx)); err != nil {
 		return err
 	}