Remove receiver channel after a successful key exchange

goKMS/kms/akmsInterface/server/server.go

@@ -97,6 +97,9 @@ func ksaReqHandler(eventBus *event.EventBus, receiver *receiver.Receiver, genera
 
 		select {
 		case <-receiverChan:
+			if err := receiver.RemoveReceiver(pathId); err != nil {
+				logrus.Errorf("Failed removing receiver for pathId: %s ; err: %v", pathId, err)
+			}
 		case <-time.After(20 * time.Second):
 			if err := receiver.RemoveReceiver(pathId); err != nil {
 				logrus.Errorf("Failed removing receiver for pathId: %s ; err: %v", pathId, err)

goKMS/kms/kms.go

@@ -712,6 +712,9 @@ func (kms *KMS) exchangeKeyAfterETSI14GetKeyRequest(receivingCKMSID uuid.UUID, n
 
 	select {
 	case <-receiverChan:
+		if err := kms.receiver.RemoveReceiver(pathID); err != nil {
+			log.Errorf("Failed removing receiver for pathId: %s ; err: %v", pathID, err)
+		}
 	case <-time.After(20 * time.Second):
 		if err := kms.receiver.RemoveReceiver(pathID); err != nil {
 			log.Errorf("Failed removing receiver for pathId: %s ; err: %v", pathID, err)