TrueCloudLab/neoneo-go
7
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity

io: add support for pointer receivers in WriteArray()

Browse source 
It's actually preferable to have pointer receivers for serializable types, so
this should be supported.
This commit is contained in:
Roman Khimov 2019-12-09 16:57:25 +03:00
parent 052ba1e94f
commit b542a5e7a0
2 changed files with 26 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkg/io/binaryWriter.go
View file

@ -49,7 +49,10 @@ func (w *BinWriter) WriteArray(arr interface{}) {
for i := 0; i < val.Len(); i++ {
el, ok := val.Index(i).Interface().(encodable)
if !ok {
panic(typ.String() + "is not encodable")
el, ok = val.Index(i).Addr().Interface().(encodable)
if !ok {
panic(typ.String() + " is not encodable")
}
}
el.EncodeBinary(w)

22
pkg/io/binaryrw_test.go
View file

@ -229,6 +229,18 @@ func (t *testSerializable) DecodeBinary(r *BinReader) {
r.ReadLE(t)
}
type testPtrSerializable uint16
// EncodeBinary implements io.Serializable interface.
func (t *testPtrSerializable) EncodeBinary(w *BinWriter) {
w.WriteLE(t)
}
// DecodeBinary implements io.Serializable interface.
func (t *testPtrSerializable) DecodeBinary(r *BinReader) {
r.ReadLE(t)
}
func TestBinWriter_WriteArray(t *testing.T) {
var arr [3]testSerializable
for i := range arr {
@ -272,6 +284,16 @@ func TestBinWriter_WriteArray(t *testing.T) {
w.Reset()
w.Err = errors.New("error")
require.Panics(t, func() { w.WriteArray(make(chan testSerializable)) })
// Ptr receiver test
var arrPtr [3]testPtrSerializable
for i := range arrPtr {
arrPtr[i] = testPtrSerializable(i)
}
w.Reset()
w.WriteArray(arr[:])
require.NoError(t, w.Err)
require.Equal(t, expected, w.Bytes())
}
func TestBinReader_ReadArray(t *testing.T) {