merge/rebase fixes

This commit is contained in:
Ethan Buchman
2016-01-12 19:30:31 -05:00
parent ee449a94c8
commit 799efb0629
6 changed files with 17 additions and 10 deletions

View File

@ -56,7 +56,9 @@ func init() {
// create a new node and sleep forever
func newNode(ready chan struct{}) {
// Create & start node
node = nm.NewNode()
privValidatorFile := config.GetString("priv_validator_file")
privValidator := types.LoadOrGenPrivValidator(privValidatorFile)
node = nm.NewNode(privValidator)
l := p2p.NewDefaultListener("tcp", config.GetString("node_laddr"), true)
node.AddListener(l)
node.Start()