Browse Source

comment on copied wire file

pull/465/head
Ethan Buchman 8 years ago
parent
commit
6dbcfb32d2
1 changed files with 4 additions and 9 deletions
  1. +4
    -9
      rpc/lib/server/wire.go

+ 4
- 9
rpc/lib/server/wire.go View File

@ -13,6 +13,10 @@ import (
cmn "github.com/tendermint/tmlibs/common" cmn "github.com/tendermint/tmlibs/common"
) )
// NOTE: This code is copied from go-wire in order to allow byte arrays to be treated
// differently whether they are data.Bytes (hex) or not (base64). We can't build this
// into wire directly without refactoring since we'd need to import data but data imports wire
var ( var (
timeType = wire.GetTypeFromStructDeclaration(struct{ time.Time }{}) timeType = wire.GetTypeFromStructDeclaration(struct{ time.Time }{})
) )
@ -128,7 +132,6 @@ func readReflectJSON(rv reflect.Value, rt reflect.Type, opts wire.Options, o int
*err = errors.New(cmn.Fmt("Expected bytearray of length %v but got %v", length, len(buf))) *err = errors.New(cmn.Fmt("Expected bytearray of length %v but got %v", length, len(buf)))
return return
} }
//log.Info("Read bytearray", "bytes", buf)
reflect.Copy(rv, reflect.ValueOf(buf)) reflect.Copy(rv, reflect.ValueOf(buf))
} else { } else {
oSlice, ok := o.([]interface{}) oSlice, ok := o.([]interface{})
@ -144,7 +147,6 @@ func readReflectJSON(rv reflect.Value, rt reflect.Type, opts wire.Options, o int
elemRv := rv.Index(i) elemRv := rv.Index(i)
readReflectJSON(elemRv, elemRt, opts, oSlice[i], err) readReflectJSON(elemRv, elemRt, opts, oSlice[i], err)
} }
//log.Info("Read x-array", "x", elemRt, "length", length)
} }
case reflect.Slice: case reflect.Slice:
@ -169,7 +171,6 @@ func readReflectJSON(rv reflect.Value, rt reflect.Type, opts wire.Options, o int
*err = err_ *err = err_
return return
} }
//log.Info("Read byteslice", "bytes", byteslice)
rv.Set(reflect.ValueOf(buf)) rv.Set(reflect.ValueOf(buf))
} else { } else {
// Read length // Read length
@ -179,7 +180,6 @@ func readReflectJSON(rv reflect.Value, rt reflect.Type, opts wire.Options, o int
return return
} }
length := len(oSlice) length := len(oSlice)
//log.Info("Read slice", "length", length)
sliceRv := reflect.MakeSlice(rt, length, length) sliceRv := reflect.MakeSlice(rt, length, length)
// Read elems // Read elems
for i := 0; i < length; i++ { for i := 0; i < length; i++ {
@ -237,7 +237,6 @@ func readReflectJSON(rv reflect.Value, rt reflect.Type, opts wire.Options, o int
*err = errors.New(cmn.Fmt("Expected string but got type %v", reflect.TypeOf(o))) *err = errors.New(cmn.Fmt("Expected string but got type %v", reflect.TypeOf(o)))
return return
} }
//log.Info("Read string", "str", str)
rv.SetString(str) rv.SetString(str)
case reflect.Int64, reflect.Int32, reflect.Int16, reflect.Int8, reflect.Int: case reflect.Int64, reflect.Int32, reflect.Int16, reflect.Int8, reflect.Int:
@ -246,7 +245,6 @@ func readReflectJSON(rv reflect.Value, rt reflect.Type, opts wire.Options, o int
*err = errors.New(cmn.Fmt("Expected numeric but got type %v", reflect.TypeOf(o))) *err = errors.New(cmn.Fmt("Expected numeric but got type %v", reflect.TypeOf(o)))
return return
} }
//log.Info("Read num", "num", num)
rv.SetInt(int64(num)) rv.SetInt(int64(num))
case reflect.Uint64, reflect.Uint32, reflect.Uint16, reflect.Uint8, reflect.Uint: case reflect.Uint64, reflect.Uint32, reflect.Uint16, reflect.Uint8, reflect.Uint:
@ -259,7 +257,6 @@ func readReflectJSON(rv reflect.Value, rt reflect.Type, opts wire.Options, o int
*err = errors.New(cmn.Fmt("Expected unsigned numeric but got %v", num)) *err = errors.New(cmn.Fmt("Expected unsigned numeric but got %v", num))
return return
} }
//log.Info("Read num", "num", num)
rv.SetUint(uint64(num)) rv.SetUint(uint64(num))
case reflect.Float64, reflect.Float32: case reflect.Float64, reflect.Float32:
@ -272,7 +269,6 @@ func readReflectJSON(rv reflect.Value, rt reflect.Type, opts wire.Options, o int
*err = errors.New(cmn.Fmt("Expected numeric but got type %v", reflect.TypeOf(o))) *err = errors.New(cmn.Fmt("Expected numeric but got type %v", reflect.TypeOf(o)))
return return
} }
//log.Info("Read num", "num", num)
rv.SetFloat(num) rv.SetFloat(num)
case reflect.Bool: case reflect.Bool:
@ -281,7 +277,6 @@ func readReflectJSON(rv reflect.Value, rt reflect.Type, opts wire.Options, o int
*err = errors.New(cmn.Fmt("Expected boolean but got type %v", reflect.TypeOf(o))) *err = errors.New(cmn.Fmt("Expected boolean but got type %v", reflect.TypeOf(o)))
return return
} }
//log.Info("Read boolean", "boolean", bl)
rv.SetBool(bl) rv.SetBool(bl)
default: default:


Loading…
Cancel
Save