aboutsummaryrefslogtreecommitdiffstats
path: root/rpc
diff options
context:
space:
mode:
authorTaylor Gerring <taylor.gerring@gmail.com>2015-03-26 23:19:33 +0800
committerTaylor Gerring <taylor.gerring@gmail.com>2015-03-26 23:19:33 +0800
commit745dd5b7a517cf0930f96a9b162821d0d631dea9 (patch)
treec2f645a18754c98d59804b7adb417d1b377d0889 /rpc
parentf695d013548ca3399ac2f2900307bf085290aa61 (diff)
downloaddexon-745dd5b7a517cf0930f96a9b162821d0d631dea9.tar
dexon-745dd5b7a517cf0930f96a9b162821d0d631dea9.tar.gz
dexon-745dd5b7a517cf0930f96a9b162821d0d631dea9.tar.bz2
dexon-745dd5b7a517cf0930f96a9b162821d0d631dea9.tar.lz
dexon-745dd5b7a517cf0930f96a9b162821d0d631dea9.tar.xz
dexon-745dd5b7a517cf0930f96a9b162821d0d631dea9.tar.zst
dexon-745dd5b7a517cf0930f96a9b162821d0d631dea9.zip
Sha3Args
Diffstat (limited to 'rpc')
-rw-r--r--rpc/args.go6
-rw-r--r--rpc/args_test.go55
2 files changed, 48 insertions, 13 deletions
diff --git a/rpc/args.go b/rpc/args.go
index d3449928b..b23216c98 100644
--- a/rpc/args.go
+++ b/rpc/args.go
@@ -388,8 +388,12 @@ func (args *Sha3Args) UnmarshalJSON(b []byte) (err error) {
if 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
}
diff --git a/rpc/args_test.go b/rpc/args_test.go
index fa46f6515..0c7360c53 100644
--- a/rpc/args_test.go
+++ b/rpc/args_test.go
@@ -10,18 +10,6 @@ import (
"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 {
var str string
switch err.(type) {
@@ -74,6 +62,47 @@ func ExpectDecodeParamError(err error) string {
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) {
input := `["0x407d73d8a49eeb85d32cf465507dd71d507100c1", "0x1f"]`
expected := new(GetBalanceArgs)
@@ -119,6 +148,8 @@ func TestGetBalanceArgsEmpty(t *testing.T) {
args := new(GetBalanceArgs)
str := ExpectInsufficientParamsError(json.Unmarshal([]byte(input), &args))
+ if len(str) > 0 {
+ t.Error(str)
}
}