(to squash) re-introduce the check in addSweeps

Author: starius

sweepbatcher/sweep_batch.go

@@ -602,15 +602,15 @@ func (b *batch) addSweeps(ctx context.Context, sweeps []*sweep) (bool, error) {
 	}
 
 	// Track if there is a presigned and a regular sweep.
-	var hasPresigned, hasRegular bool
+	var addingPresigned, addingRegular bool
 	for _, s := range sweeps {
 		if s.presigned {
-			hasPresigned = true
+			addingPresigned = true
 		} else {
-			hasRegular = true
+			addingRegular = true
 		}
 	}
-	if hasPresigned && hasRegular {
+	if addingPresigned && addingRegular {
 		b.Warnf("There are presigned and regular sweeps in the group")
 
 		return false, nil
@@ -619,7 +619,7 @@ func (b *batch) addSweeps(ctx context.Context, sweeps []*sweep) (bool, error) {
 	// If presigned mode is enabled, we should first presign the new version
 	// of batch transaction. Also ensure that all the sweeps in the batch
 	// use the same mode (presigned or regular).
-	if hasPresigned {
+	if addingPresigned {
 		// Ensure that all the sweeps in the batch use presigned mode.
 		for _, s := range b.sweeps {
 			if !s.presigned {
@@ -662,6 +662,18 @@ func (b *batch) addSweeps(ctx context.Context, sweeps []*sweep) (bool, error) {
 					" this input: %v",
 					sweeps[0].swapHash[:6], err)
 
+				return false, nil
+			}
+		}
+	} else {
+		// Ensure that all the sweeps in the batch don't use presigned.
+		for _, s := range b.sweeps {
+			if s.presigned {
+				b.Warnf("failed to add a non-presigned sweep "+
+					"%x to the batch, because the batch "+
+					"has presigned sweep %x",
+					sweeps[0].swapHash[:6], s.swapHash[:6])
+
 				return false, nil
 			}
 		}