Camel case requestStrategy package

diff --git a/request-strategy/ajwerner-btree.go b/request-strategy/ajwerner-btree.go
index 209f62dcf46e8226bfa4bcb2f381bfbcb27e50f0..183e2b9241465995b3ac5814890f004ff60dbf08 100644 (file)
--- a/request-strategy/ajwerner-btree.go
+++ b/request-strategy/ajwerner-btree.go
@@ -1,4 +1,4 @@
-package request_strategy
+package requestStrategy
 
 import (
        "github.com/ajwerner/btree"

diff --git a/request-strategy/order.go b/request-strategy/order.go
index f608083159214a2fc00486ef932e15cd6e7903ee..df656f6db06c941d0ba4e442cee472b2ec038784 100644 (file)
--- a/request-strategy/order.go
+++ b/request-strategy/order.go
@@ -1,4 +1,4 @@
-package request_strategy
+package requestStrategy
 
 import (
        "bytes"

diff --git a/request-strategy/peer.go b/request-strategy/peer.go
index cbdb2b753e76ef5bf55c5967241536c35604789a..4176188cebb8a766f6e46e4ee62dbcb5b5dab5bb 100644 (file)
--- a/request-strategy/peer.go
+++ b/request-strategy/peer.go
@@ -1,7 +1,7 @@
-package request_strategy
+package requestStrategy
 
 import (
-       "github.com/anacrolix/torrent/typed-roaring"
+       typedRoaring "github.com/anacrolix/torrent/typed-roaring"
 )
 
 type PeerRequestState struct {

diff --git a/request-strategy/piece-request-order.go b/request-strategy/piece-request-order.go
index 5238a3a141916efec051663c7d64b0f1549ad05f..3056741db389a453de42e87899125ae563a5d658 100644 (file)
--- a/request-strategy/piece-request-order.go
+++ b/request-strategy/piece-request-order.go
@@ -1,4 +1,4 @@
-package request_strategy
+package requestStrategy
 
 import "github.com/anacrolix/torrent/metainfo"
 

diff --git a/request-strategy/piece-request-order_test.go b/request-strategy/piece-request-order_test.go
index 35c97c2d456185e6eaea5410160cdbc269e8e2e5..ee5fb39ae5f02580d982305ea137682ae1bd3343 100644 (file)
--- a/request-strategy/piece-request-order_test.go
+++ b/request-strategy/piece-request-order_test.go
@@ -1,4 +1,4 @@
-package request_strategy
+package requestStrategy
 
 import (
        "testing"

diff --git a/request-strategy/piece.go b/request-strategy/piece.go
index 626cc75bdb3a12207b8fc94e567562bf758d1036..b858dfff45f502e0bacc8df44c21f1477d7a52f6 100644 (file)
--- a/request-strategy/piece.go
+++ b/request-strategy/piece.go
@@ -1,4 +1,4 @@
-package request_strategy
+package requestStrategy
 
 type ChunksIterFunc func(func(ChunkIndex))
 

diff --git a/request-strategy/tidwall-btree.go b/request-strategy/tidwall-btree.go
index 6b84dc0510a1e70983df33d4702ec8e1b4089ead..f7eabcdce693e61e0374010caf11e2a315fcab37 100644 (file)
--- a/request-strategy/tidwall-btree.go
+++ b/request-strategy/tidwall-btree.go
@@ -1,4 +1,4 @@
-package request_strategy
+package requestStrategy
 
 import (
        "github.com/tidwall/btree"

diff --git a/request-strategy/torrent.go b/request-strategy/torrent.go
index 591ac36350fd9cdfb24198271a424830de1480b1..5bc438ee558b59b037c7c31afb746973585dc9b0 100644 (file)
--- a/request-strategy/torrent.go
+++ b/request-strategy/torrent.go
@@ -1,4 +1,4 @@
-package request_strategy
+package requestStrategy
 
 type Torrent interface {
        IgnorePiece(int) bool

diff --git a/requesting.go b/requesting.go
index 60e56df7d808564ce5e3e4b01b48eb98c5ee67b4..7fbfccfbba1776a69c59d1d8a9123cf8f7bb2ccf 100644 (file)
--- a/requesting.go
+++ b/requesting.go
@@ -13,8 +13,8 @@ import (
        "github.com/anacrolix/multiless"
        "github.com/lispad/go-generics-tools/binheap"
 
-       "github.com/anacrolix/torrent/request-strategy"
-       "github.com/anacrolix/torrent/typed-roaring"
+       requestStrategy "github.com/anacrolix/torrent/request-strategy"
+       typedRoaring "github.com/anacrolix/torrent/typed-roaring"
 )
 
 type (
@@ -23,8 +23,8 @@ type (
        maxRequests = int
 )
 
-func (t *Torrent) requestStrategyPieceOrderState(i int) request_strategy.PieceRequestOrderState {
-       return request_strategy.PieceRequestOrderState{
+func (t *Torrent) requestStrategyPieceOrderState(i int) requestStrategy.PieceRequestOrderState {
+       return requestStrategy.PieceRequestOrderState{
                Priority:     t.piece(i).purePriority(),
                Partial:      t.piecePartiallyDownloaded(i),
                Availability: t.piece(i).availability(),
@@ -70,14 +70,14 @@ func (p *peerId) GobDecode(b []byte) error {
 }
 
 type (
-       RequestIndex   = request_strategy.RequestIndex
-       chunkIndexType = request_strategy.ChunkIndex
+       RequestIndex   = requestStrategy.RequestIndex
+       chunkIndexType = requestStrategy.ChunkIndex
 )
 
 type desiredPeerRequests struct {
        requestIndexes []RequestIndex
        peer           *Peer
-       pieceStates    []request_strategy.PieceRequestOrderState
+       pieceStates    []requestStrategy.PieceRequestOrderState
 }
 
 func (p *desiredPeerRequests) Len() int {
@@ -204,10 +204,10 @@ func (p *Peer) getDesiredRequestState() (desired desiredRequestState) {
        }
        // Caller-provided allocation for roaring bitmap iteration.
        var it typedRoaring.Iterator[RequestIndex]
-       request_strategy.GetRequestablePieces(
+       requestStrategy.GetRequestablePieces(
                input,
                t.getPieceRequestOrder(),
-               func(ih InfoHash, pieceIndex int, pieceExtra request_strategy.PieceRequestOrderState) {
+               func(ih InfoHash, pieceIndex int, pieceExtra requestStrategy.PieceRequestOrderState) {
                        if ih != t.infoHash {
                                return
                        }
@@ -216,7 +216,7 @@ func (p *Peer) getDesiredRequestState() (desired desiredRequestState) {
                        }
                        requestHeap.pieceStates[pieceIndex] = pieceExtra
                        allowedFast := p.peerAllowedFast.Contains(pieceIndex)
-                       t.iterUndirtiedRequestIndexesInPiece(&it, pieceIndex, func(r request_strategy.RequestIndex) {
+                       t.iterUndirtiedRequestIndexesInPiece(&it, pieceIndex, func(r requestStrategy.RequestIndex) {
                                if !allowedFast {
                                        // We must signal interest to request this. TODO: We could set interested if the
                                        // peers pieces (minus the allowed fast set) overlap with our missing pieces if