From 7cbcd81ddce566d6d2eba0685e14f07a50683603 Mon Sep 17 00:00:00 2001 From: Taylor Gerring Date: Wed, 18 Mar 2015 15:42:57 -0400 Subject: Remove UnmarshalRawMessages --- rpc/util.go | 62 ------------------------------------------------------------- 1 file changed, 62 deletions(-) (limited to 'rpc/util.go') diff --git a/rpc/util.go b/rpc/util.go index 3e2792c07..0798ae1d2 100644 --- a/rpc/util.go +++ b/rpc/util.go @@ -17,9 +17,6 @@ package rpc import ( - "encoding/json" - "fmt" - "reflect" "time" "github.com/ethereum/go-ethereum/common" @@ -30,65 +27,6 @@ import ( var rpclogger = logger.NewLogger("RPC") -// Unmarshal state is a helper method which has the ability to decode messsages -// that use the `defaultBlock` (https://github.com/ethereum/wiki/wiki/JSON-RPC#the-default-block-parameter) -// For example a `call`: [{to: "0x....", data:"0x..."}, "latest"]. The first argument is the transaction -// message and the second one refers to the block height (or state) to which to apply this `call`. -func UnmarshalRawMessages(b []byte, iface interface{}, number *int64) (err error) { - var data []json.RawMessage - if err = json.Unmarshal(b, &data); err != nil && len(data) == 0 { - return NewDecodeParamError(err.Error()) - } - - // Hrm... Occurs when no params - if len(data) == 0 { - return NewDecodeParamError("No data") - } - - // Number index determines the index in the array for a possible block number - numberIndex := 0 - - value := reflect.ValueOf(iface) - rvalue := reflect.Indirect(value) - - switch rvalue.Kind() { - case reflect.Slice: - // This is a bit of a cheat, but `data` is expected to be larger than 2 if iface is a slice - if number != nil { - numberIndex = len(data) - 1 - } else { - numberIndex = len(data) - } - - slice := reflect.MakeSlice(rvalue.Type(), numberIndex, numberIndex) - for i, raw := range data[0:numberIndex] { - v := slice.Index(i).Interface() - if err = json.Unmarshal(raw, &v); err != nil { - fmt.Println(err, v) - return err - } - slice.Index(i).Set(reflect.ValueOf(v)) - } - reflect.Indirect(rvalue).Set(slice) //value.Set(slice) - case reflect.Struct: - fallthrough - default: - if err = json.Unmarshal(data[0], iface); err != nil { - return NewDecodeParamError(err.Error()) - } - numberIndex = 1 - } - - // <0 index means out of bound for block number - if numberIndex >= 0 && len(data) > numberIndex { - if err = blockNumber(data[numberIndex], number); err != nil { - return NewDecodeParamError(err.Error()) - } - } - - return nil -} - type Log struct { Address string `json:"address"` Topic []string `json:"topic"` -- cgit