Merge branch 'i1462' of github.com:ergoplatform/ergo into i1462

Author: kushti

src/main/scala/org/ergoplatform/network/ErgoDeliveryTracker.scala

@@ -23,7 +23,7 @@ import scorex.core.transaction.Transaction
 import scorex.core.utils.NetworkTimeProvider
 import scorex.core.validation.MalformedModifierError
 import scorex.util.ModifierId
-
+import scorex.core.network.DeliveryTracker
 import scala.collection.mutable
 import scala.concurrent.ExecutionContext
 import scala.concurrent.duration._
@@ -42,7 +42,7 @@ class ErgoNodeViewSynchronizer(networkControllerRef: ActorRef,
     settings.scorexSettings.network, timeProvider, Constants.modifierSerializers) {
 
   override protected val deliveryTracker =
-    new ErgoDeliveryTracker(context.system, deliveryTimeout, maxDeliveryChecks, self, timeProvider)
+    new DeliveryTracker(context.system, deliveryTimeout, maxDeliveryChecks, self)
 
   private val networkSettings: NetworkSettings = settings.scorexSettings.network
 

src/main/scala/org/ergoplatform/network/ErgoNodeViewSynchronizer.scala

@@ -50,6 +50,9 @@ class DeliveryTracker(system: ActorSystem,
   // when our node received a modifier we put it to `received`
   protected val received: mutable.Map[ModifierId, ConnectedPeer] = mutable.Map()
 
+  /** how many Requested modifiers DeliveryTracker holds */
+  def requestedSize: Int = requested.size
+
   /**
     * @return status of modifier `id`.
     *         Since this class do not keep statuses for modifiers that are already in NodeViewHolder,