aboutsummaryrefslogtreecommitdiffstats
path: root/rpc
diff options
context:
space:
mode:
authorTaylor Gerring <taylor.gerring@gmail.com>2015-04-07 19:49:31 +0800
committerTaylor Gerring <taylor.gerring@gmail.com>2015-04-07 19:49:31 +0800
commitd0c3f127eee44274f72377085535d4c25e8b0f55 (patch)
tree9cae5021537c395e1b82152fb5ea522ea812b550 /rpc
parent1aaeae292db02aec1b16cf313fdcc874deac9603 (diff)
downloadgo-tangerine-d0c3f127eee44274f72377085535d4c25e8b0f55.tar.gz
go-tangerine-d0c3f127eee44274f72377085535d4c25e8b0f55.tar.zst
go-tangerine-d0c3f127eee44274f72377085535d4c25e8b0f55.zip
More type fixes
Diffstat (limited to 'rpc')
-rw-r--r--rpc/api.go19
1 files changed, 9 insertions, 10 deletions
diff --git a/rpc/api.go b/rpc/api.go
index 91142e387..6e2ae2e93 100644
--- a/rpc/api.go
+++ b/rpc/api.go
@@ -98,7 +98,7 @@ func (api *EthereumApi) GetRequestReply(req *RpcRequest, reply *interface{}) err
}
count := api.xethAtStateNum(args.BlockNumber).TxCountAt(args.Address)
- *reply = common.ToHex(big.NewInt(int64(count)).Bytes())
+ *reply = newHexNum(big.NewInt(int64(count)).Bytes())
case "eth_getBlockTransactionCountByHash":
args := new(HashArgs)
if err := json.Unmarshal(req.Params, &args); err != nil {
@@ -109,7 +109,7 @@ func (api *EthereumApi) GetRequestReply(req *RpcRequest, reply *interface{}) err
if block == nil {
*reply = nil
} else {
- *reply = common.ToHex(big.NewInt(int64(len(block.Transactions))).Bytes())
+ *reply = newHexNum(big.NewInt(int64(len(block.Transactions))).Bytes())
}
case "eth_getBlockTransactionCountByNumber":
args := new(BlockNumArg)
@@ -123,7 +123,7 @@ func (api *EthereumApi) GetRequestReply(req *RpcRequest, reply *interface{}) err
break
}
- *reply = common.ToHex(big.NewInt(int64(len(block.Transactions))).Bytes())
+ *reply = newHexNum(big.NewInt(int64(len(block.Transactions))).Bytes())
case "eth_getUncleCountByBlockHash":
args := new(HashArgs)
if err := json.Unmarshal(req.Params, &args); err != nil {
@@ -137,7 +137,7 @@ func (api *EthereumApi) GetRequestReply(req *RpcRequest, reply *interface{}) err
break
}
- *reply = common.ToHex(big.NewInt(int64(len(br.Uncles))).Bytes())
+ *reply = newHexNum(big.NewInt(int64(len(br.Uncles))).Bytes())
case "eth_getUncleCountByBlockNumber":
args := new(BlockNumArg)
if err := json.Unmarshal(req.Params, &args); err != nil {
@@ -151,7 +151,7 @@ func (api *EthereumApi) GetRequestReply(req *RpcRequest, reply *interface{}) err
break
}
- *reply = common.ToHex(big.NewInt(int64(len(br.Uncles))).Bytes())
+ *reply = newHexNum(big.NewInt(int64(len(br.Uncles))).Bytes())
case "eth_getData", "eth_getCode":
args := new(GetDataArgs)
if err := json.Unmarshal(req.Params, &args); err != nil {
@@ -305,14 +305,13 @@ func (api *EthereumApi) GetRequestReply(req *RpcRequest, reply *interface{}) err
}
id := api.xeth().RegisterFilter(args.Earliest, args.Latest, args.Skip, args.Max, args.Address, args.Topics)
- *reply = common.ToHex(big.NewInt(int64(id)).Bytes())
+ *reply = newHexNum(big.NewInt(int64(id)).Bytes())
case "eth_newBlockFilter":
args := new(FilterStringArgs)
if err := json.Unmarshal(req.Params, &args); err != nil {
return err
}
- id := api.xeth().NewFilterString(args.Word)
- *reply = common.ToHex(big.NewInt(int64(id)).Bytes())
+ *reply = newHexNum(api.xeth().NewFilterString(args.Word))
case "eth_uninstallFilter":
args := new(FilterIdArgs)
if err := json.Unmarshal(req.Params, &args); err != nil {
@@ -394,7 +393,7 @@ func (api *EthereumApi) GetRequestReply(req *RpcRequest, reply *interface{}) err
}
res, _ := api.xeth().DbGet([]byte(args.Database + args.Key))
- *reply = common.ToHex(res)
+ *reply = newHexData(res)
case "shh_version":
*reply = api.xeth().WhisperVersion()
case "shh_post":
@@ -435,7 +434,7 @@ func (api *EthereumApi) GetRequestReply(req *RpcRequest, reply *interface{}) err
opts.To = args.To
opts.Topics = args.Topics
id := api.xeth().NewWhisperFilter(opts)
- *reply = common.ToHex(big.NewInt(int64(id)).Bytes())
+ *reply = newHexNum(big.NewInt(int64(id)).Bytes())
case "shh_uninstallFilter":
args := new(FilterIdArgs)
if err := json.Unmarshal(req.Params, &args); err != nil {