style.

Author: evoskuil

include/bitcoin/server/protocols/protocol_electrum.hpp

@@ -355,8 +355,8 @@ class BCS_API protocol_electrum
     std::atomic_bool stopping_{};
     std::atomic_bool subscribed_height_{};
     std::atomic_bool subscribed_header_{};
+    std::atomic_bool subscribed_address_{};
     std::atomic_bool subscribed_outpoint_{};
-    std::atomic_bool subscribed_scripthash_{};
 
     // This is mostly thread safe, and used in a thread safe manner.
     const channel_t::ptr channel_;
@@ -365,8 +365,8 @@ class BCS_API protocol_electrum
     network::asio::strand notification_strand_;
 
     // These are protected by notification strand.
+    std::map<hash_digest, subscription> address_subscriptions_{};
     std::set<system::chain::point> outpoint_subscriptions_{};
-    std::map<hash_digest, subscription> scripthash_subscriptions_{};
 };
 
 } // namespace server

src/protocols/electrum/protocol_electrum.cpp

@@ -161,7 +161,7 @@ bool protocol_electrum::handle_event(const code&, node::chase event_,
                 NOTIFY(do_outpoint, std::get<node::header_t>(value));
             }
 
-            if (subscribed_scripthash_.load(relaxed))
+            if (subscribed_address_.load(relaxed))
             {
                 BC_ASSERT(archive().address_enabled());
                 BC_ASSERT(std::holds_alternative<node::header_t>(value));

src/protocols/electrum/protocol_electrum_headers.cpp

@@ -31,6 +31,7 @@ namespace server {
 using namespace system;
 using namespace network::rpc;
 using namespace std::placeholders;
+constexpr auto relaxed = std::memory_order_relaxed;
 
 BC_PUSH_WARNING(NO_THROW_IN_NOEXCEPT)
 
@@ -46,7 +47,7 @@ void protocol_electrum::handle_blockchain_number_of_blocks_subscribe(
         return;
     }
 
-    subscribed_height_.store(true, std::memory_order_relaxed);
+    subscribed_height_.store(true, relaxed);
     const auto top_height = archive().get_top_confirmed();
     send_result(top_height, 42, BIND(complete, _1));
 }
@@ -362,7 +363,7 @@ void protocol_electrum::handle_blockchain_headers_subscribe(const code& ec,
         return;
     }
 
-    subscribed_header_.store(true, std::memory_order_relaxed);
+    subscribed_header_.store(true, relaxed);
     send_result(object_t
     {
         { "height", top },

src/protocols/electrum/protocol_electrum_outputs.cpp

@@ -29,6 +29,7 @@ namespace server {
 using namespace system;
 using namespace network::rpc;
 using namespace std::placeholders;
+constexpr auto relaxed = std::memory_order_relaxed;
 
 BC_PUSH_WARNING(NO_THROW_IN_NOEXCEPT)
 
@@ -131,7 +132,7 @@ void protocol_electrum::handle_blockchain_outpoint_subscribe(const code& ec,
 
     // TODO: subscribe.
     ///////////////////////////////////////////////////////////////////////////
-    subscribed_outpoint_.store(true, std::memory_order_relaxed);
+    subscribed_outpoint_.store(true, relaxed);
     ///////////////////////////////////////////////////////////////////////////
 
     chain::point prevout{ hash, index };
@@ -165,7 +166,7 @@ void protocol_electrum::handle_blockchain_outpoint_unsubscribe(const code& ec,
 
     // TODO: unsubscribe.
     ///////////////////////////////////////////////////////////////////////////
-    const auto prior = subscribed_outpoint_.load(std::memory_order_relaxed);
+    const auto prior = subscribed_outpoint_.load(relaxed);
     ///////////////////////////////////////////////////////////////////////////
 
     send_result(prior, 16, BIND(complete, _1));

src/protocols/electrum/protocol_electrum_scripthash_subscribe.cpp

@@ -30,6 +30,7 @@ namespace server {
 using namespace system;
 using namespace network::rpc;
 using namespace std::placeholders;
+constexpr auto relaxed = std::memory_order_relaxed;
 
 BC_PUSH_WARNING(NO_THROW_IN_NOEXCEPT)
 
@@ -71,7 +72,7 @@ void protocol_electrum::scripthash_subscribe(const hash_digest& hash,
         return;
     }
 
-    if (scripthash_subscriptions_.size() >= options_.maximum_subscriptions)
+    if (address_subscriptions_.size() >= options_.maximum_subscriptions)
     {
         send_code(error::subscription_limit);
         return;
@@ -93,9 +94,8 @@ void protocol_electrum::do_scripthash_subscribe(const hash_digest& hash,
     BC_ASSERT(notification_strand_.running_in_this_thread());
 
     // Subscription response is idempotent.
-    subscribed_scripthash_.store(true, std::memory_order_relaxed);
-    auto [it, inserted] = scripthash_subscriptions_.try_emplace(hash, type,
-        midstate{});
+    subscribed_address_.store(true, relaxed);
+    auto [it, in] = address_subscriptions_.try_emplace(hash, type, midstate{});
 
     hash_digest status{};
     const auto ec = get_scripthash_status(status, it->second, it->first);
@@ -169,9 +169,9 @@ void protocol_electrum::do_scripthash_unsubscribe(
 {
     BC_ASSERT(notification_strand_.running_in_this_thread());
 
-    const auto found = to_bool(scripthash_subscriptions_.erase(hash));
-    if (is_zero(scripthash_subscriptions_.size()))
-        subscribed_scripthash_.store(false, std::memory_order_relaxed);
+    const auto found = to_bool(address_subscriptions_.erase(hash));
+    if (is_zero(address_subscriptions_.size()))
+        subscribed_address_.store(false, relaxed);
 
     POST(complete_scripthash_unsubscribe, found);
 }
@@ -192,7 +192,7 @@ void protocol_electrum::do_scripthash(node::header_t) NOEXCEPT
 
     code ec{};
     hash_digest status{};
-    for (auto& [key, sub]: scripthash_subscriptions_)
+    for (auto& [key, sub]: address_subscriptions_)
     {
         if ((ec = get_scripthash_status(status, sub, key)))
         {
@@ -227,7 +227,7 @@ void protocol_electrum::do_regressed(node::header_t) NOEXCEPT
 {
     BC_ASSERT(notification_strand_.running_in_this_thread());
 
-    for (auto& [key, sub]: scripthash_subscriptions_)
+    for (auto& [key, sub]: address_subscriptions_)
     {
         // writer.flush resets hash accumulator, sub.type remains unchanged.
         sub.state.writer.flush();