Merge pull request #743 from twmb/serde-touchup

pkg/sr: move SerdeHeader arg before id, index
twmb · May 26, 2024 · c232f84 · c232f84
2 parents d70b761 + ca6b61a
commit c232f84
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/pkg/sr/serde.go b/pkg/sr/serde.go
@@ -395,8 +395,8 @@ func (s *Serde) decodeFind(b []byte) ([]byte, tserde, error) {
 
 // Encode encodes a value and prepends the header. If the encoding function
 // fails, this returns an error.
-func Encode(v any, id int, index []int, h SerdeHeader, enc func(any) ([]byte, error)) ([]byte, error) {
-	return AppendEncode(nil, v, id, index, h, func(b []byte, val any) ([]byte, error) {
+func Encode(v any, h SerdeHeader, id int, index []int, enc func(any) ([]byte, error)) ([]byte, error) {
+	return AppendEncode(nil, v, h, id, index, func(b []byte, val any) ([]byte, error) {
 		encoded, err := enc(val)
 		if err != nil {
 			return nil, err
@@ -407,7 +407,7 @@ func Encode(v any, id int, index []int, h SerdeHeader, enc func(any) ([]byte, er
 
 // AppendEncode encodes a value and prepends the header, appends it to b and
 // returns b. If the encoding function fails, this returns an error.
-func AppendEncode(b []byte, v any, id int, index []int, h SerdeHeader, enc func([]byte, any) ([]byte, error)) ([]byte, error) {
+func AppendEncode(b []byte, v any, h SerdeHeader, id int, index []int, enc func([]byte, any) ([]byte, error)) ([]byte, error) {
 	b, err := h.AppendEncode(b, id, index)
 	if err != nil {
 		return nil, err

diff --git a/pkg/sr/serde_test.go b/pkg/sr/serde_test.go
@@ -112,7 +112,7 @@ func TestSerde(t *testing.T) {
 			t.Errorf("#%d got MustAppendEncode(%v) != Encode(foo%v)", i, b2, b)
 		}
 
-		bIndented, err := Encode(test.enc, 100, []int{0}, serde.header(), func(v any) ([]byte, error) {
+		bIndented, err := Encode(test.enc, serde.header(), 100, []int{0}, func(v any) ([]byte, error) {
 			return json.MarshalIndent(v, "", "  ")
 		})
 		if err != nil {