gaspersic/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop

Browse Source 
Conflicts:
	ethereal/ethereum.go
	ethereum/ethereum.go
This commit is contained in:
obscuren
2014-05-13 12:46:40 +02:00
parent 32c6126593 c99aa7bdcf
commit dd60382fc3
5 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ethereum/ethereum.go
View File

@ -133,7 +133,7 @@ func main() {
go console.Start()
}
if StartRpc {
ethereum.RpcServer, err = ethrpc.NewJsonRpcServer(ethpub.NewPEthereum(ethereum))
ethereum.RpcServer, err = ethrpc.NewJsonRpcServer(ethpub.NewPEthereum(ethereum), RpcPort)
if err != nil {
logger.Infoln("Could not start RPC interface:", err)
} else {