Merge remote-tracking branch 'remotes/origin/signer'

Conflicts:
	types/priv_validator.go
This commit is contained in:
Jae Kwon
2016-01-12 15:58:48 -08:00
5 changed files with 61 additions and 21 deletions

View File

@@ -24,7 +24,7 @@ func TestNodeStartStop(t *testing.T) {
time.Sleep(time.Second * 2)
// Create & start node
n := NewNode()
n := NewNodeDefaultPrivVal()
l := p2p.NewDefaultListener("tcp", config.GetString("node_laddr"), config.GetBool("skip_upnp"))
n.AddListener(l)
n.Start()