aboutsummaryrefslogtreecommitdiffstats
path: root/rlp
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2015-02-13 22:35:54 +0800
committerobscuren <geffobscura@gmail.com>2015-02-13 22:35:54 +0800
commit76fa75b39439e6c8c83ebc03fb32aa615227cc44 (patch)
tree9b755296ae96dd5e4ced28d6de4d5abfdeb33915 /rlp
parent75d164037fb9bbf75def7c5501727fd634ef124f (diff)
parent32a9c0ca809508c1648b8f44f3e09725af7a80d3 (diff)
downloaddexon-76fa75b39439e6c8c83ebc03fb32aa615227cc44.tar
dexon-76fa75b39439e6c8c83ebc03fb32aa615227cc44.tar.gz
dexon-76fa75b39439e6c8c83ebc03fb32aa615227cc44.tar.bz2
dexon-76fa75b39439e6c8c83ebc03fb32aa615227cc44.tar.lz
dexon-76fa75b39439e6c8c83ebc03fb32aa615227cc44.tar.xz
dexon-76fa75b39439e6c8c83ebc03fb32aa615227cc44.tar.zst
dexon-76fa75b39439e6c8c83ebc03fb32aa615227cc44.zip
wip
Diffstat (limited to 'rlp')
-rw-r--r--rlp/encode.go22
-rw-r--r--rlp/encode_test.go6
2 files changed, 27 insertions, 1 deletions
diff --git a/rlp/encode.go b/rlp/encode.go
index 6ae4a123a..9d11d66bf 100644
--- a/rlp/encode.go
+++ b/rlp/encode.go
@@ -350,8 +350,10 @@ func makeWriter(typ reflect.Type) (writer, error) {
return writeUint, nil
case kind == reflect.String:
return writeString, nil
- case kind == reflect.Slice && typ.Elem().Kind() == reflect.Uint8 && !typ.Elem().Implements(encoderInterface):
+ case kind == reflect.Slice && isByte(typ.Elem()):
return writeBytes, nil
+ case kind == reflect.Array && isByte(typ.Elem()):
+ return writeByteArray, nil
case kind == reflect.Slice || kind == reflect.Array:
return makeSliceWriter(typ)
case kind == reflect.Struct:
@@ -363,6 +365,10 @@ func makeWriter(typ reflect.Type) (writer, error) {
}
}
+func isByte(typ reflect.Type) bool {
+ return typ.Kind() == reflect.Uint8 && !typ.Implements(encoderInterface)
+}
+
func writeUint(val reflect.Value, w *encbuf) error {
i := val.Uint()
if i == 0 {
@@ -407,6 +413,20 @@ func writeBytes(val reflect.Value, w *encbuf) error {
return nil
}
+func writeByteArray(val reflect.Value, w *encbuf) error {
+ if !val.CanAddr() {
+ // Slice requires the value to be addressable.
+ // Make it addressable by copying.
+ copy := reflect.New(val.Type()).Elem()
+ copy.Set(val)
+ val = copy
+ }
+ size := val.Len()
+ slice := val.Slice(0, size).Bytes()
+ w.encodeString(slice)
+ return nil
+}
+
func writeString(val reflect.Value, w *encbuf) error {
s := val.String()
w.encodeStringHeader(len(s))
diff --git a/rlp/encode_test.go b/rlp/encode_test.go
index 9b3085658..c283fbd57 100644
--- a/rlp/encode_test.go
+++ b/rlp/encode_test.go
@@ -40,6 +40,8 @@ func (e *encodableReader) Read(b []byte) (int, error) {
panic("called")
}
+type namedByteType byte
+
var (
_ = Encoder(&testEncoder{})
_ = Encoder(byteEncoder(0))
@@ -102,6 +104,10 @@ var encTests = []encTest{
// byte slices, strings
{val: []byte{}, output: "80"},
{val: []byte{1, 2, 3}, output: "83010203"},
+
+ {val: []namedByteType{1, 2, 3}, output: "83010203"},
+ {val: [...]namedByteType{1, 2, 3}, output: "83010203"},
+
{val: "", output: "80"},
{val: "dog", output: "83646F67"},
{