fixe tests

CounterpartyXCP · Jan 16, 2025 · c43fa92 · c43fa92
1 parent a3a2bdf
commit c43fa92
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/counterparty-core/counterpartycore/lib/cli/server.py b/counterparty-core/counterpartycore/lib/cli/server.py
@@ -24,6 +24,7 @@
 from counterpartycore.lib.api import apiserver as api_v2
 from counterpartycore.lib.api import apiv1, dbbuilder
 from counterpartycore.lib.cli import bootstrap, log
+from counterpartycore.lib.ledger.currentstate import CurrentState
 from counterpartycore.lib.parser import blocks, check, follow
 from counterpartycore.lib.utils import database, helpers
 
@@ -54,7 +55,9 @@ def initialise(*args, **kwargs):
         max_log_file_rotations=kwargs.get("max_log_file_rotations", None),
     )
     initialise_config(*args, **kwargs)
-    return database.initialise_db()
+    db = database.initialise_db()
+    CurrentState().set_current_block_index(ledger.ledger.last_db_index(db))
+    return db
 
 
 def initialise_log_config(
@@ -673,6 +676,7 @@ def start_all(args):
 
         # Initialise database
         db = database.initialise_db()
+        CurrentState().set_current_block_index(ledger.ledger.last_db_index(db))
         blocks.initialise(db)
         blocks.check_database_version(db)
         database.optimize(db)
@@ -771,6 +775,7 @@ def start_all(args):
 
 def reparse(block_index):
     ledger_db = database.initialise_db()
+    CurrentState().set_current_block_index(ledger.ledger.last_db_index(ledger_db))
 
     last_block = ledger.ledger.get_last_block(ledger_db)
     if last_block is None or block_index > last_block["block_index"]:
@@ -791,6 +796,7 @@ def reparse(block_index):
 
 def rollback(block_index=None):
     ledger_db = database.initialise_db()
+    CurrentState().set_current_block_index(ledger.ledger.last_db_index(ledger_db))
 
     last_block = ledger.ledger.get_last_block(ledger_db)
     if last_block is None or block_index > last_block["block_index"]:
@@ -820,6 +826,7 @@ def vacuum():
 
 def check_database():
     db = database.initialise_db()
+    CurrentState().set_current_block_index(ledger.ledger.last_db_index(db))
 
     start_all_time = time.time()
 

diff --git a/counterparty-core/counterpartycore/test/util_test.py b/counterparty-core/counterpartycore/test/util_test.py
@@ -621,6 +621,7 @@ def initialise_db(db):
     """Initialise blockchain in the db and insert first block."""
     blocks.initialise(db)
     insert_block(db, config.BLOCK_FIRST - 1, parse_block=True)
+    CurrentState().set_current_block_index(ledger.ledger.last_db_index(db))
 
 
 def run_scenario(scenario):