Merge pull request #1534 from obscuren/issue-1040

rpc: to in eth_call no longer required. Fixed eth_estimateGas
This commit is contained in:
Jeffrey Wilcke 2015-07-30 03:25:47 -07:00
commit 64e2f52c2e
3 changed files with 4 additions and 8 deletions

View File

@ -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)
}
}

View File

@ -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
}
}

View File

@ -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