Add a multi-tx test block, expose electrum fixture query_.

Author: evoskuil

test/protocols/blocks.cpp

@@ -103,3 +103,110 @@ bool setup_ten_block_store(query_t& query) NOEXCEPT
         query.push_confirmed(query.to_header(block8_hash), false) &&
         query.push_confirmed(query.to_header(block9_hash), false);
 }
+
+using namespace chain;
+const chain::block bogus_block10
+{
+    header
+    {
+        0x31323334,
+        block9_hash,
+        one_hash,
+        0x41424344,
+        0x51525354,
+        0x61626364
+    },
+    transactions
+    {
+        transaction
+        {
+            0x01,
+            inputs
+            {
+                input
+                {
+                    point{},
+                    script{},
+                    witness{},
+                    0x02
+                },
+                input
+                {
+                    point{},
+                    script{},
+                    witness{},
+                    0x03
+                }
+            },
+            outputs
+            {
+                output
+                {
+                    0x04,
+                    script{}
+                }
+            },
+            0x05
+        },
+        transaction
+        {
+            0x06,
+            inputs
+            {
+                input
+                {
+                    point{},
+                    script{},
+                    witness{},
+                    0x07
+                },
+                input
+                {
+                    point{},
+                    script{},
+                    witness{},
+                    0x08
+                }
+            },
+            outputs
+            {
+                output
+                {
+                    0x09,
+                    script{}
+                }
+            },
+            0x0a
+        },
+        transaction
+        {
+            0x0b,
+            inputs
+            {
+                input
+                {
+                    point{},
+                    script{},
+                    witness{},
+                    0x0c
+                },
+                input
+                {
+                    point{},
+                    script{},
+                    witness{},
+                    0x0d
+                }
+            },
+            outputs
+            {
+                output
+                {
+                    0x0e,
+                    script{}
+                }
+            },
+            0x0f
+        }
+    }
+};

test/protocols/blocks.hpp

@@ -83,6 +83,7 @@ extern const system::chain::block block6;
 extern const system::chain::block block7;
 extern const system::chain::block block8;
 extern const system::chain::block block9;
+extern const system::chain::block bogus_block10;
 
 bool setup_ten_block_store(query_t& query) NOEXCEPT;
 

test/protocols/electrum/electrum.cpp

@@ -83,11 +83,6 @@ electrum_setup_fixture::~electrum_setup_fixture()
     BOOST_WARN_MESSAGE(test::clear(test::directory), "electrum cleanup");
 }
 
-const configuration& electrum_setup_fixture::config() const NOEXCEPT
-{
-    return config_;
-}
-
 boost::json::value electrum_setup_fixture::get(const std::string& request)
 {
     socket_.send(boost::asio::buffer(request));
@@ -126,6 +121,6 @@ bool electrum_setup_fixture::handshake(const std::string& version,
     const auto& result = response.at("result").as_array();
     return (result.size() == two) &&
         (result.at(0).is_string() && result.at(1).is_string()) &&
-        (result.at(0).as_string() == config().server.electrum.server_name) &&
+        (result.at(0).as_string() == config_.server.electrum.server_name) &&
         (result.at(1).as_string() == version);
 }

test/protocols/electrum/electrum.hpp

@@ -31,15 +31,16 @@ struct electrum_setup_fixture
     electrum_setup_fixture();
     ~electrum_setup_fixture();
 
-    const configuration& config() const NOEXCEPT;
     boost::json::value get(const std::string& request);
     bool handshake(const std::string& version="1.4",
         const std::string& name="test", network::rpc::code_t id=0);
 
-private:
+protected:
     configuration config_;
     store_t store_;
     query_t query_;
+
+private:
     network::logger log_;
     server::server_node server_;
     boost::asio::io_context io{};