GetStorageAtArgs

3 files changed, 74 insertions, 27 deletions

diff --git a/rpc/api.go b/rpc/api.go
index f5ce8acb6..10d2e529e 100644
--- a/rpc/api.go
+++ b/rpc/api.go
@@ -112,12 +112,9 @@ func (api *EthereumApi) GetRequestReply(req *RpcRequest, reply *interface{}) err
 		if err := json.Unmarshal(req.Params, &args); err != nil {
 			return err
 		}
-		if err := args.requirements(); err != nil {
-			return err
-		}
 
-		state := api.xethAtStateNum(args.BlockNumber).State().SafeGet(args.Address)
-		value := state.StorageString(args.Key)
+		state := api.xethAtStateNum(args.BlockNumber).State().SafeGet(args.Address.Hex())
+		value := state.StorageString(args.Key.Hex())
 
 		*reply = common.Bytes2Hex(value.Bytes())
 	case "eth_getTransactionCount":
diff --git a/rpc/args.go b/rpc/args.go
index 82ee00d25..84c9ee0f7 100644
--- a/rpc/args.go
+++ b/rpc/args.go
@@ -184,8 +184,8 @@ func (args *GetStorageArgs) UnmarshalJSON(b []byte) (err error) {
 }
 
 type GetStorageAtArgs struct {
-	Address     string
-	Key         string
+	Address     common.Address
+	Key         common.Hash
 	BlockNumber int64
 }
 
@@ -203,13 +203,13 @@ func (args *GetStorageAtArgs) UnmarshalJSON(b []byte) (err error) {
 	if !ok {
 		return NewDecodeParamError("Address is not a string")
 	}
-	args.Address = addstr
+	args.Address = common.HexToAddress(addstr)
 
 	keystr, ok := obj[1].(string)
 	if !ok {
 		return NewDecodeParamError("Key is not a string")
 	}
-	args.Key = keystr
+	args.Key = common.HexToHash(keystr)
 
 	if len(obj) > 2 {
 		if err := blockHeight(obj[2], &args.BlockNumber); err != nil {
@@ -220,17 +220,6 @@ func (args *GetStorageAtArgs) UnmarshalJSON(b []byte) (err error) {
 	return nil
 }
 
-func (args *GetStorageAtArgs) requirements() error {
-	if len(args.Address) == 0 {
-		return NewValidationError("Address", "cannot be blank")
-	}
-
-	if len(args.Key) == 0 {
-		return NewValidationError("Key", "cannot be blank")
-	}
-	return nil
-}
-
 type GetTxCountArgs struct {
 	Address     string
 	BlockNumber int64
diff --git a/rpc/args_test.go b/rpc/args_test.go
index e5a27e38a..dea34b956 100644
--- a/rpc/args_test.go
+++ b/rpc/args_test.go
@@ -461,8 +461,8 @@ func TestGetStorageAddressInt(t *testing.T) {
 func TestGetStorageAtArgs(t *testing.T) {
 	input := `["0x407d73d8a49eeb85d32cf465507dd71d507100c1", "0x0", "0x2"]`
 	expected := new(GetStorageAtArgs)
-	expected.Address = "0x407d73d8a49eeb85d32cf465507dd71d507100c1"
-	expected.Key = "0x0"
+	expected.Address = common.HexToAddress("0x407d73d8a49eeb85d32cf465507dd71d507100c1")
+	expected.Key = common.HexToHash("0x0")
 	expected.BlockNumber = 2
 
 	args := new(GetStorageAtArgs)
@@ -470,10 +470,6 @@ func TestGetStorageAtArgs(t *testing.T) {
 		t.Error(err)
 	}
 
-	if err := args.requirements(); err != nil {
-		t.Error(err)
-	}
-
 	if expected.Address != args.Address {
 		t.Errorf("Address shoud be %#v but is %#v", expected.Address, args.Address)
 	}
@@ -492,8 +488,73 @@ func TestGetStorageAtEmptyArgs(t *testing.T) {
 
 	args := new(GetStorageAtArgs)
 	err := json.Unmarshal([]byte(input), &args)
-	if err == nil {
+	switch err.(type) {
+	case nil:
+		t.Error("Expected error but didn't get one")
+	case *InsufficientParamsError:
+		break
+	default:
+		t.Errorf("Expected *rpc.InsufficientParamsError but got %T with message `%s`", err, err.Error())
+	}
+}
+
+func TestGetStorageAtArgsInvalid(t *testing.T) {
+	input := `{}`
+
+	args := new(GetStorageAtArgs)
+	err := json.Unmarshal([]byte(input), &args)
+	switch err.(type) {
+	case nil:
+		t.Error("Expected error but didn't get one")
+	case *DecodeParamError:
+		break
+	default:
+		t.Errorf("Expected *rpc.DecodeParamError but got %T with message `%s`", err, err.Error())
+	}
+}
+
+func TestGetStorageAtArgsAddressNotString(t *testing.T) {
+	input := `[true, "0x0", "0x2"]`
+
+	args := new(GetStorageAtArgs)
+	err := json.Unmarshal([]byte(input), &args)
+	switch err.(type) {
+	case nil:
 		t.Error("Expected error but didn't get one")
+	case *DecodeParamError:
+		break
+	default:
+		t.Errorf("Expected *rpc.DecodeParamError but got %T with message `%s`", err, err.Error())
+	}
+}
+
+func TestGetStorageAtArgsKeyNotString(t *testing.T) {
+	input := `["0x407d73d8a49eeb85d32cf465507dd71d507100c1", true, "0x2"]`
+
+	args := new(GetStorageAtArgs)
+	err := json.Unmarshal([]byte(input), &args)
+	switch err.(type) {
+	case nil:
+		t.Error("Expected error but didn't get one")
+	case *DecodeParamError:
+		break
+	default:
+		t.Errorf("Expected *rpc.DecodeParamError but got %T with message `%s`", err, err.Error())
+	}
+}
+
+func TestGetStorageAtArgsValueNotString(t *testing.T) {
+	input := `["0x407d73d8a49eeb85d32cf465507dd71d507100c1", "0x1", true]`
+
+	args := new(GetStorageAtArgs)
+	err := json.Unmarshal([]byte(input), &args)
+	switch err.(type) {
+	case nil:
+		t.Error("Expected error but didn't get one")
+	case *DecodeParamError:
+		break
+	default:
+		t.Errorf("Expected *rpc.DecodeParamError but got %T with message `%s`", err, err.Error())
 	}
 }