diff options
| author | obscuren <geffobscura@gmail.com> | 2015-04-19 23:06:56 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-04-19 23:07:40 +0800 |
| commit | 8f3a7e41deff4084b166aca1337258077bd2a3e6 (patch) | |
| tree | ddc62daeec7a44c2baacb986f8c9d76df25a5976 /rlp/encode.go | |
| parent | 4683f9c0a71fd42e749da46ac56c6ba76f379931 (diff) | |
| parent | 7180699d401e64b52447ccb2cfb33004b7deb672 (diff) | |
| download | dexon-8f3a7e41deff4084b166aca1337258077bd2a3e6.tar dexon-8f3a7e41deff4084b166aca1337258077bd2a3e6.tar.gz dexon-8f3a7e41deff4084b166aca1337258077bd2a3e6.tar.bz2 dexon-8f3a7e41deff4084b166aca1337258077bd2a3e6.tar.lz dexon-8f3a7e41deff4084b166aca1337258077bd2a3e6.tar.xz dexon-8f3a7e41deff4084b166aca1337258077bd2a3e6.tar.zst dexon-8f3a7e41deff4084b166aca1337258077bd2a3e6.zip | |
Merge branch 'rlp-size-validation' of https://github.com/fjl/go-ethereum into fjl-rlp-size-validation
Conflicts:
eth/protocol.go
Diffstat (limited to 'rlp/encode.go')
| -rw-r--r-- | rlp/encode.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/rlp/encode.go b/rlp/encode.go index 6cf6776d6..10ff0ae79 100644 --- a/rlp/encode.go +++ b/rlp/encode.go @@ -194,7 +194,7 @@ func (w *encbuf) Write(b []byte) (int, error) { func (w *encbuf) encode(val interface{}) error { rval := reflect.ValueOf(val) - ti, err := cachedTypeInfo(rval.Type()) + ti, err := cachedTypeInfo(rval.Type(), tags{}) if err != nil { return err } @@ -485,7 +485,7 @@ func writeInterface(val reflect.Value, w *encbuf) error { return nil } eval := val.Elem() - ti, err := cachedTypeInfo(eval.Type()) + ti, err := cachedTypeInfo(eval.Type(), tags{}) if err != nil { return err } @@ -493,7 +493,7 @@ func writeInterface(val reflect.Value, w *encbuf) error { } func makeSliceWriter(typ reflect.Type) (writer, error) { - etypeinfo, err := cachedTypeInfo1(typ.Elem()) + etypeinfo, err := cachedTypeInfo1(typ.Elem(), tags{}) if err != nil { return nil, err } @@ -530,7 +530,7 @@ func makeStructWriter(typ reflect.Type) (writer, error) { } func makePtrWriter(typ reflect.Type) (writer, error) { - etypeinfo, err := cachedTypeInfo1(typ.Elem()) + etypeinfo, err := cachedTypeInfo1(typ.Elem(), tags{}) if err != nil { return nil, err } |