diff --git a/rpc/v0/codec.go b/rpc/v0/codec.go index 87eb73b3d6c4bd2dddbd701448fdb613aca07772..344c1c98f12977352419dcd1247659b0de59e4ec 100644 --- a/rpc/v0/codec.go +++ b/rpc/v0/codec.go @@ -45,6 +45,8 @@ func (this *TCodec) EncodeBytes(v interface{}) ([]byte, error) { return wire.JSONBytes(v), nil } +// TODO: [ben] implement EncodeBytesPtr ? + // Decode from an io.Reader. func (this *TCodec) Decode(v interface{}, r io.Reader) error { bts, errR := ioutil.ReadAll(r) @@ -65,8 +67,7 @@ func (this *TCodec) DecodeBytes(v interface{}, bts []byte) error { // Decode from a byte array pointer. func (this *TCodec) DecodeBytesPtr(v interface{}, bts []byte) error { - var err error - wire.ReadJSONPtr(v, bts, &err) - return err + var err error + wire.ReadJSONPtr(v, bts, &err) + return err } - diff --git a/rpc/v0/json_service_data_test.go b/rpc/v0/json_service_data_test.go index e37f6733291b061e1eff915da304e0c03a70c6e9..96be04138a4d5399650a4ae00570049754600b88 100644 --- a/rpc/v0/json_service_data_test.go +++ b/rpc/v0/json_service_data_test.go @@ -64,7 +64,7 @@ func TestCallTxJsonFormatCodec(t *testing.T) { request := &rpc.RPCRequest{} assert.NoError(t, json.Unmarshal(testBroadcastCallTxJsonRequest, request), "Provided JSON test data does not unmarshal to rpc.RPCRequest object.") - assert.NoError(t, codec.DecodeBytes(param, request.Params), + assert.NoError(t, codec.DecodeBytesPtr(param, request.Params), "RPC codec failed to decode params as transaction type.") _, ok := (*param).(*txs.CallTx) assert.True(t, ok, "Type byte 0x02 should unmarshal into CallTx.")