From fc92abec2cc6e27e7e56a6a05850ad4ebbf63d7e Mon Sep 17 00:00:00 2001 From: Felix Lange Date: Thu, 15 Jan 2015 23:21:41 +0100 Subject: rlp: allow encoding non-empty interface values This needs to be supported because []someInterface does occur sometimes. Funny enough, the fix involves changes to the decoder. makeDecoder cannot return an error for non-empty interfaces anymore because the type cache builds both decoder and writer. Do the check at 'runtime' instead. --- rlp/encode_test.go | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'rlp/encode_test.go') diff --git a/rlp/encode_test.go b/rlp/encode_test.go index 8dba3671b..18b843737 100644 --- a/rlp/encode_test.go +++ b/rlp/encode_test.go @@ -32,9 +32,19 @@ func (e byteEncoder) EncodeRLP(w io.Writer) error { return nil } +type encodableReader struct { + A, B uint +} + +func (e *encodableReader) Read(b []byte) (int, error) { + panic("called") +} + var ( _ = Encoder(&testEncoder{}) _ = Encoder(byteEncoder(0)) + + reader io.Reader = &encodableReader{1, 2} ) type encTest struct { @@ -176,6 +186,9 @@ var encTests = []encTest{ {val: (*[]struct{ uint })(nil), output: "C0"}, {val: (*interface{})(nil), output: "C0"}, + // interfaces + {val: []io.Reader{reader}, output: "C3C20102"}, // the contained value is a struct + // Encoder {val: (*testEncoder)(nil), output: "00000000"}, {val: &testEncoder{}, output: "00010001000100010001"}, -- cgit