From b3ee9f411734e339facdc5ee5077d97baa74e53b Mon Sep 17 00:00:00 2001 From: Jesse Li Date: Thu, 2 Jan 2020 12:23:22 -0500 Subject: [PATCH] Use clearer names for functions that send messages --- p2p/client.go | 10 +++++----- p2p/p2p.go | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/p2p/client.go b/p2p/client.go index 54217e1..658ddd1 100644 --- a/p2p/client.go +++ b/p2p/client.go @@ -102,31 +102,31 @@ func (c *client) read() (*message.Message, error) { return msg, err } -func (c *client) request(index, begin, length int) error { +func (c *client) sendRequest(index, begin, length int) error { req := message.FormatRequest(index, begin, length) _, err := c.conn.Write(req.Serialize()) return err } -func (c *client) interested() error { +func (c *client) sendInterested() error { msg := message.Message{ID: message.MsgInterested} _, err := c.conn.Write(msg.Serialize()) return err } -func (c *client) notInterested() error { +func (c *client) sendNotInterested() error { msg := message.Message{ID: message.MsgNotInterested} _, err := c.conn.Write(msg.Serialize()) return err } -func (c *client) unchoke() error { +func (c *client) sendUnchoke() error { msg := message.Message{ID: message.MsgUnchoke} _, err := c.conn.Write(msg.Serialize()) return err } -func (c *client) have(index int) error { +func (c *client) sendHave(index int) error { msg := message.FormatHave(index) _, err := c.conn.Write(msg.Serialize()) return err diff --git a/p2p/p2p.go b/p2p/p2p.go index 9276253..429f7e6 100644 --- a/p2p/p2p.go +++ b/p2p/p2p.go @@ -117,7 +117,7 @@ func attemptDownloadPiece(c *client, pw *pieceWork) ([]byte, error) { blockSize = pw.length - state.requested } - err := c.request(pw.index, state.requested, blockSize) + err := c.sendRequest(pw.index, state.requested, blockSize) if err != nil { return nil, err } @@ -153,8 +153,8 @@ func (t *Torrent) startDownloadWorker(peer peers.Peer, workQueue chan *pieceWork defer c.conn.Close() log.Printf("Completed handshake with %s\n", peer.IP) - c.unchoke() - c.interested() + c.sendUnchoke() + c.sendInterested() for pw := range workQueue { if !c.hasPiece(pw.index) { @@ -177,7 +177,7 @@ func (t *Torrent) startDownloadWorker(peer peers.Peer, workQueue chan *pieceWork continue } - c.have(pw.index) + c.sendHave(pw.index) results <- &pieceResult{pw.index, buf} } }