fixup! Signer info store DB implementation

Signed-off-by: Alexandros Filios <alexandros.filios@ibm.com>

Author: alexandrosfilios

platform/fabric/core/generic/delivery/delivery.go

@@ -163,7 +163,6 @@ func (d *Delivery) readBlocks(ch <-chan blockResponse, cancel func()) {
 			}
 		case <-d.stop:
 			logger.Infof("Stopping delivery service")
-			cancel()
 			return
 		}
 	}
@@ -178,10 +177,13 @@ func (d *Delivery) runReceiver(ctx context.Context, ch chan<- blockResponse) err
 	waitTime := d.channelConfig.DeliverySleepAfterFailure()
 	for {
 		select {
+		case <-d.stop:
+			logger.Infof("Stopped receiver")
+			return nil
 		case <-ctx.Done():
 			logger.Infof("Context done")
 			// Time to cancel
-			return nil
+			return errors.New("context done")
 		default:
 			deliveryCtx, span := d.tracer.Start(context.Background(), "block_delivery",
 				tracing.WithAttributes(tracing.String(messageTypeLabel, unknown)))