Improve exceptions

Author: richardkiss

chia/full_node/block_store.py

@@ -18,6 +18,11 @@
 from chia.util.errors import Err
 from chia.util.lru_cache import LRUCache
 
+
+class UnsupportedDatabaseVersionError(Exception):
+    """Raised when a method is called with an unsupported database version."""
+
+
 log = logging.getLogger(__name__)
 
 
@@ -478,7 +483,7 @@ async def get_block_bytes_in_range(
         """
 
         if self.db_wrapper.db_version != 2:
-            raise NotImplementedError("get_block_bytes_in_range requires DB version 2")
+            raise UnsupportedDatabaseVersionError("get_block_bytes_in_range requires DB version 2")
         async with self.db_wrapper.reader_no_transaction() as conn:
             async with conn.execute(
                 "SELECT block FROM full_blocks WHERE height >= ? AND height <= ? AND in_main_chain=1",

chia/full_node/full_node_api.py

@@ -41,6 +41,7 @@
 from chia.consensus.get_block_generator import get_block_generator
 from chia.consensus.pot_iterations import calculate_ip_iters, calculate_iterations_quality, calculate_sp_iters
 from chia.consensus.signage_point import SignagePoint
+from chia.full_node.block_store import UnsupportedDatabaseVersionError
 from chia.full_node.coin_store import CoinStore
 from chia.full_node.fee_estimator_interface import FeeEstimatorInterface
 from chia.full_node.full_block_utils import get_height_and_tx_status_from_block, header_block_from_block
@@ -1457,7 +1458,9 @@ async def request_block_headers(self, request: wallet_protocol.RequestBlockHeade
             blocks_bytes = await self.full_node.block_store.get_block_bytes_in_range(
                 request.start_height, request.end_height
             )
-        except NotImplementedError:
+        except ValueError:
+            return make_msg(ProtocolMessageTypes.reject_block_headers, reject)
+        except UnsupportedDatabaseVersionError:
             # The underlying block store may not support this optimized call
             # (e.g. v1 DB). In this case, we fall back to the legacy approach
             height_to_hash = self.full_node.blockchain.height_to_hash
@@ -1469,8 +1472,6 @@ async def request_block_headers(self, request: wallet_protocol.RequestBlockHeade
                 header_hashes.append(header_hash)
 
             blocks_bytes = await self.full_node.block_store.get_block_bytes_by_hash(header_hashes)
-        except ValueError:
-            return make_msg(ProtocolMessageTypes.reject_block_headers, reject)
         if len(blocks_bytes) != (request.end_height - request.start_height + 1):  # +1 because interval is inclusive
             return make_msg(ProtocolMessageTypes.reject_block_headers, reject)
         return_filter = request.return_filter