aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeffrey Wilcke <geffobscura@gmail.com>2015-07-27 19:44:37 +0800
committerJeffrey Wilcke <geffobscura@gmail.com>2015-07-29 21:12:12 +0800
commitd261c3f455b880bfdbefe657df188dc095e2f508 (patch)
tree31e6636527f399608eb29804c5fc024fd8ac2104
parentfa286688ab55ba5df96303c6c456ea7b7688ba2d (diff)
downloaddexon-d261c3f455b880bfdbefe657df188dc095e2f508.tar
dexon-d261c3f455b880bfdbefe657df188dc095e2f508.tar.gz
dexon-d261c3f455b880bfdbefe657df188dc095e2f508.tar.bz2
dexon-d261c3f455b880bfdbefe657df188dc095e2f508.tar.lz
dexon-d261c3f455b880bfdbefe657df188dc095e2f508.tar.xz
dexon-d261c3f455b880bfdbefe657df188dc095e2f508.tar.zst
dexon-d261c3f455b880bfdbefe657df188dc095e2f508.zip
rpc: to in Call no longer required. Fixed eth_estimateGas
-rw-r--r--rpc/api/args_test.go6
-rw-r--r--rpc/api/eth.go2
-rw-r--r--rpc/api/eth_args.go4
3 files changed, 4 insertions, 8 deletions
diff --git a/rpc/api/args_test.go b/rpc/api/args_test.go
index bb279718b..23ae2930d 100644
--- a/rpc/api/args_test.go
+++ b/rpc/api/args_test.go
@@ -935,9 +935,9 @@ func TestCallArgsNotStrings(t *testing.T) {
func TestCallArgsToEmpty(t *testing.T) {
input := `[{"from": "0xb60e8dd61c5d32be8058bb8eb970870f07233155"}]`
args := new(CallArgs)
- str := ExpectValidationError(json.Unmarshal([]byte(input), &args))
- if len(str) > 0 {
- t.Error(str)
+ err := json.Unmarshal([]byte(input), &args)
+ if err != nil {
+ t.Error("Did not expect error. Got", err)
}
}
diff --git a/rpc/api/eth.go b/rpc/api/eth.go
index ed636004c..328cd4f19 100644
--- a/rpc/api/eth.go
+++ b/rpc/api/eth.go
@@ -322,7 +322,7 @@ func (self *ethApi) EstimateGas(req *shared.Request) (interface{}, error) {
if len(gas) == 0 {
return newHexNum(0), nil
} else {
- return newHexNum(gas), nil
+ return newHexNum(common.String2Big(gas)), err
}
}
diff --git a/rpc/api/eth_args.go b/rpc/api/eth_args.go
index ae394e7ec..2f864b5c1 100644
--- a/rpc/api/eth_args.go
+++ b/rpc/api/eth_args.go
@@ -469,10 +469,6 @@ func (args *CallArgs) UnmarshalJSON(b []byte) (err error) {
}
args.From = ext.From
-
- if len(ext.To) == 0 {
- return shared.NewValidationError("to", "is required")
- }
args.To = ext.To
var num *big.Int