roysc/plugeth
1
0
Fork 0
forked from cerc-io/plugeth
Code Pull Requests Activity

Sha3Args

Browse Source
This commit is contained in:
Taylor Gerring 2015-03-26 16:19:33 +01:00
parent f695d01354
commit 745dd5b7a5
2 changed files with 48 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rpc/args.go
View File

@ -388,8 +388,12 @@ func (args *Sha3Args) UnmarshalJSON(b []byte) (err error) {
if len(obj) < 1 { if len(obj) < 1 {
return NewInsufficientParamsError(len(obj), 1) return NewInsufficientParamsError(len(obj), 1)
} }
args.Data = obj[0].(string)
argstr, ok := obj[0].(string)
if !ok {
return NewInvalidTypeError("data", "is not a string")
}
args.Data = argstr
return nil return nil
} }

55
rpc/args_test.go
View File

@ -10,18 +10,6 @@ import (
"github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common"
) )
func TestSha3(t *testing.T) {
input := `["0x68656c6c6f20776f726c64"]`
expected := "0x68656c6c6f20776f726c64"
args := new(Sha3Args)
json.Unmarshal([]byte(input), &args)
if args.Data != expected {
t.Error("got %s expected %s", input, expected)
}
}
func ExpectValidationError(err error) string { func ExpectValidationError(err error) string {
var str string var str string
switch err.(type) { switch err.(type) {
@ -74,6 +62,47 @@ func ExpectDecodeParamError(err error) string {
return str return str
} }
func TestSha3(t *testing.T) {
input := `["0x68656c6c6f20776f726c64"]`
expected := "0x68656c6c6f20776f726c64"
args := new(Sha3Args)
json.Unmarshal([]byte(input), &args)
if args.Data != expected {
t.Error("got %s expected %s", input, expected)
}
}
func TestSha3ArgsInvalid(t *testing.T) {
input := `{}`
args := new(Sha3Args)
str := ExpectDecodeParamError(json.Unmarshal([]byte(input), &args))
if len(str) > 0 {
t.Error(str)
}
}
func TestSha3ArgsEmpty(t *testing.T) {
input := `[]`
args := new(Sha3Args)
str := ExpectInsufficientParamsError(json.Unmarshal([]byte(input), &args))
if len(str) > 0 {
t.Error(str)
}
}
func TestSha3ArgsDataInvalid(t *testing.T) {
input := `[4]`
args := new(Sha3Args)
str := ExpectInvalidTypeError(json.Unmarshal([]byte(input), &args))
if len(str) > 0 {
t.Error(str)
}
}
func TestGetBalanceArgs(t *testing.T) { func TestGetBalanceArgs(t *testing.T) {
input := `["0x407d73d8a49eeb85d32cf465507dd71d507100c1", "0x1f"]` input := `["0x407d73d8a49eeb85d32cf465507dd71d507100c1", "0x1f"]`
expected := new(GetBalanceArgs) expected := new(GetBalanceArgs)
@ -119,6 +148,8 @@ func TestGetBalanceArgsEmpty(t *testing.T) {
args := new(GetBalanceArgs) args := new(GetBalanceArgs)
str := ExpectInsufficientParamsError(json.Unmarshal([]byte(input), &args)) str := ExpectInsufficientParamsError(json.Unmarshal([]byte(input), &args))
if len(str) > 0 {
t.Error(str)
} }
} }