diff options
Diffstat (limited to 'network/protocol/pktline')
6 files changed, 43 insertions, 43 deletions
diff --git a/network/protocol/pktline/chunk_writer_write_and_read_from_test.go b/network/protocol/pktline/chunk_writer_write_and_read_from_test.go index c3e2bafb..efe19e23 100644 --- a/network/protocol/pktline/chunk_writer_write_and_read_from_test.go +++ b/network/protocol/pktline/chunk_writer_write_and_read_from_test.go @@ -29,9 +29,9 @@ func TestChunkWriterWriteAndReadFrom(t *testing.T) { t.Fatalf("Write n=%d, want 7", n) } - err = enc.FlushIO() + err = enc.Flush() if err != nil { - t.Fatalf("FlushIO: %v", err) + t.Fatalf("Flush: %v", err) } if got, want := out.String(), "0007abc0007def0005g"; got != want { @@ -49,9 +49,9 @@ func TestChunkWriterWriteAndReadFrom(t *testing.T) { t.Fatalf("ReadFrom n=%d, want 4", rn) } - err = enc.FlushIO() + err = enc.Flush() if err != nil { - t.Fatalf("FlushIO: %v", err) + t.Fatalf("Flush: %v", err) } if got, want := out.String(), "0007wxy0005z"; got != want { diff --git a/network/protocol/pktline/decoder_resync_after_over_max_data_test.go b/network/protocol/pktline/decoder_resync_after_over_max_data_test.go index d4146147..42a7572e 100644 --- a/network/protocol/pktline/decoder_resync_after_over_max_data_test.go +++ b/network/protocol/pktline/decoder_resync_after_over_max_data_test.go @@ -27,9 +27,9 @@ func TestDecoderResyncAfterOverMaxData(t *testing.T) { t.Fatalf("WriteData #2: %v", err) } - err = enc.FlushIO() + err = enc.Flush() if err != nil { - t.Fatalf("FlushIO: %v", err) + t.Fatalf("Flush: %v", err) } dec := pktline.NewDecoder(bytes.NewReader(b.Bytes()), pktline.ReadOptions{}) diff --git a/network/protocol/pktline/encoder.go b/network/protocol/pktline/encoder.go index 3d92ca19..4c7dcd6e 100644 --- a/network/protocol/pktline/encoder.go +++ b/network/protocol/pktline/encoder.go @@ -87,36 +87,36 @@ func (e *Encoder) WriteString(s string) (int, error) { return len(s), nil } -// WriteFlush writes control frame 0000 (flush-pkt). -func (e *Encoder) WriteFlush() error { +// WriteFlushPacket writes control frame 0000 (flush-pkt). +func (e *Encoder) WriteFlushPacket() error { return e.writeControl(0) } -// WriteDelim writes control frame 0001 (delim-pkt). -func (e *Encoder) WriteDelim() error { +// WriteDelimPacket writes control frame 0001 (delim-pkt). +func (e *Encoder) WriteDelimPacket() error { return e.writeControl(1) } -// WriteResponseEnd writes control frame 0002 (response-end-pkt). -func (e *Encoder) WriteResponseEnd() error { +// WriteResponseEndPacket writes control frame 0002 (response-end-pkt). +func (e *Encoder) WriteResponseEndPacket() error { return e.writeControl(2) } -// FlushIO flushes buffered output in the underlying transport. +// Flush flushes buffered output in the underlying transport. // -// FlushIO does not emit any pkt-line control frame. -func (e *Encoder) FlushIO() error { +// Flush does not emit any pkt-line control frame. +func (e *Encoder) Flush() error { return e.w.Flush() } -// WriteFlushAndFlushIO writes a flush-pkt (0000) then flushes transport I/O. -func (e *Encoder) WriteFlushAndFlushIO() error { - err := e.WriteFlush() +// WriteFlushPacketAndFlush writes a flush-pkt (0000) then flushes transport I/O. +func (e *Encoder) WriteFlushPacketAndFlush() error { + err := e.WriteFlushPacket() if err != nil { return err } - return e.FlushIO() + return e.Flush() } func (e *Encoder) writeControl(n int) error { diff --git a/network/protocol/pktline/encoder_buffered_flush_and_f_flush_test.go b/network/protocol/pktline/encoder_buffered_flush_and_f_flush_test.go index 3d13bc7d..d0f26878 100644 --- a/network/protocol/pktline/encoder_buffered_flush_and_f_flush_test.go +++ b/network/protocol/pktline/encoder_buffered_flush_and_f_flush_test.go @@ -25,9 +25,9 @@ func TestEncoderBufferedFlushAndFFlush(t *testing.T) { t.Fatalf("unexpected immediate output: %q", out.String()) } - err = enc.FlushIO() + err = enc.Flush() if err != nil { - t.Fatalf("FlushIO: %v", err) + t.Fatalf("Flush: %v", err) } if out.String() != "0005x" { @@ -39,9 +39,9 @@ func TestEncoderBufferedFlushAndFFlush(t *testing.T) { enc = pktline.NewEncoder(bw) - err = enc.WriteFlushAndFlushIO() + err = enc.WriteFlushPacketAndFlush() if err != nil { - t.Fatalf("WriteFlushAndFlushIO: %v", err) + t.Fatalf("WriteFlushPacketAndFlush: %v", err) } if out.String() != "0000" { diff --git a/network/protocol/pktline/encoder_buffered_flush_behavior_test.go b/network/protocol/pktline/encoder_buffered_flush_behavior_test.go index 9daba241..b6d14b4b 100644 --- a/network/protocol/pktline/encoder_buffered_flush_behavior_test.go +++ b/network/protocol/pktline/encoder_buffered_flush_behavior_test.go @@ -21,18 +21,18 @@ func TestEncoderBufferedFlushBehavior(t *testing.T) { t.Fatalf("WriteData: %v", err) } - err = enc.WriteFlush() + err = enc.WriteFlushPacket() if err != nil { - t.Fatalf("WriteFlush: %v", err) + t.Fatalf("WriteFlushPacket: %v", err) } if out.Len() != 0 { - t.Fatalf("WriteFlush should not flush I/O, got %q", out.String()) + t.Fatalf("WriteFlushPacket should not flush I/O, got %q", out.String()) } - err = enc.FlushIO() + err = enc.Flush() if err != nil { - t.Fatalf("FlushIO: %v", err) + t.Fatalf("Flush: %v", err) } if got, want := out.String(), "0009hello0000"; got != want { @@ -48,18 +48,18 @@ func TestEncoderBufferedFlushBehavior(t *testing.T) { t.Fatalf("WriteData: %v", err) } - err = enc.WriteFlush() + err = enc.WriteFlushPacket() if err != nil { - t.Fatalf("WriteFlush: %v", err) + t.Fatalf("WriteFlushPacket: %v", err) } if out.Len() != 0 { - t.Fatalf("WriteFlush should not flush I/O, got %q", out.String()) + t.Fatalf("WriteFlushPacket should not flush I/O, got %q", out.String()) } - err = enc.FlushIO() + err = enc.Flush() if err != nil { - t.Fatalf("FlushIO: %v", err) + t.Fatalf("Flush: %v", err) } if got, want := out.String(), "0006ok0000"; got != want { @@ -75,9 +75,9 @@ func TestEncoderBufferedFlushBehavior(t *testing.T) { t.Fatalf("WriteData: %v", err) } - err = enc.WriteFlushAndFlushIO() + err = enc.WriteFlushPacketAndFlush() if err != nil { - t.Fatalf("WriteFlushAndFlushIO: %v", err) + t.Fatalf("WriteFlushPacketAndFlush: %v", err) } if got, want := out.String(), "0006yo0000"; got != want { diff --git a/network/protocol/pktline/encoder_writes_frames_test.go b/network/protocol/pktline/encoder_writes_frames_test.go index 9e4275a1..1922b277 100644 --- a/network/protocol/pktline/encoder_writes_frames_test.go +++ b/network/protocol/pktline/encoder_writes_frames_test.go @@ -22,24 +22,24 @@ func TestEncoderWritesFrames(t *testing.T) { t.Fatalf("WriteData: %v", err) } - err = enc.WriteFlush() + err = enc.WriteFlushPacket() if err != nil { - t.Fatalf("WriteFlush: %v", err) + t.Fatalf("WriteFlushPacket: %v", err) } - err = enc.WriteDelim() + err = enc.WriteDelimPacket() if err != nil { - t.Fatalf("WriteDelim: %v", err) + t.Fatalf("WriteDelimPacket: %v", err) } - err = enc.WriteResponseEnd() + err = enc.WriteResponseEndPacket() if err != nil { - t.Fatalf("WriteResponseEnd: %v", err) + t.Fatalf("WriteResponseEndPacket: %v", err) } - err = enc.FlushIO() + err = enc.Flush() if err != nil { - t.Fatalf("FlushIO: %v", err) + t.Fatalf("Flush: %v", err) } got := b.String() |