From 0a292bfc2952f3967f1899ceb6985123cfd04212 Mon Sep 17 00:00:00 2001
From: Guillaume Ballet <gballet@gmail.com>
Date: Sun, 28 Jan 2018 07:11:55 +0100
Subject: [PATCH] whisper: fix merge issue in #15870

Occured while using the github online merge tool. Lesson learned.
---
 whisper/whisperv6/whisper.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/whisper/whisperv6/whisper.go b/whisper/whisperv6/whisper.go
index cc2d7e8d79..d75ad04ac3 100644
--- a/whisper/whisperv6/whisper.go
+++ b/whisper/whisperv6/whisper.go
@@ -1028,7 +1028,7 @@ func GenerateRandomID() (id string, err error) {
 	if err != nil {
 		return "", err
 	}
-	if !validateDataIntegrity(buf, keyIdSize) {
+	if !validateDataIntegrity(buf, keyIDSize) {
 		return "", fmt.Errorf("error in generateRandomID: crypto/rand failed to generate random data")
 	}
 	id = common.Bytes2Hex(buf)