bug fix

Author: ziranliu

common/serialize.go

@@ -78,6 +78,21 @@ func (sn *SimpleNotation) WriteBytesSlice(p [][]byte, escape bool) {
 	sn.WriteBytes(buf.Bytes(), false)
 }
 
+// WriteStringSlice writes a string slice to buffer.
+func (sn *SimpleNotation) WriteStringSlice(p []string, escape bool) {
+	var buf bytes.Buffer
+	for _, s := range p {
+		buf.WriteByte(sn.sliceSep)
+		bs := []byte(s)
+		if escape {
+			bs = sn.escape(bs)
+		}
+		buf.Write(bs)
+	}
+
+	sn.WriteBytes(buf.Bytes(), false)
+}
+
 // WriteMapStringToI64 writes a map[string]int64 to buffer.
 func (sn *SimpleNotation) WriteMapStringToI64(m map[string]int64, escape bool) {
 	key := make([]string, 0, len(m))

common/serialize_test.go

@@ -54,6 +54,15 @@ func TestWriteBytesSlice(t *testing.T) {
 	assert.Equal(t, []byte{'`', '^', 'a', 'a', '^', 'b', 'b', '`', '^', '\\', '^', '\\', '`'}, sn.Bytes())
 }
 
+func TestWriteStringSlice(t *testing.T) {
+	sn := NewSimpleNotation()
+	sn.WriteStringSlice([]string{"aa", "bb"}, true)
+	assert.Equal(t, []byte{'`', '^', 'a', 'a', '^', 'b', 'b'}, sn.Bytes())
+
+	sn.WriteBytesSlice([][]byte{[]byte("^`")}, true)
+	assert.Equal(t, []byte{'`', '^', 'a', 'a', '^', 'b', 'b', '`', '^', '\\', '^', '\\', '`'}, sn.Bytes())
+}
+
 func TestWriteMapStringToI64(t *testing.T) {
 	sn := NewSimpleNotation()
 	sn.WriteMapStringToI64(map[string]int64{"bb": 1024, "aa": 7}, true)

core/tx/tx.go

@@ -246,17 +246,15 @@ func (t *Tx) ToBytes(l ToBytesLevel) []byte {
 	sn.WriteInt64(t.GasPrice, true)
 	sn.WriteInt64(t.GasLimit, true)
 	sn.WriteInt64(t.Delay, true)
-	for _, signer := range t.Signers {
-		sn.WriteString(signer, true)
+
+	sn.WriteStringSlice(t.Signers, true)
+	actionBytes := make([][]byte, 0, len(t.Actions))
+	for _, a := range t.Actions {
+		actionBytes = append(actionBytes, a.ToBytes())
 	}
+	sn.WriteBytesSlice(actionBytes, false)
 
 	if l > Base {
-		actionBytes := make([][]byte, 0, len(t.Actions))
-		for _, a := range t.Actions {
-			actionBytes = append(actionBytes, a.ToBytes())
-		}
-		sn.WriteBytesSlice(actionBytes, false)
-
 		signBytes := make([][]byte, 0, len(t.Signs))
 		for _, sig := range t.Signs {
 			signBytes = append(signBytes, sig.ToBytes())