fluencelabs/tendermint
1
0
Fork 0
mirror of https://github.com/fluencelabs/tendermint synced 2025-06-14 05:41:21 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'blackstar'

Browse Source
This commit is contained in:
Jae Kwon
2016-02-08 13:49:27 -08:00
parent 50ac66f79b a4f57e164b
commit df2933d40d
14 changed files with 116 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
node/node.go
View File

@ -234,13 +234,10 @@ func getProxyApp(addr string, hash []byte) (proxyAppConn proxy.AppConn) {
mtx := new(sync.Mutex)
proxyAppConn = proxy.NewLocalAppConn(mtx, app)
} else {
proxyConn, err := Connect(addr)
remoteApp, err := proxy.NewRemoteAppConn(addr)
if err != nil {
Exit(Fmt("Failed to connect to proxy for mempool: %v", err))
}
remoteApp := proxy.NewRemoteAppConn(proxyConn, 1024)
remoteApp.Start()
proxyAppConn = remoteApp
}
@ -274,7 +271,6 @@ func getState() *sm.State {
// should fork tendermint/tendermint and implement RunNode to
// load their custom priv validator and call NewNode(privVal)
func RunNode() {
// Wait until the genesis doc becomes available
genDocFile := config.GetString("genesis_file")
if !FileExists(genDocFile) {