diff options
author | williambannas <wrschwartz@wpi.edu> | 2018-06-14 18:14:52 +0800 |
---|---|---|
committer | Péter Szilágyi <peterke@gmail.com> | 2018-06-14 18:14:52 +0800 |
commit | 9402f965977620de0dcd968ad6943f66a80bcc5d (patch) | |
tree | b3c6fc4a3aed4299117ff1e0aa83a84eff17cc70 /eth/downloader | |
parent | d0fd8d6fc29ec859650adf30718e2b06786e854f (diff) | |
download | dexon-9402f965977620de0dcd968ad6943f66a80bcc5d.tar dexon-9402f965977620de0dcd968ad6943f66a80bcc5d.tar.gz dexon-9402f965977620de0dcd968ad6943f66a80bcc5d.tar.bz2 dexon-9402f965977620de0dcd968ad6943f66a80bcc5d.tar.lz dexon-9402f965977620de0dcd968ad6943f66a80bcc5d.tar.xz dexon-9402f965977620de0dcd968ad6943f66a80bcc5d.tar.zst dexon-9402f965977620de0dcd968ad6943f66a80bcc5d.zip |
eth: conform better to the golint standards (#16783)
* eth: made changes to conform better to the golint standards
* eth: fix comment nit
Diffstat (limited to 'eth/downloader')
-rw-r--r-- | eth/downloader/downloader.go | 6 | ||||
-rw-r--r-- | eth/downloader/queue.go | 10 | ||||
-rw-r--r-- | eth/downloader/types.go | 16 |
3 files changed, 16 insertions, 16 deletions
diff --git a/eth/downloader/downloader.go b/eth/downloader/downloader.go index 51c593601..fbde9c6ca 100644 --- a/eth/downloader/downloader.go +++ b/eth/downloader/downloader.go @@ -900,7 +900,7 @@ func (d *Downloader) fillHeaderSkeleton(from uint64, skeleton []*types.Header) ( var ( deliver = func(packet dataPack) (int, error) { pack := packet.(*headerPack) - return d.queue.DeliverHeaders(pack.peerId, pack.headers, d.headerProcCh) + return d.queue.DeliverHeaders(pack.peerID, pack.headers, d.headerProcCh) } expire = func() map[string]int { return d.queue.ExpireHeaders(d.requestTTL()) } throttle = func() bool { return false } @@ -930,7 +930,7 @@ func (d *Downloader) fetchBodies(from uint64) error { var ( deliver = func(packet dataPack) (int, error) { pack := packet.(*bodyPack) - return d.queue.DeliverBodies(pack.peerId, pack.transactions, pack.uncles) + return d.queue.DeliverBodies(pack.peerID, pack.transactions, pack.uncles) } expire = func() map[string]int { return d.queue.ExpireBodies(d.requestTTL()) } fetch = func(p *peerConnection, req *fetchRequest) error { return p.FetchBodies(req) } @@ -954,7 +954,7 @@ func (d *Downloader) fetchReceipts(from uint64) error { var ( deliver = func(packet dataPack) (int, error) { pack := packet.(*receiptPack) - return d.queue.DeliverReceipts(pack.peerId, pack.receipts) + return d.queue.DeliverReceipts(pack.peerID, pack.receipts) } expire = func() map[string]int { return d.queue.ExpireReceipts(d.requestTTL()) } fetch = func(p *peerConnection, req *fetchRequest) error { return p.FetchReceipts(req) } diff --git a/eth/downloader/queue.go b/eth/downloader/queue.go index bbe0aed5d..984dd13d6 100644 --- a/eth/downloader/queue.go +++ b/eth/downloader/queue.go @@ -596,21 +596,21 @@ func (q *queue) cancel(request *fetchRequest, taskQueue *prque.Prque, pendPool m // Revoke cancels all pending requests belonging to a given peer. This method is // meant to be called during a peer drop to quickly reassign owned data fetches // to remaining nodes. -func (q *queue) Revoke(peerId string) { +func (q *queue) Revoke(peerID string) { q.lock.Lock() defer q.lock.Unlock() - if request, ok := q.blockPendPool[peerId]; ok { + if request, ok := q.blockPendPool[peerID]; ok { for _, header := range request.Headers { q.blockTaskQueue.Push(header, -float32(header.Number.Uint64())) } - delete(q.blockPendPool, peerId) + delete(q.blockPendPool, peerID) } - if request, ok := q.receiptPendPool[peerId]; ok { + if request, ok := q.receiptPendPool[peerID]; ok { for _, header := range request.Headers { q.receiptTaskQueue.Push(header, -float32(header.Number.Uint64())) } - delete(q.receiptPendPool, peerId) + delete(q.receiptPendPool, peerID) } } diff --git a/eth/downloader/types.go b/eth/downloader/types.go index 3f30ea9dd..ff70bfa0e 100644 --- a/eth/downloader/types.go +++ b/eth/downloader/types.go @@ -34,22 +34,22 @@ type dataPack interface { // headerPack is a batch of block headers returned by a peer. type headerPack struct { - peerId string + peerID string headers []*types.Header } -func (p *headerPack) PeerId() string { return p.peerId } +func (p *headerPack) PeerId() string { return p.peerID } func (p *headerPack) Items() int { return len(p.headers) } func (p *headerPack) Stats() string { return fmt.Sprintf("%d", len(p.headers)) } // bodyPack is a batch of block bodies returned by a peer. type bodyPack struct { - peerId string + peerID string transactions [][]*types.Transaction uncles [][]*types.Header } -func (p *bodyPack) PeerId() string { return p.peerId } +func (p *bodyPack) PeerId() string { return p.peerID } func (p *bodyPack) Items() int { if len(p.transactions) <= len(p.uncles) { return len(p.transactions) @@ -60,20 +60,20 @@ func (p *bodyPack) Stats() string { return fmt.Sprintf("%d:%d", len(p.transactio // receiptPack is a batch of receipts returned by a peer. type receiptPack struct { - peerId string + peerID string receipts [][]*types.Receipt } -func (p *receiptPack) PeerId() string { return p.peerId } +func (p *receiptPack) PeerId() string { return p.peerID } func (p *receiptPack) Items() int { return len(p.receipts) } func (p *receiptPack) Stats() string { return fmt.Sprintf("%d", len(p.receipts)) } // statePack is a batch of states returned by a peer. type statePack struct { - peerId string + peerID string states [][]byte } -func (p *statePack) PeerId() string { return p.peerId } +func (p *statePack) PeerId() string { return p.peerID } func (p *statePack) Items() int { return len(p.states) } func (p *statePack) Stats() string { return fmt.Sprintf("%d", len(p.states)) } |