Merge Alex's PR

skycoin · May 30, 2019 · 141df25 · 141df25
2 parents c047444 + 0b6ebd5
commit 141df25
Show file tree

Hide file tree

Showing 16 changed files with 319 additions and 316 deletions.
diff --git a/pkg/dms/channel.go b/pkg/dms/channel.go
@@ -160,6 +160,7 @@ func (c *Channel) Write(p []byte) (int, error) {
 func (c *Channel) Close() error {
 	if c.close() {
 		_ = writeFrame(c.Conn, MakeFrame(CloseType, c.id, []byte{0}))
+		return nil
 	}
-	return nil
+	return io.ErrClosedPipe
 }
diff --git a/pkg/messaging/channel.go b/pkg/messaging/channel.go
@@ -241,7 +241,7 @@ func (mCh *msgChannel) readEncrypted(ctx context.Context, p []byte) (n int, err
 	}
 
 	if len(data) > len(p) {
-		if _, err := mCh.buf.Write(data[len(p):]); err != nil {
+		if _, err := mCh.buf.Write(data[len(p):]); err != nil { // TODO: data race.
 			return 0, io.ErrShortBuffer
 		}