Remove raw argument to blockchain.headers.subscribe

docs/protocol-changes.rst

@@ -127,8 +127,8 @@ This version removes all support for :ref:`deserialized headers
 Changes
 -------
 
-  * The only valid value for :func:`blockchain.headers.subscribe`
-    argument *raw* is :const:`True`
+  * The argument *raw* removed from :func:`blockchain.headers.subscribe`,
+    only raw headers can be subscribed to.
   * Optional *cp_height* argument added to
     :func:`blockchain.block.header` and :func:`blockchain.block.headers`
 

electrumx/server/session.py

@@ -218,16 +218,24 @@ class ElectrumX(SessionBase):
             return {'hex': raw_header.hex(), 'height': height}
         return self.controller.electrum_header(height)
 
-    def headers_subscribe(self, raw=True):
+    def _headers_subscribe(self, raw):
         '''Subscribe to get headers of new blocks.'''
         self.subscribe_headers = True
         self.subscribe_headers_raw = self.assert_boolean(raw)
         self.notified_height = self.height()
         return self.subscribe_headers_result(self.height())
 
-    def headers_subscribe_old(self, raw=False):
-        '''Subscribe to get headers of new blocks; raw defaults to False.'''
-        return self.headers_subscribe(raw)
+    def headers_subscribe(self):
+        '''Subscribe to get raw headers of new blocks.'''
+        return self._headers_subscribe(True)
+
+    def headers_subscribe_True(self, raw=True):
+        '''Subscribe to get headers of new blocks.'''
+        return self._headers_subscribe(raw)
+
+    def headers_subscribe_False(self, raw=False):
+        '''Subscribe to get headers of new blocks.'''
+        return self._headers_subscribe(raw)
 
     async def add_peer(self, features):
         '''Add a peer (but only if the peer resolves to the source).'''
@@ -472,11 +480,11 @@ class ElectrumX(SessionBase):
         if ptuple >= (1, 3):
             handlers.update({
                 'blockchain.block.header': self.block_header,
-                'blockchain.headers.subscribe': self.headers_subscribe,
+                'blockchain.headers.subscribe': self.headers_subscribe_True,
             })
         else:
             handlers.update({
-                'blockchain.headers.subscribe': self.headers_subscribe_old,
+                'blockchain.headers.subscribe': self.headers_subscribe_False,
                 'blockchain.address.get_balance':
                 controller.address_get_balance,
                 'blockchain.address.get_history':
@@ -488,6 +496,11 @@ class ElectrumX(SessionBase):
                 'blockchain.address.subscribe': self.address_subscribe,
             })
 
+        if ptuple >= (1, 4):
+            handlers.update({
+                `'blockchain.headers.subscribe': self.headers_subscribe,
+            })
+
         self.electrumx_handlers = handlers
 
     def request_handler(self, method):