Skip to content

Commit 686d006

Browse files
committed
crud: remove NewEncoder/NewDecoder from the API
This is only needed for tests. Let it be private API. Part of #271
1 parent e257ff3 commit 686d006

6 files changed

+23
-15
lines changed

crud/msgpack.go

-6
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
package crud
55

66
import (
7-
"io"
8-
97
"gopkg.in/vmihailenco/msgpack.v2"
108
)
119

@@ -23,7 +21,3 @@ type MapObject map[string]interface{}
2321
func (o MapObject) EncodeMsgpack(enc *encoder) {
2422
enc.Encode(o)
2523
}
26-
27-
func NewEncoder(w io.Writer) *encoder {
28-
return msgpack.NewEncoder(w)
29-
}

crud/msgpack_helper_test.go

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
//go:build !go_tarantool_msgpack_v5
2+
// +build !go_tarantool_msgpack_v5
3+
4+
package crud_test
5+
6+
import (
7+
"gopkg.in/vmihailenco/msgpack.v2"
8+
)
9+
10+
var newEncoder = msgpack.NewEncoder

crud/msgpack_v5.go

-6
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
package crud
55

66
import (
7-
"io"
8-
97
"github.com/vmihailenco/msgpack/v5"
108
)
119

@@ -23,7 +21,3 @@ type MapObject map[string]interface{}
2321
func (o MapObject) EncodeMsgpack(enc *encoder) {
2422
enc.Encode(o)
2523
}
26-
27-
func NewEncoder(w io.Writer) *encoder {
28-
return msgpack.NewEncoder(w)
29-
}

crud/msgpack_v5_helper_test.go

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
//go:build go_tarantool_msgpack_v5
2+
// +build go_tarantool_msgpack_v5
3+
4+
package crud_test
5+
6+
import (
7+
"github.com/vmihailenco/msgpack/v5"
8+
)
9+
10+
var newEncoder = msgpack.NewEncoder

crud/request_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -94,12 +94,12 @@ var resolver ValidSchemeResolver
9494
func assertBodyEqual(t testing.TB, reference tarantool.Request, req tarantool.Request) {
9595
t.Helper()
9696

97-
reqBody, err := test_helpers.ExtractRequestBody(req, &resolver, crud.NewEncoder)
97+
reqBody, err := test_helpers.ExtractRequestBody(req, &resolver, newEncoder)
9898
if err != nil {
9999
t.Fatalf("An unexpected Response.Body() error: %q", err.Error())
100100
}
101101

102-
refBody, err := test_helpers.ExtractRequestBody(reference, &resolver, crud.NewEncoder)
102+
refBody, err := test_helpers.ExtractRequestBody(reference, &resolver, newEncoder)
103103
if err != nil {
104104
t.Fatalf("An unexpected Response.Body() error: %q", err.Error())
105105
}

crud/tarantool_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ func BenchmarkCrud(b *testing.B) {
123123

124124
buf := bytes.Buffer{}
125125
buf.Grow(512 * 1024 * 1024) // Avoid allocs in test.
126-
enc := crud.NewEncoder(&buf)
126+
enc := newEncoder(&buf)
127127

128128
b.ResetTimer()
129129

0 commit comments

Comments
 (0)