From b071e7f4db0e3cf7ee78082af3d0b46617b6e5ed Mon Sep 17 00:00:00 2001 From: Taylor Gerring Date: Mon, 27 Apr 2015 09:18:55 -0500 Subject: [PATCH 1/3] Remove old logger from RPC pkg --- rpc/api.go | 2 +- rpc/http.go | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/rpc/api.go b/rpc/api.go index 085d8cf27..cbf03ed86 100644 --- a/rpc/api.go +++ b/rpc/api.go @@ -489,6 +489,6 @@ func (api *EthereumApi) GetRequestReply(req *RpcRequest, reply *interface{}) err return NewNotImplementedError(req.Method) } - rpclogger.DebugDetailf("Reply: %T %s", reply, reply) + glog.V(logger.Detail).Infof("Reply: %T %s\n", reply, reply) return nil } diff --git a/rpc/http.go b/rpc/http.go index f9c646908..4760601d8 100644 --- a/rpc/http.go +++ b/rpc/http.go @@ -13,7 +13,6 @@ import ( "github.com/rs/cors" ) -var rpclogger = logger.NewLogger("RPC") var rpclistener *stoppableTCPListener const ( @@ -31,7 +30,7 @@ func Start(pipe *xeth.XEth, config RpcConfig) error { l, err := newStoppableTCPListener(fmt.Sprintf("%s:%d", config.ListenAddress, config.ListenPort)) if err != nil { - rpclogger.Errorf("Can't listen on %s:%d: %v", config.ListenAddress, config.ListenPort, err) + glog.V(logger.Error).Infof("Can't listen on %s:%d: %v", config.ListenAddress, config.ListenPort, err) return err } rpclistener = l @@ -136,7 +135,7 @@ func send(writer io.Writer, v interface{}) (n int, err error) { var payload []byte payload, err = json.MarshalIndent(v, "", "\t") if err != nil { - rpclogger.Fatalln("Error marshalling JSON", err) + glog.V(logger.Error).Infoln("Error marshalling JSON", err) return 0, err } glog.V(logger.Detail).Infof("Sending payload: %s", payload) From 9a17dd91a47255f18147d9c97aaa7f231c8d68a7 Mon Sep 17 00:00:00 2001 From: Taylor Gerring Date: Mon, 27 Apr 2015 09:24:25 -0500 Subject: [PATCH 2/3] Add link to Windows 64-bit geth dev build --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a3052177b..6fcf29b88 100644 --- a/README.md +++ b/README.md @@ -52,7 +52,7 @@ Automated (dev) builds * Ubuntu [trusty](https://build.ethdev.com/builds/Linux%20Go%20develop%20deb%20i386-trusty/latest/) | [utopic](https://build.ethdev.com/builds/Linux%20Go%20develop%20deb%20i386-utopic/latest/) -* [Windows] Coming soon™ +* [Windows 64-bit](https://build.ethdev.com/builds/Windows%20Go%20develop%20branch/Geth-Win64-latest.7z) Executables =========== From 3ad5243b188820ef61624ea761344d8fd3391e49 Mon Sep 17 00:00:00 2001 From: Taylor Gerring Date: Mon, 27 Apr 2015 13:58:32 -0500 Subject: [PATCH 3/3] Return Gas Price not Gas And output as quantity, not data --- rpc/api.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rpc/api.go b/rpc/api.go index cbf03ed86..5930a4c7b 100644 --- a/rpc/api.go +++ b/rpc/api.go @@ -63,8 +63,8 @@ func (api *EthereumApi) GetRequestReply(req *RpcRequest, reply *interface{}) err case "eth_mining": *reply = api.xeth().IsMining() case "eth_gasPrice": - v := xeth.DefaultGas() - *reply = newHexData(v.Bytes()) + v := xeth.DefaultGasPrice() + *reply = newHexNum(v.Bytes()) case "eth_accounts": *reply = api.xeth().Accounts() case "eth_blockNumber":