From 68f2f3fccb2ad43fa64ba96927d9a0075b9889ce Mon Sep 17 00:00:00 2001 From: evoskuil Date: Fri, 5 Jun 2026 20:22:01 -0400 Subject: [PATCH] Rename some tables (file system names only). --- include/bitcoin/database/tables/names.hpp | 22 ++++++------- test/store.cpp | 39 ++++++++++++----------- 2 files changed, 31 insertions(+), 30 deletions(-) diff --git a/include/bitcoin/database/tables/names.hpp b/include/bitcoin/database/tables/names.hpp index 7855edbe5..aedc20e63 100644 --- a/include/bitcoin/database/tables/names.hpp +++ b/include/bitcoin/database/tables/names.hpp @@ -50,27 +50,27 @@ namespace archive namespace indexes { - constexpr auto candidate = "candidate"; - constexpr auto confirmed = "confirmed"; - constexpr auto strong_tx = "strong_tx"; + constexpr auto candidate = "index_candidate"; + constexpr auto confirmed = "index_confirmed"; + constexpr auto strong_tx = "index_strong"; } namespace caches { - constexpr auto ecdsa = "ecdsa"; - constexpr auto schnorr = "schnorr"; - constexpr auto multisig = "multisig"; - constexpr auto duplicate = "duplicate"; - constexpr auto prevout = "prevout"; + constexpr auto ecdsa = "batch_ecdsa"; + constexpr auto schnorr = "batch_schnorr"; + constexpr auto multisig = "batch_multisig"; + constexpr auto duplicate = "cache_duplicate"; + constexpr auto prevout = "cache_prevout"; constexpr auto validated_bk = "validated_bk"; constexpr auto validated_tx = "validated_tx"; } namespace optionals { - constexpr auto address = "address"; - constexpr auto filter_bk = "filter_bk"; - constexpr auto filter_tx = "filter_tx"; + constexpr auto address = "option_address"; + constexpr auto filter_bk = "option_filter_bk"; + constexpr auto filter_tx = "option_filter_tx"; } namespace locks diff --git a/test/store.cpp b/test/store.cpp index 765cdfcbc..3b7527308 100644 --- a/test/store.cpp +++ b/test/store.cpp @@ -143,29 +143,30 @@ BOOST_AUTO_TEST_CASE(store__paths__default_configuration__expected) BOOST_REQUIRE_EQUAL(instance.txs_body_file(), "bitcoin/archive_txs.data"); /// Index. - BOOST_REQUIRE_EQUAL(instance.candidate_head_file(), "bitcoin/heads/candidate.head"); - BOOST_REQUIRE_EQUAL(instance.candidate_body_file(), "bitcoin/candidate.data"); - BOOST_REQUIRE_EQUAL(instance.confirmed_head_file(), "bitcoin/heads/confirmed.head"); - BOOST_REQUIRE_EQUAL(instance.confirmed_body_file(), "bitcoin/confirmed.data"); - BOOST_REQUIRE_EQUAL(instance.strong_tx_head_file(), "bitcoin/heads/strong_tx.head"); - BOOST_REQUIRE_EQUAL(instance.strong_tx_body_file(), "bitcoin/strong_tx.data"); - - /// Caches. - BOOST_REQUIRE_EQUAL(instance.duplicate_head_file(), "bitcoin/heads/duplicate.head"); - BOOST_REQUIRE_EQUAL(instance.duplicate_body_file(), "bitcoin/duplicate.data"); - BOOST_REQUIRE_EQUAL(instance.prevout_head_file(), "bitcoin/heads/prevout.head"); - BOOST_REQUIRE_EQUAL(instance.prevout_body_file(), "bitcoin/prevout.data"); + BOOST_REQUIRE_EQUAL(instance.candidate_head_file(), "bitcoin/heads/index_candidate.head"); + BOOST_REQUIRE_EQUAL(instance.candidate_body_file(), "bitcoin/index_candidate.data"); + BOOST_REQUIRE_EQUAL(instance.confirmed_head_file(), "bitcoin/heads/index_confirmed.head"); + BOOST_REQUIRE_EQUAL(instance.confirmed_body_file(), "bitcoin/index_confirmed.data"); + BOOST_REQUIRE_EQUAL(instance.strong_tx_head_file(), "bitcoin/heads/index_strong.head"); + BOOST_REQUIRE_EQUAL(instance.strong_tx_body_file(), "bitcoin/index_strong.data"); + + /// Cache. + BOOST_REQUIRE_EQUAL(instance.duplicate_head_file(), "bitcoin/heads/cache_duplicate.head"); + BOOST_REQUIRE_EQUAL(instance.duplicate_body_file(), "bitcoin/cache_duplicate.data"); + BOOST_REQUIRE_EQUAL(instance.prevout_head_file(), "bitcoin/heads/cache_prevout.head"); + BOOST_REQUIRE_EQUAL(instance.prevout_body_file(), "bitcoin/cache_prevout.data"); BOOST_REQUIRE_EQUAL(instance.validated_tx_head_file(), "bitcoin/heads/validated_tx.head"); BOOST_REQUIRE_EQUAL(instance.validated_tx_body_file(), "bitcoin/validated_tx.data"); - BOOST_REQUIRE_EQUAL(instance.address_head_file(), "bitcoin/heads/address.head"); - BOOST_REQUIRE_EQUAL(instance.address_body_file(), "bitcoin/address.data"); - BOOST_REQUIRE_EQUAL(instance.filter_bk_head_file(), "bitcoin/heads/filter_bk.head"); - BOOST_REQUIRE_EQUAL(instance.filter_bk_body_file(), "bitcoin/filter_bk.data"); - BOOST_REQUIRE_EQUAL(instance.filter_tx_head_file(), "bitcoin/heads/filter_tx.head"); - BOOST_REQUIRE_EQUAL(instance.filter_tx_body_file(), "bitcoin/filter_tx.data"); + /// Option. + BOOST_REQUIRE_EQUAL(instance.address_head_file(), "bitcoin/heads/option_address.head"); + BOOST_REQUIRE_EQUAL(instance.address_body_file(), "bitcoin/option_address.data"); + BOOST_REQUIRE_EQUAL(instance.filter_bk_head_file(), "bitcoin/heads/option_filter_bk.head"); + BOOST_REQUIRE_EQUAL(instance.filter_bk_body_file(), "bitcoin/option_filter_bk.data"); + BOOST_REQUIRE_EQUAL(instance.filter_tx_head_file(), "bitcoin/heads/option_filter_tx.head"); + BOOST_REQUIRE_EQUAL(instance.filter_tx_body_file(), "bitcoin/option_filter_tx.data"); - /// Locks. + /// Lock. BOOST_REQUIRE_EQUAL(instance.flush_lock_file(), "bitcoin/flush.lock"); BOOST_REQUIRE_EQUAL(instance.process_lock_file(), "bitcoin/process.lock"); }