chain: remove BlockManagerOptions and ChainstateLoadOptions

These are no longer exposed by bitcoinkernel, and all merged into
ChainstateManagerOptions.

Author: stickies-v

src/pbk/__init__.py

@@ -1,8 +1,6 @@
 from pbk.block import Block, BlockHash, BlockIndex, BlockUndo
 from pbk.chain import (
-    BlockManagerOptions,
     ChainParameters,
-    ChainstateLoadOptions,
     ChainstateManager,
     ChainstateManagerOptions,
     ChainType,
@@ -24,9 +22,7 @@
     "BlockHash",
     "BlockIndex",
     "BlockUndo",
-    "BlockManagerOptions",
     "ChainParameters",
-    "ChainstateLoadOptions",
     "ChainstateManager",
     "ChainstateManagerOptions",
     "ChainType",
@@ -78,11 +74,9 @@ def load_chainman(
     context = make_context(chain_type)
     blocksdir = datadir / "blocks"
 
-    block_man_opts = BlockManagerOptions(context, str(blocksdir.absolute()))
-    chain_man_opts = ChainstateManagerOptions(context, str(datadir.absolute()))
-    chain_load_opts = ChainstateLoadOptions()
-    chain_man = ChainstateManager(
-        context, chain_man_opts, block_man_opts, chain_load_opts
+    chain_man_opts = ChainstateManagerOptions(
+        context, str(datadir.absolute()), str(blocksdir.absolute())
     )
+    chain_man = ChainstateManager(context, chain_man_opts)
 
     return chain_man

src/pbk/chain.py

@@ -23,41 +23,37 @@ def __init__(self, chain_type: ChainType):
         super().__init__(chain_type)
 
 
-class BlockManagerOptions(KernelOpaquePtr):
-    def __init__(self, context: "Context", blocksdir: str):
-        blocksdir_bytes = blocksdir.encode("utf-8")
-        super().__init__(context, blocksdir_bytes, len(blocksdir_bytes))
-
-
 class ChainstateManagerOptions(KernelOpaquePtr):
-    def __init__(self, context: "Context", datadir: str):
+    def __init__(self, context: "Context", datadir: str, blocks_dir: str):
         datadir_bytes = datadir.encode("utf-8")
-        super().__init__(context, datadir_bytes, len(datadir_bytes))
+        blocksdir_bytes = blocks_dir.encode("utf-8")
+        super().__init__(
+            context,
+            datadir_bytes,
+            len(datadir_bytes),
+            blocksdir_bytes,
+            len(blocksdir_bytes),
+        )
+
+    def set_wipe_dbs(self, wipe_block_tree_db: bool, wipe_chainstate_db: bool) -> bool:
+        return k.kernel_chainstate_manager_options_set_wipe_dbs(
+            self, wipe_block_tree_db, wipe_chainstate_db
+        )
 
     def set_worker_threads_num(self, worker_threads: int):
         k.kernel_chainstate_manager_options_set_worker_threads_num(self, worker_threads)
 
 
-class ChainstateLoadOptions(KernelOpaquePtr):
-    def set_wipe_block_tree_db(self, value: bool):
-        k.kernel_chainstate_load_options_set_wipe_block_tree_db(self, value)
-
-    def set_wipe_chainstate_db(self, value: bool):
-        k.kernel_chainstate_load_options_set_wipe_chainstate_db(self, value)
-
-
 class ChainstateManager(KernelOpaquePtr):
     _context: "Context"  # Persisted to ensure context is not destroyed before ChainstateManager
 
     def __init__(
         self,
         context: "Context",
         chain_man_opts: ChainstateManagerOptions,
-        block_man_opts: BlockManagerOptions,
-        chainstate_load_opts: ChainstateLoadOptions,
     ):
         self._context = context
-        super().__init__(context, chain_man_opts, block_man_opts, chainstate_load_opts)
+        super().__init__(context, chain_man_opts)
 
     def get_block_index_from_hash(self, hash: "BlockHash"):
         return BlockIndex._from_ptr(

test/test_chain.py

@@ -7,16 +7,27 @@
 def test_chainstate_manager_options(temp_dir: Path):
     opts = pbk.ContextOptions()
     context = pbk.Context(opts)
-    block_man_opts = pbk.BlockManagerOptions(context, str(temp_dir / "blocks"))
-    chain_man_opts = pbk.ChainstateManagerOptions(context, str(temp_dir))
-    chain_load_opts = pbk.ChainstateLoadOptions()
+    chain_man_opts = pbk.ChainstateManagerOptions(
+        context, str(temp_dir), str(temp_dir / "blocks")
+    )
+
+    assert chain_man_opts.set_wipe_dbs(wipe_block_tree_db=True, wipe_chainstate_db=True)
+    assert chain_man_opts.set_wipe_dbs(
+        wipe_block_tree_db=False, wipe_chainstate_db=True
+    )
+    assert chain_man_opts.set_wipe_dbs(
+        wipe_block_tree_db=False, wipe_chainstate_db=False
+    )
+    assert not chain_man_opts.set_wipe_dbs(
+        wipe_block_tree_db=True, wipe_chainstate_db=False
+    )
 
     # valid number
     for num_threads in [0, 1, 5]:
         chain_man_opts.set_worker_threads_num(num_threads)
-        pbk.ChainstateManager(context, chain_man_opts, block_man_opts, chain_load_opts)
+        pbk.ChainstateManager(context, chain_man_opts)
 
     # invalid numbers are automatically clamped between 0-15
     for num_threads in [-10, -1, 100]:
         chain_man_opts.set_worker_threads_num(num_threads)
-        pbk.ChainstateManager(context, chain_man_opts, block_man_opts, chain_load_opts)
+        pbk.ChainstateManager(context, chain_man_opts)