forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-17 17:33:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

whisper: fix merge issue in #15870

Browse source 
Occured while using the github online merge tool. Lesson learned.
This commit is contained in:
Guillaume Ballet 2018-01-28 07:11:55 +01:00
parent bc87260da2
commit 0a292bfc29
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
whisper/whisperv6/whisper.go
View file

@ -1028,7 +1028,7 @@ func GenerateRandomID() (id string, err error) {
if err != nil { if err != nil {
return "", err return "", err
} }
if !validateDataIntegrity(buf, keyIdSize) { if !validateDataIntegrity(buf, keyIDSize) {
return "", fmt.Errorf("error in generateRandomID: crypto/rand failed to generate random data") return "", fmt.Errorf("error in generateRandomID: crypto/rand failed to generate random data")
} }
id = common.Bytes2Hex(buf) id = common.Bytes2Hex(buf)