diff --git a/include/bitcoin/database/impl/query/extent.ipp b/include/bitcoin/database/impl/query/extent.ipp index 424e4124e..d30e24579 100644 --- a/include/bitcoin/database/impl/query/extent.ipp +++ b/include/bitcoin/database/impl/query/extent.ipp @@ -93,7 +93,6 @@ size_t CLASS::store_body_size() const NOEXCEPT + strong_tx_body_size() + ecdsa_body_size() + schnorr_body_size() - + multisig_body_size() + duplicate_body_size() + prevout_body_size() + validated_bk_body_size() @@ -125,7 +124,6 @@ size_t CLASS::store_head_size() const NOEXCEPT + strong_tx_head_size() + ecdsa_head_size() + schnorr_head_size() - + multisig_head_size() + duplicate_head_size() + prevout_head_size() + validated_bk_head_size() @@ -152,7 +150,6 @@ DEFINE_SIZES(confirmed) DEFINE_SIZES(strong_tx) DEFINE_SIZES(ecdsa) DEFINE_SIZES(schnorr) -DEFINE_SIZES(multisig) DEFINE_SIZES(duplicate) DEFINE_SIZES(prevout) DEFINE_SIZES(validated_bk) @@ -192,7 +189,6 @@ DEFINE_RECORDS(confirmed) DEFINE_RECORDS(strong_tx) DEFINE_RECORDS(ecdsa) DEFINE_RECORDS(schnorr) -DEFINE_RECORDS(multisig) DEFINE_RECORDS(duplicate) DEFINE_RECORDS(filter_bk) DEFINE_RECORDS(address) diff --git a/include/bitcoin/database/impl/query/signatures.ipp b/include/bitcoin/database/impl/query/signatures.ipp index e41f6abe3..46bc579c8 100644 --- a/include/bitcoin/database/impl/query/signatures.ipp +++ b/include/bitcoin/database/impl/query/signatures.ipp @@ -64,22 +64,22 @@ bool CLASS::set_signature(const hash_digest& digest, const ec_compressed& point, } TEMPLATE -bool CLASS::set_signatures(const hash_digest& digest, const ec_compresseds& keys, - const ec_signatures& sigs, uint16_t group, const header_link& link) NOEXCEPT +bool CLASS::set_signatures(const hash_digest& , const ec_compresseds& , + const ec_signatures& , uint16_t , const header_link& ) NOEXCEPT { // ======================================================================== const auto scope = store_.get_transactor(); - // Clean single allocation failure (e.g. disk full). - return store_.multisig.put(table::multisig::put_ref - { - {}, - digest, - keys, - sigs, - group, - link - }); + ////// Clean single allocation failure (e.g. disk full). + ////return store_.multisig.put(table::multisig::put_ref + ////{ + //// {}, + //// digest, + //// keys, + //// sigs, + //// group, + //// link + ////}); // ======================================================================== return {}; diff --git a/include/bitcoin/database/impl/store.ipp b/include/bitcoin/database/impl/store.ipp index b0b0e3e58..29199dced 100644 --- a/include/bitcoin/database/impl/store.ipp +++ b/include/bitcoin/database/impl/store.ipp @@ -109,9 +109,6 @@ const std::unordered_map CLASS::tables { table_t::schnorr_table, "schnorr_table" }, { table_t::schnorr_head, "schnorr_head" }, { table_t::schnorr_body, "schnorr_body" }, - { table_t::multisig_table, "multisig_table" }, - { table_t::multisig_head, "multisig_head" }, - { table_t::multisig_body, "multisig_body" }, { table_t::duplicate_table, "duplicate_table" }, { table_t::duplicate_head, "duplicate_head" }, { table_t::duplicate_body, "duplicate_body" }, @@ -189,9 +186,6 @@ CLASS::store(const settings& config) NOEXCEPT schnorr_head_(head(config.path / schema::dir::heads, schema::caches::schnorr), 1, 0, random), schnorr_body_(body(config.path, schema::caches::schnorr), config.schnorr_size, config.schnorr_rate, sequential), - multisig_head_(head(config.path / schema::dir::heads, schema::caches::multisig), 1, 0, random), - multisig_body_(body(config.path, schema::caches::multisig), config.multisig_size, config.multisig_rate, sequential), - duplicate_head_(head(config.path / schema::dir::heads, schema::caches::duplicate), 1, 0, random), duplicate_body_(body(config.path, schema::caches::duplicate), config.duplicate_size, config.duplicate_rate, sequential), @@ -240,7 +234,6 @@ CLASS::store(const settings& config) NOEXCEPT ecdsa(ecdsa_head_, ecdsa_body_), schnorr(schnorr_head_, schnorr_body_), - multisig(multisig_head_, multisig_body_), duplicate(duplicate_head_, duplicate_body_, config.duplicate_buckets), prevout(prevout_head_, prevout_body_, config.prevout_buckets), validated_bk(validated_bk_head_, validated_bk_body_, config.validated_bk_buckets), @@ -326,8 +319,6 @@ code CLASS::create(const event_handler& handler) NOEXCEPT create(ec, ecdsa_body_, table_t::ecdsa_body); create(ec, schnorr_head_, table_t::schnorr_head); create(ec, schnorr_body_, table_t::schnorr_body); - create(ec, multisig_head_, table_t::multisig_head); - create(ec, multisig_body_, table_t::multisig_body); create(ec, duplicate_head_, table_t::duplicate_head); create(ec, duplicate_body_, table_t::duplicate_body); create(ec, prevout_head_, table_t::prevout_head); @@ -373,7 +364,6 @@ code CLASS::create(const event_handler& handler) NOEXCEPT populate(ec, ecdsa, table_t::ecdsa_table); populate(ec, schnorr, table_t::schnorr_table); - populate(ec, multisig, table_t::multisig_table); populate(ec, duplicate, table_t::duplicate_table); populate(ec, prevout, table_t::prevout_table); populate(ec, validated_bk, table_t::validated_bk_table); @@ -449,7 +439,6 @@ code CLASS::open(const event_handler& handler) NOEXCEPT verify(ec, ecdsa, table_t::ecdsa_table); verify(ec, schnorr, table_t::schnorr_table); - verify(ec, multisig, table_t::multisig_table); verify(ec, duplicate, table_t::duplicate_table); verify(ec, prevout, table_t::prevout_table); verify(ec, validated_bk, table_t::validated_bk_table); @@ -568,7 +557,6 @@ code CLASS::snapshot(const event_handler& handler, bool prune) NOEXCEPT flush(ec, ecdsa_body_, table_t::ecdsa_body); flush(ec, schnorr_body_, table_t::schnorr_body); - flush(ec, multisig_body_, table_t::multisig_body); flush(ec, duplicate_body_, table_t::duplicate_body); if (!prune) flush(ec, prevout_body_, table_t::prevout_body); flush(ec, validated_bk_body_, table_t::validated_bk_body); @@ -635,8 +623,6 @@ code CLASS::reload(const event_handler& handler) NOEXCEPT reload(ec, ecdsa_body_, table_t::ecdsa_body); reload(ec, schnorr_head_, table_t::schnorr_head); reload(ec, schnorr_body_, table_t::schnorr_body); - reload(ec, multisig_head_, table_t::multisig_head); - reload(ec, multisig_body_, table_t::multisig_body); reload(ec, duplicate_head_, table_t::duplicate_head); reload(ec, duplicate_body_, table_t::duplicate_body); reload(ec, prevout_head_, table_t::prevout_head); @@ -692,7 +678,6 @@ code CLASS::close(const event_handler& handler) NOEXCEPT close(ec, ecdsa, table_t::ecdsa_table); close(ec, schnorr, table_t::schnorr_table); - close(ec, multisig, table_t::multisig_table); close(ec, duplicate, table_t::duplicate_table); close(ec, prevout, table_t::prevout_table); close(ec, validated_bk, table_t::validated_bk_table); @@ -762,8 +747,6 @@ code CLASS::open_load(const event_handler& handler) NOEXCEPT open(ec, ecdsa_body_, table_t::ecdsa_body); open(ec, schnorr_head_, table_t::schnorr_head); open(ec, schnorr_body_, table_t::schnorr_body); - open(ec, multisig_head_, table_t::multisig_head); - open(ec, multisig_body_, table_t::multisig_body); open(ec, duplicate_head_, table_t::duplicate_head); open(ec, duplicate_body_, table_t::duplicate_body); open(ec, prevout_head_, table_t::prevout_head); @@ -817,8 +800,6 @@ code CLASS::open_load(const event_handler& handler) NOEXCEPT load(ec, ecdsa_body_, table_t::ecdsa_body); load(ec, schnorr_head_, table_t::schnorr_head); load(ec, schnorr_body_, table_t::schnorr_body); - load(ec, multisig_head_, table_t::multisig_head); - load(ec, multisig_body_, table_t::multisig_body); load(ec, duplicate_head_, table_t::duplicate_head); load(ec, duplicate_body_, table_t::duplicate_body); load(ec, prevout_head_, table_t::prevout_head); @@ -882,8 +863,6 @@ code CLASS::unload_close(const event_handler& handler) NOEXCEPT unload(ec, ecdsa_body_, table_t::ecdsa_body); unload(ec, schnorr_head_, table_t::schnorr_head); unload(ec, schnorr_body_, table_t::schnorr_body); - unload(ec, multisig_head_, table_t::multisig_head); - unload(ec, multisig_body_, table_t::multisig_body); unload(ec, duplicate_head_, table_t::duplicate_head); unload(ec, duplicate_body_, table_t::duplicate_body); unload(ec, prevout_head_, table_t::prevout_head); @@ -937,8 +916,6 @@ code CLASS::unload_close(const event_handler& handler) NOEXCEPT close(ec, ecdsa_body_, table_t::ecdsa_body); close(ec, schnorr_head_, table_t::schnorr_head); close(ec, schnorr_body_, table_t::schnorr_body); - close(ec, multisig_head_, table_t::multisig_head); - close(ec, multisig_body_, table_t::multisig_body); close(ec, duplicate_head_, table_t::duplicate_head); close(ec, duplicate_body_, table_t::duplicate_body); close(ec, prevout_head_, table_t::prevout_head); @@ -988,7 +965,6 @@ code CLASS::backup(const event_handler& handler, bool prune) NOEXCEPT backup(ec, ecdsa, table_t::ecdsa_table); backup(ec, schnorr, table_t::schnorr_table); - backup(ec, multisig, table_t::multisig_table); backup(ec, duplicate, table_t::duplicate_table); backup(ec, prevout, table_t::prevout_table, prune); backup(ec, validated_bk, table_t::validated_bk_table); @@ -1056,7 +1032,6 @@ code CLASS::dump(const path& folder, auto ecdsa_buffer = ecdsa_head_.get(); auto schnorr_buffer = schnorr_head_.get(); - auto multisig_buffer = multisig_head_.get(); auto duplicate_buffer = duplicate_head_.get(); auto prevout_buffer = prevout_head_.get(); auto validated_bk_buffer = validated_bk_head_.get(); @@ -1081,7 +1056,6 @@ code CLASS::dump(const path& folder, if (!ecdsa_buffer) return error::unloaded_file; if (!schnorr_buffer) return error::unloaded_file; - if (!multisig_buffer) return error::unloaded_file; if (!duplicate_buffer) return error::unloaded_file; if (!prevout_buffer) return error::unloaded_file; if (!validated_bk_buffer) return error::unloaded_file; @@ -1118,7 +1092,6 @@ code CLASS::dump(const path& folder, dump(ec, ecdsa_buffer, schema::caches::ecdsa, table_t::ecdsa_head); dump(ec, schnorr_buffer, schema::caches::schnorr, table_t::schnorr_head); - dump(ec, multisig_buffer, schema::caches::multisig, table_t::multisig_head); dump(ec, duplicate_buffer, schema::caches::duplicate, table_t::duplicate_head); dump(ec, prevout_buffer, schema::caches::prevout, table_t::prevout_head); dump(ec, validated_bk_buffer, schema::caches::validated_bk, table_t::validated_bk_head); @@ -1214,7 +1187,6 @@ code CLASS::restore(const event_handler& handler) NOEXCEPT restore(ec, ecdsa, table_t::ecdsa_table); restore(ec, schnorr, table_t::schnorr_table); - restore(ec, multisig, table_t::multisig_table); restore(ec, duplicate, table_t::duplicate_table); restore(ec, prevout, table_t::prevout_table); restore(ec, validated_bk, table_t::validated_bk_table); @@ -1280,7 +1252,6 @@ code CLASS::get_fault() const NOEXCEPT if ((ec = strong_tx_body_.get_fault())) return ec; if ((ec = ecdsa_body_.get_fault())) return ec; if ((ec = schnorr_body_.get_fault())) return ec; - if ((ec = multisig_body_.get_fault())) return ec; if ((ec = duplicate_body_.get_fault())) return ec; if ((ec = prevout_body_.get_fault())) return ec; if ((ec = validated_bk_body_.get_fault())) return ec; @@ -1313,7 +1284,6 @@ size_t CLASS::get_space() const NOEXCEPT space(strong_tx_body_); space(ecdsa_body_); space(schnorr_body_); - space(multisig_body_); space(duplicate_body_); space(prevout_body_); space(validated_bk_body_); @@ -1350,7 +1320,6 @@ void CLASS::report(const error_handler& handler) const NOEXCEPT report(strong_tx_body_, table_t::strong_tx_body); report(ecdsa_body_, table_t::ecdsa_body); report(schnorr_body_, table_t::schnorr_body); - report(multisig_body_, table_t::multisig_body); report(duplicate_body_, table_t::duplicate_body); report(prevout_body_, table_t::prevout_body); report(validated_bk_body_, table_t::validated_bk_body); diff --git a/include/bitcoin/database/query.hpp b/include/bitcoin/database/query.hpp index 5bac58bff..db1746c1f 100644 --- a/include/bitcoin/database/query.hpp +++ b/include/bitcoin/database/query.hpp @@ -125,7 +125,6 @@ class query size_t strong_tx_head_size() const NOEXCEPT; size_t ecdsa_head_size() const NOEXCEPT; size_t schnorr_head_size() const NOEXCEPT; - size_t multisig_head_size() const NOEXCEPT; size_t duplicate_head_size() const NOEXCEPT; size_t prevout_head_size() const NOEXCEPT; size_t validated_bk_head_size() const NOEXCEPT; @@ -149,7 +148,6 @@ class query size_t strong_tx_body_size() const NOEXCEPT; size_t ecdsa_body_size() const NOEXCEPT; size_t schnorr_body_size() const NOEXCEPT; - size_t multisig_body_size() const NOEXCEPT; size_t duplicate_body_size() const NOEXCEPT; size_t prevout_body_size() const NOEXCEPT; size_t validated_bk_body_size() const NOEXCEPT; @@ -173,7 +171,6 @@ class query size_t strong_tx_size() const NOEXCEPT; size_t ecdsa_size() const NOEXCEPT; size_t schnorr_size() const NOEXCEPT; - size_t multisig_size() const NOEXCEPT; size_t duplicate_size() const NOEXCEPT; size_t prevout_size() const NOEXCEPT; size_t validated_bk_size() const NOEXCEPT; @@ -209,7 +206,6 @@ class query size_t strong_tx_records() const NOEXCEPT; size_t ecdsa_records() const NOEXCEPT; size_t schnorr_records() const NOEXCEPT; - size_t multisig_records() const NOEXCEPT; size_t duplicate_records() const NOEXCEPT; size_t filter_bk_records() const NOEXCEPT; size_t address_records() const NOEXCEPT; diff --git a/include/bitcoin/database/settings.hpp b/include/bitcoin/database/settings.hpp index a6176e78d..5a7371db1 100644 --- a/include/bitcoin/database/settings.hpp +++ b/include/bitcoin/database/settings.hpp @@ -101,9 +101,6 @@ struct BCD_API settings uint64_t schnorr_size; uint16_t schnorr_rate; - uint64_t multisig_size; - uint16_t multisig_rate; - // This one is 16 bit (could use table link::integer) for these. uint16_t duplicate_buckets; uint64_t duplicate_size; diff --git a/include/bitcoin/database/store.hpp b/include/bitcoin/database/store.hpp index 94ec69c96..c0c2ec2ff 100644 --- a/include/bitcoin/database/store.hpp +++ b/include/bitcoin/database/store.hpp @@ -175,10 +175,6 @@ class store Storage schnorr_head_; Storage schnorr_body_; - // array - Storage multisig_head_; - Storage multisig_body_; - // blob arraymap Storage duplicate_head_; Storage duplicate_body_; @@ -259,7 +255,6 @@ class store /// Caches. table::ecdsa ecdsa; table::schnorr schnorr; - table::multisig multisig; table::duplicate duplicate; table::prevout prevout; table::validated_bk validated_bk; diff --git a/include/bitcoin/database/tables/names.hpp b/include/bitcoin/database/tables/names.hpp index aedc20e63..85c470540 100644 --- a/include/bitcoin/database/tables/names.hpp +++ b/include/bitcoin/database/tables/names.hpp @@ -59,7 +59,6 @@ namespace caches { 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"; diff --git a/include/bitcoin/database/tables/table.hpp b/include/bitcoin/database/tables/table.hpp index 502482505..eed537ac2 100644 --- a/include/bitcoin/database/tables/table.hpp +++ b/include/bitcoin/database/tables/table.hpp @@ -75,9 +75,6 @@ enum class table_t schnorr_table, schnorr_head, schnorr_body, - multisig_table, - multisig_head, - multisig_body, duplicate_table, duplicate_head, duplicate_body, diff --git a/include/bitcoin/database/tables/tables.hpp b/include/bitcoin/database/tables/tables.hpp index d34ab4b00..1dd6ce13c 100644 --- a/include/bitcoin/database/tables/tables.hpp +++ b/include/bitcoin/database/tables/tables.hpp @@ -31,7 +31,6 @@ #include #include #include -#include #include #include #include diff --git a/src/settings.cpp b/src/settings.cpp index faa8f26d3..0d00ca64f 100644 --- a/src/settings.cpp +++ b/src/settings.cpp @@ -77,9 +77,6 @@ settings::settings() NOEXCEPT schnorr_size{ 1 }, schnorr_rate{ 50 }, - multisig_size{ 1 }, - multisig_rate{ 50 }, - duplicate_buckets{ 128 }, duplicate_size{ 1 }, duplicate_rate{ 50 }, diff --git a/test/mocks/chunk_store.hpp b/test/mocks/chunk_store.hpp index 062f6cf94..c68b97ec9 100644 --- a/test/mocks/chunk_store.hpp +++ b/test/mocks/chunk_store.hpp @@ -168,16 +168,6 @@ class chunk_store return schnorr_body_.buffer(); } - system::data_chunk& multisig_head() NOEXCEPT - { - return multisig_head_.buffer(); - } - - system::data_chunk& multisig_body() NOEXCEPT - { - return multisig_body_.buffer(); - } - system::data_chunk& duplicate_head() NOEXCEPT { return duplicate_head_.buffer(); diff --git a/test/mocks/map_store.hpp b/test/mocks/map_store.hpp index d13630b27..099cb6cd9 100644 --- a/test/mocks/map_store.hpp +++ b/test/mocks/map_store.hpp @@ -189,16 +189,6 @@ class map_store return schnorr_body_.file(); } - inline const path& multisig_head_file() const NOEXCEPT - { - return multisig_head_.file(); - } - - inline const path& multisig_body_file() const NOEXCEPT - { - return multisig_body_.file(); - } - inline const path& duplicate_head_file() const NOEXCEPT { return duplicate_head_.file(); diff --git a/test/query/extent.cpp b/test/query/extent.cpp index c10f8bbab..5be68517c 100644 --- a/test/query/extent.cpp +++ b/test/query/extent.cpp @@ -53,7 +53,6 @@ BOOST_AUTO_TEST_CASE(query_extent__body_sizes__genesis__expected) BOOST_REQUIRE_EQUAL(query.strong_tx_body_size(), schema::strong_tx::minrow); BOOST_REQUIRE_EQUAL(query.ecdsa_body_size(), zero); BOOST_REQUIRE_EQUAL(query.schnorr_body_size(), zero); - BOOST_REQUIRE_EQUAL(query.multisig_body_size(), zero); BOOST_REQUIRE_EQUAL(query.duplicate_body_size(), zero); BOOST_REQUIRE_EQUAL(query.prevout_body_size(), zero); BOOST_REQUIRE_EQUAL(query.validated_bk_body_size(), zero); @@ -106,7 +105,6 @@ BOOST_AUTO_TEST_CASE(query_extent__records__genesis__expected) BOOST_REQUIRE_EQUAL(query.strong_tx_records(), one); BOOST_REQUIRE_EQUAL(query.ecdsa_records(), zero); BOOST_REQUIRE_EQUAL(query.schnorr_records(), zero); - BOOST_REQUIRE_EQUAL(query.multisig_records(), zero); BOOST_REQUIRE_EQUAL(query.duplicate_records(), zero); BOOST_REQUIRE_EQUAL(query.filter_bk_records(), one); BOOST_REQUIRE_EQUAL(query.address_records(), one); diff --git a/test/settings.cpp b/test/settings.cpp index 1a9d417fd..aa0cffc79 100644 --- a/test/settings.cpp +++ b/test/settings.cpp @@ -63,8 +63,6 @@ BOOST_AUTO_TEST_CASE(settings__construct__default__expected) BOOST_REQUIRE_EQUAL(configuration.ecdsa_rate, 50u); BOOST_REQUIRE_EQUAL(configuration.schnorr_size, 1u); BOOST_REQUIRE_EQUAL(configuration.schnorr_rate, 50u); - BOOST_REQUIRE_EQUAL(configuration.multisig_size, 1u); - BOOST_REQUIRE_EQUAL(configuration.multisig_rate, 50u); BOOST_REQUIRE_EQUAL(configuration.duplicate_buckets, 128u); BOOST_REQUIRE_EQUAL(configuration.duplicate_size, 1u); BOOST_REQUIRE_EQUAL(configuration.duplicate_rate, 50u);