more cleanup

Author: mafintosh

lib/replicator.js

@@ -1830,13 +1830,15 @@ module.exports = class Replicator {
     const allowPush = this.isAllowingPush()
     const linger = this._notDownloadingLinger
 
-    clearTimeout(this._notDownloadingTimer)
-    this._notDownloadingTimer = null
+    if (this._notDownloadingTimer) {
+      clearTimeout(this._notDownloadingTimer)
+      this._notDownloadingTimer = null
+    }
 
     if (this.destroyed) return
 
     if (downloading || linger === 0) {
-      if (!this.setDownloadingNow(downloading)) this.signalAllowPush(allowPush)
+      if (!this._setDownloadingNow(downloading)) this.signalAllowPush(allowPush)
       return
     }
 
@@ -1850,10 +1852,12 @@ module.exports = class Replicator {
     for (const peer of this.peers) peer.signalUpgrade()
   }
 
-  setDownloadingNow(downloading) {
+  _setDownloadingNow(downloading) {
     this._notDownloadingTimer = null
+
     if (this.downloading === downloading) return false
     this.downloading = downloading
+
     if (!downloading && this.isDownloading()) return false
 
     for (const peer of this.peers) peer.signalUpgrade()
@@ -3074,7 +3078,7 @@ function onwireextension(m, c) {
 }
 
 function setNotDownloadingLater(repl, session) {
-  repl.setDownloadingNow(false, session)
+  repl._setDownloadingNow(false, session)
 }
 
 function isBlockRequest(req) {