From c98197f2660ec664ccdf74704a9d3fbd43fb8bc5 Mon Sep 17 00:00:00 2001
From: Alex Grintsvayg <grin@lbry.io>
Date: Wed, 20 Sep 2017 11:16:08 -0400
Subject: [PATCH] deprecated blob_announce_all

---
 CHANGELOG.md                                 |  2 +-
 lbrynet/daemon/Daemon.py                     | 33 ++++++++------------
 lbrynet/file_manager/EncryptedFileManager.py |  2 +-
 3 files changed, 15 insertions(+), 22 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 29ac605d5..948c71531 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,7 +17,7 @@ at anytime.
   *
 
 ### Deprecated
-  *
+  * Deprecated `blob_announce_all` JSONRPC command. Use `blob_announce` instead.
   *
 
 ### Changed
diff --git a/lbrynet/daemon/Daemon.py b/lbrynet/daemon/Daemon.py
index fd05afcbd..8eb218fd3 100644
--- a/lbrynet/daemon/Daemon.py
+++ b/lbrynet/daemon/Daemon.py
@@ -2462,27 +2462,23 @@ class Daemon(AuthJSONRPCServer):
         """
         if announce_all:
             yield self.session.blob_manager.immediate_announce_all_blobs()
-        elif blob_hash:
-            blob_hashes = [blob_hash]
-            yield self.session.blob_manager._immediate_announce(blob_hashes)
-        elif stream_hash:
-            blobs = yield self.get_blobs_for_stream_hash(stream_hash)
-            blobs = [blob for blob in blobs if blob.is_validated()]
-            blob_hashes = [blob.blob_hash for blob in blobs]
-            yield self.session.blob_manager._immediate_announce(blob_hashes)
-        elif sd_hash:
-            blobs = yield self.get_blobs_for_sd_hash(sd_hash)
-            blobs = [blob for blob in blobs if blob.is_validated()]
-            blob_hashes = [blob.blob_hash for blob in blobs]
-            blob_hashes.append(sd_hash)
-            yield self.session.blob_manager._immediate_announce(blob_hashes)
         else:
-            raise Exception('single argument must be specified')
+            if blob_hash:
+                blob_hashes = [blob_hash]
+            elif stream_hash:
+                blobs = yield self.get_blobs_for_stream_hash(stream_hash)
+                blob_hashes = [blob.blob_hash for blob in blobs if blob.is_validated()]
+            elif sd_hash:
+                blobs = yield self.get_blobs_for_sd_hash(sd_hash)
+                blob_hashes = [sd_hash] + [blob.blob_hash for blob in blobs if blob.is_validated()]
+            else:
+                raise Exception('single argument must be specified')
+            yield self.session.blob_manager._immediate_announce(blob_hashes)
 
         response = yield self._render_response(True)
         defer.returnValue(response)
 
-    # TODO: This command should be deprecated in favor of blob_announce
+    @AuthJSONRPCServer.deprecated("blob_announce")
     def jsonrpc_blob_announce_all(self):
         """
         Announce all blobs to the DHT
@@ -2493,10 +2489,7 @@ class Daemon(AuthJSONRPCServer):
         Returns:
             (str) Success/fail message
         """
-
-        d = self.session.blob_manager.immediate_announce_all_blobs()
-        d.addCallback(lambda _: self._render_response("Announced"))
-        return d
+        return self.jsonrpc_blob_announce(announce_all=True)
 
     @defer.inlineCallbacks
     def jsonrpc_file_reflect(self, **kwargs):
diff --git a/lbrynet/file_manager/EncryptedFileManager.py b/lbrynet/file_manager/EncryptedFileManager.py
index b623cf88e..212efea48 100644
--- a/lbrynet/file_manager/EncryptedFileManager.py
+++ b/lbrynet/file_manager/EncryptedFileManager.py
@@ -250,7 +250,7 @@ class EncryptedFileManager(object):
         if self.sql_db:
             yield self.sql_db.close()
         self.sql_db = None
-        log.info("Stopped %s", self)
+        log.info("Stopped encrypted file manager")
         defer.returnValue(True)
 
     def get_count_for_stream_hash(self, stream_hash):