2
0

Shorten constructor function names

This commit is contained in:
Jack Christensen
2019-06-08 18:10:49 -05:00
parent ecdcf4a367
commit 4e6b8011b6
2 changed files with 8 additions and 6 deletions
+5 -3
View File
@@ -20,8 +20,9 @@ type Config struct {
MinBufLen int // Minimum buffer length MinBufLen int // Minimum buffer length
} }
func NewChunkReader(r io.Reader) *ChunkReader { // New creates and returns a new ChunkReader for r with default configuration.
cr, err := NewChunkReaderEx(r, Config{}) func New(r io.Reader) *ChunkReader {
cr, err := NewConfig(r, Config{})
if err != nil { if err != nil {
panic("default config can't be bad") panic("default config can't be bad")
} }
@@ -29,7 +30,8 @@ func NewChunkReader(r io.Reader) *ChunkReader {
return cr return cr
} }
func NewChunkReaderEx(r io.Reader, config Config) (*ChunkReader, error) { // NewConfig creates and a new ChunkReader for r configured by config.
func NewConfig(r io.Reader, config Config) (*ChunkReader, error) {
if config.MinBufLen == 0 { if config.MinBufLen == 0 {
config.MinBufLen = 4096 config.MinBufLen = 4096
} }
+3 -3
View File
@@ -7,7 +7,7 @@ import (
func TestChunkReaderNextDoesNotReadIfAlreadyBuffered(t *testing.T) { func TestChunkReaderNextDoesNotReadIfAlreadyBuffered(t *testing.T) {
server := &bytes.Buffer{} server := &bytes.Buffer{}
r, err := NewChunkReaderEx(server, Config{MinBufLen: 4}) r, err := NewConfig(server, Config{MinBufLen: 4})
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@@ -44,7 +44,7 @@ func TestChunkReaderNextDoesNotReadIfAlreadyBuffered(t *testing.T) {
func TestChunkReaderNextExpandsBufAsNeeded(t *testing.T) { func TestChunkReaderNextExpandsBufAsNeeded(t *testing.T) {
server := &bytes.Buffer{} server := &bytes.Buffer{}
r, err := NewChunkReaderEx(server, Config{MinBufLen: 4}) r, err := NewConfig(server, Config{MinBufLen: 4})
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@@ -66,7 +66,7 @@ func TestChunkReaderNextExpandsBufAsNeeded(t *testing.T) {
func TestChunkReaderDoesNotReuseBuf(t *testing.T) { func TestChunkReaderDoesNotReuseBuf(t *testing.T) {
server := &bytes.Buffer{} server := &bytes.Buffer{}
r, err := NewChunkReaderEx(server, Config{MinBufLen: 4}) r, err := NewConfig(server, Config{MinBufLen: 4})
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }