network: Rename flush (clearly distinguish flushing IO and writing flush packets)

6 files changed, 38 insertions, 38 deletions

diff --git a/network/protocol/sideband64k/chunk_writer_write_and_read_from_test.go b/network/protocol/sideband64k/chunk_writer_write_and_read_from_test.go
index efde68b4..ef2b0fff 100644
--- a/network/protocol/sideband64k/chunk_writer_write_and_read_from_test.go
+++ b/network/protocol/sideband64k/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(), "0008\x02abc0008\x02def0006\x02g"; 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(), "0008\x02wxy0006\x02z"; got != want {
diff --git a/network/protocol/sideband64k/decoder_resync_after_over_max_data_test.go b/network/protocol/sideband64k/decoder_resync_after_over_max_data_test.go
index c63b07f3..b0ae600a 100644
--- a/network/protocol/sideband64k/decoder_resync_after_over_max_data_test.go
+++ b/network/protocol/sideband64k/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 := sideband64k.NewDecoder(bytes.NewReader(b.Bytes()), sideband64k.ReadOptions{})
diff --git a/network/protocol/sideband64k/encoder.go b/network/protocol/sideband64k/encoder.go
index 8b48566d..53ca7064 100644
--- a/network/protocol/sideband64k/encoder.go
+++ b/network/protocol/sideband64k/encoder.go
@@ -69,29 +69,29 @@ func (e *Encoder) WriteError(p []byte) error {
 	return e.WriteBand(BandError, p)
 }
 
-// WriteFlush writes control frame 0000 (flush-pkt).
-func (e *Encoder) WriteFlush() error {
-	return e.enc.WriteFlush()
+// WriteFlushPacket writes control frame 0000 (flush-pkt).
+func (e *Encoder) WriteFlushPacket() error {
+	return e.enc.WriteFlushPacket()
 }
 
-// WriteDelim writes control frame 0001 (delim-pkt).
-func (e *Encoder) WriteDelim() error {
-	return e.enc.WriteDelim()
+// WriteDelimPacket writes control frame 0001 (delim-pkt).
+func (e *Encoder) WriteDelimPacket() error {
+	return e.enc.WriteDelimPacket()
 }
 
-// WriteResponseEnd writes control frame 0002 (response-end-pkt).
-func (e *Encoder) WriteResponseEnd() error {
-	return e.enc.WriteResponseEnd()
+// WriteResponseEndPacket writes control frame 0002 (response-end-pkt).
+func (e *Encoder) WriteResponseEndPacket() error {
+	return e.enc.WriteResponseEndPacket()
 }
 
-// FlushIO flushes buffered output in the underlying transport.
-func (e *Encoder) FlushIO() error {
-	return e.enc.FlushIO()
+// Flush flushes buffered output in the underlying transport.
+func (e *Encoder) Flush() error {
+	return e.enc.Flush()
 }
 
-// WriteFlushAndFlushIO writes a flush-pkt (0000) then flushes transport I/O.
-func (e *Encoder) WriteFlushAndFlushIO() error {
-	return e.enc.WriteFlushAndFlushIO()
+// WriteFlushPacketAndFlush writes a flush-pkt (0000) then flushes transport I/O.
+func (e *Encoder) WriteFlushPacketAndFlush() error {
+	return e.enc.WriteFlushPacketAndFlush()
 }
 
 func (e *Encoder) effectiveMaxData() int {
diff --git a/network/protocol/sideband64k/encoder_buffered_flush_behavior_test.go b/network/protocol/sideband64k/encoder_buffered_flush_behavior_test.go
index 29f87d01..83103ea3 100644
--- a/network/protocol/sideband64k/encoder_buffered_flush_behavior_test.go
+++ b/network/protocol/sideband64k/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(), "000a\x01hello0000"; got != want {
@@ -48,9 +48,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(), "0007\x01yo0000"; got != want {
diff --git a/network/protocol/sideband64k/encoder_partial_write_test.go b/network/protocol/sideband64k/encoder_partial_write_test.go
index 8e35376a..97c8f762 100644
--- a/network/protocol/sideband64k/encoder_partial_write_test.go
+++ b/network/protocol/sideband64k/encoder_partial_write_test.go
@@ -19,9 +19,9 @@ func TestEncoderHandlesPartialWrites(t *testing.T) {
 		t.Fatalf("WriteProgress: %v", err)
 	}
 
-	err = enc.WriteFlushAndFlushIO()
+	err = enc.WriteFlushPacketAndFlush()
 	if err != nil {
-		t.Fatalf("WriteFlushAndFlushIO: %v", err)
+		t.Fatalf("WriteFlushPacketAndFlush: %v", err)
 	}
 
 	if got, want := dst.buf.String(), "0008\x02abc0000"; got != want {
diff --git a/network/protocol/sideband64k/encoder_writes_frames_test.go b/network/protocol/sideband64k/encoder_writes_frames_test.go
index 4541bf13..85fe5845 100644
--- a/network/protocol/sideband64k/encoder_writes_frames_test.go
+++ b/network/protocol/sideband64k/encoder_writes_frames_test.go
@@ -31,24 +31,24 @@ func TestEncoderWritesFrames(t *testing.T) {
 		t.Fatalf("WriteError: %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)
 	}
 
 	want := "0007\x01hi0007\x02ok0007\x03no000000010002"