fluencelabs/tendermint
1
0
Fork 0
mirror of https://github.com/fluencelabs/tendermint synced 2025-07-30 19:51:58 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' into jae/aminoify

Browse Source
This commit is contained in:
Ethan Buchman
2018-04-07 16:16:53 +03:00
parent 7afe74a963 4930b61a38
commit c170800fbd
95 changed files with 2317 additions and 770 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
p2p/key.go
View File

@@ -52,9 +52,8 @@ func LoadOrGenNodeKey(filePath string) (*NodeKey, error) {
return nil, err
}
return nodeKey, nil
} else {
return genNodeKey(filePath)
}
return genNodeKey(filePath)
}
func loadNodeKey(filePath string) (*NodeKey, error) {
@@ -65,7 +64,7 @@ func loadNodeKey(filePath string) (*NodeKey, error) {
nodeKey := new(NodeKey)
err = cdc.UnmarshalJSON(jsonBytes, nodeKey)
if err != nil {
return nil, fmt.Errorf("Error reading NodeKey from %v: %v\n", filePath, err)
return nil, fmt.Errorf("Error reading NodeKey from %v: %v", filePath, err)
}
return nodeKey, nil
}