* fleshed out daemon events; also is now used for insertion queue removal

* deprecated daemon queue and removed unused daemon queue commands

src/communicator/__init__.py

@@ -36,6 +36,7 @@ from coredb import daemonqueue
 from coredb import dbfiles
 from netcontroller import NetController
 from . import bootstrappeers
+from . import daemoneventhooks
 """
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -247,6 +248,8 @@ class OnionrCommunicatorDaemon:
             bootstrappeers.add_bootstrap_list_to_peer_list(
                 self, [], db_only=True)
 
+        daemoneventhooks.daemon_event_handlers(shared_state)
+
         if not config.get('onboarding.done', True):
             logger.info(
                 'First run detected. Run openhome to get setup.',

src/communicator/daemoneventhooks/__init__.py

@@ -2,6 +2,8 @@
 
 Hooks to handle daemon events
 """
+from .removefrominsertqueue import remove_from_insert_queue
+
 from typing import TYPE_CHECKING
 
 from gevent import sleep
@@ -10,6 +12,7 @@ if TYPE_CHECKING:
     from toomanyobjs import TooMany
     from communicator import OnionrCommunicatorDaemon
     from httpapi.daemoneventsapi import DaemonEventsBP
+    from onionrtypes import BlockHash
 """
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -33,6 +36,17 @@ def daemon_event_handlers(shared_state: 'TooMany'):
                 return shared_state.get_by_string(class_name)
             except KeyError:
                 sleep(0.2)
+    comm_inst = _get_inst('OnionrCommunicatorDaemon')
     events_api: 'DaemonEventsBP' = _get_inst('DaemonEventsBP')
-    
+
+    def remove_from_insert_queue_wrapper(block_hash: 'BlockHash'):
+        print(f'removed {block_hash} from upload')
+        remove_from_insert_queue(comm_inst, block_hash)
+
+    def print_test(text=''):
+        print("It works!", text)
+        return f"It works! {text}"
+
+    events_api.register_listener(remove_from_insert_queue_wrapper)
+    events_api.register_listener(print_test)
 

src/communicator/daemoneventhooks/removefrominsertqueue.py

@@ -0,0 +1,31 @@
+"""Onionr - P2P Anonymous Storage Network.
+
+Remove block hash from daemon's upload list.
+"""
+from typing import TYPE_CHECKING
+if TYPE_CHECKING:
+    from communicator import OnionrCommunicatorDaemon
+    from onionrtypes import BlockHash
+"""
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+"""
+
+
+def remove_from_insert_queue(comm_inst: "OnionrCommunicatorDaemon",
+                             b_hash: "BlockHash"):
+    """Remove block hash from daemon's upload list."""
+    try:
+        comm_inst.generating_blocks.remove(b_hash)
+    except ValueError:
+        pass