Expose electrum options to protocol and channel.

Author: evoskuil

include/bitcoin/server/channels/channel_electrum.hpp

@@ -39,12 +39,13 @@ class BCS_API channel_electrum
 public:
     typedef std::shared_ptr<channel_electrum> ptr;
     using interface_t = interface::electrum;
-    using options_t = typename network::channel_rpc<interface_t>::options_t;
+    using options_t = settings::electrum_server;
 
     inline channel_electrum(const network::logger& log,
         const network::socket::ptr& socket, uint64_t identifier,
         const node::configuration& config, const options_t& options) NOEXCEPT
       : server::channel(log, socket, identifier, config),
+        options_(options),
         network::channel_rpc<interface::electrum>(log, socket, identifier,
             config.network, options),
         network::tracker<channel_electrum>(log)
@@ -74,7 +75,15 @@ class BCS_API channel_electrum
         return version_;
     }
 
+    inline const options_t& options() const NOEXCEPT
+    {
+        return options_;
+    }
+
 private:
+    // This is thread safe.
+    const options_t& options_;
+
     // These are protected by strand.
     electrum::version version_{ electrum::version::v0_0 };
     std::string name_{};

include/bitcoin/server/protocols/protocol_electrum.hpp

@@ -42,6 +42,7 @@ class BCS_API protocol_electrum
         const network::channel::ptr& channel,
         const options_t& options) NOEXCEPT
       : protocol_rpc<channel_electrum>(session, channel, options),
+        options_(options),
         channel_(std::dynamic_pointer_cast<channel_t>(channel)),
         network::tracker<protocol_electrum>(session->log)
     {
@@ -132,7 +133,15 @@ class BCS_API protocol_electrum
         return channel_->version() >= version;
     }
 
+    inline const options_t& options() const NOEXCEPT
+    {
+        return options_;
+    }
+
 private:
+    // This is thread safe.
+    const options_t& options_;
+
     // This is mostly thread safe, and used in a thread safe manner.
     const channel_t::ptr channel_;
 };

include/bitcoin/server/protocols/protocol_electrum_version.hpp

@@ -41,6 +41,7 @@ class BCS_API protocol_electrum_version
         const network::channel::ptr& channel,
         const options_t& options) NOEXCEPT
       : protocol_rpc<channel_electrum>(session, channel, options),
+        options_(options),
         channel_(std::dynamic_pointer_cast<channel_t>(channel)),
         network::tracker<protocol_electrum_version>(session->log)
     {
@@ -69,7 +70,15 @@ class BCS_API protocol_electrum_version
     std::string escape_client(const std::string& in) NOEXCEPT;
     bool set_client(const std::string& name) NOEXCEPT;
 
+    inline const options_t& options() const NOEXCEPT
+    {
+        return options_;
+    }
+
 private:
+    // This is thread safe.
+    const options_t& options_;
+
     // This is mostly thread safe, and used in a thread safe manner.
     const channel_t::ptr channel_;