Merge branch 'develop' into conversion

2015-03-19 21:18:29 +01:00
parent 29eb220910 b4a51de602
commit 013427bde2
4 changed files with 4054 additions and 1254 deletions
--- a/rpc/api.go
+++ b/rpc/api.go
@ -486,7 +486,7 @@ func (p *EthereumApi) GetBlockUncleCountByNumber(blocknum int64) (int64, error)

 func (p *EthereumApi) GetRequestReply(req *RpcRequest, reply *interface{}) error {
 	// Spec at https://github.com/ethereum/wiki/wiki/Generic-JSON-RPC
-	rpclogger.Infof("%s %s", req.Method, req.Params)
+	rpclogger.Debugf("%s %s", req.Method, req.Params)
 	switch req.Method {
 	case "web3_sha3":
 		args := new(Sha3Args)