Fix unimplemented hooks in request strategies one and two

diff --git a/request_strategy.go b/request_strategy.go
index bcf6ac639b3ba78116e469ffba2e7a58e32e18b4..cbc5abf43e881b5955dd6c59ce23fb3604457c9b 100644 (file)
--- a/request_strategy.go
+++ b/request_strategy.go
@@ -36,6 +36,15 @@ type requestStrategyConnection interface {
        chunksReceivedWhileExpecting() int64
 }
 
+type requestStrategyDefaults struct{}
+
+func (requestStrategyDefaults) hooks() requestStrategyHooks {
+       return requestStrategyHooks{
+               sentRequest:    func(request) {},
+               deletedRequest: func(request) {},
+       }
+}
+
 type requestStrategy interface {
        iterPendingPieces(requestStrategyConnection, func(pieceIndex) bool) bool
        iterUndirtiedChunks(requestStrategyPiece, func(chunkSpec) bool) bool
@@ -56,11 +65,15 @@ type requestStrategyCallbacks interface {
 
 // Favour higher priority pieces with some fuzzing to reduce overlaps and wastage across
 // connections.
-type requestStrategyOne struct{}
+type requestStrategyOne struct {
+       requestStrategyDefaults
+}
 
 // The fastest connection downloads strictly in order of priority, while all others adhere to their
 // piece inclinations.
-type requestStrategyTwo struct{}
+type requestStrategyTwo struct {
+       requestStrategyDefaults
+}
 
 func (requestStrategyTwo) ShouldRequestWithoutBias(cn requestStrategyConnection) bool {
        if cn.torrent().numReaders() == 0 {
@@ -115,11 +128,3 @@ func (rs requestStrategyThree) hooks() requestStrategyHooks {
        }
 
 }
-
-func (rs requestStrategyOne) hooks() requestStrategyHooks {
-       return requestStrategyHooks{}
-}
-
-func (rs requestStrategyTwo) hooks() requestStrategyHooks {
-       return requestStrategyHooks{}
-}