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

@ -6,10 +6,15 @@ import (
"github.com/tendermint/go-p2p"
_ "github.com/tendermint/tendermint/config/tendermint_test"
"github.com/tendermint/tendermint/types"
)
func TestNodeStartStop(t *testing.T) {
// Get PrivValidator
privValidatorFile := config.GetString("priv_validator_file")
privValidator := types.LoadOrGenPrivValidator(privValidatorFile)
// Create & start node
n := NewNode(privValidator)
l := p2p.NewDefaultListener("tcp", config.GetString("node_laddr"), config.GetBool("skip_upnp"))