Merge branch 'main' into fix_bug_4_29

taikoxyz · Apr 29, 2024 · e648388 · e648388
2 parents 0c527ff + c421f0f
commit e648388
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/pkg/rpc/blob_datasource.go b/pkg/rpc/blob_datasource.go
@@ -78,8 +78,7 @@ func (ds *BlobDataSource) GetBlobs(
 			}
 		}
 	}
-	err = nil
-	return sidecars, err
+	return sidecars, nil
 }
 
 // getBlobFromServer get blob data from server path `/getBlob`.

diff --git a/pkg/rpc/subscription.go b/pkg/rpc/subscription.go
@@ -124,6 +124,6 @@ func waitSubErr(ctx context.Context, sub event.Subscription) (event.Subscription
 	case err := <-sub.Err():
 		return sub, err
 	case <-ctx.Done():
-		return sub, nil
+		return sub, ctx.Err()
 	}
 }