Merge pull request #1753 from evoskuil/master

Refactor stream/reader/chain object construction.

Author: evoskuil

include/bitcoin/system/chain/block.hpp

@@ -54,11 +54,9 @@ class BC_API block
     block(const chain::header::cptr& header,
         const transactions_cptr& txs) NOEXCEPT;
 
-    block(stream::in::fast&& stream, bool witness) NOEXCEPT;
+    block(const data_slice& data, bool witness) NOEXCEPT;
     block(stream::in::fast& stream, bool witness) NOEXCEPT;
-    block(std::istream&& stream, bool witness) NOEXCEPT;
     block(std::istream& stream, bool witness) NOEXCEPT;
-    block(reader&& source, bool witness) NOEXCEPT;
     block(reader& source, bool witness) NOEXCEPT;
 
     /// Operators.
@@ -150,6 +148,8 @@ class BC_API block
     code populate_with_metadata(const context& ctx) const NOEXCEPT;
 
 protected:
+    block(stream::in::fast&& stream, bool witness) NOEXCEPT;
+    block(reader&& source, bool witness) NOEXCEPT;
     block(const chain::header::cptr& header,
         const chain::transactions_cptr& txs, bool valid) NOEXCEPT;
 

include/bitcoin/system/chain/header.hpp

@@ -63,11 +63,9 @@ class BC_API header
         const hash_digest& merkle_root, uint32_t timestamp, uint32_t bits,
         uint32_t nonce) NOEXCEPT;
 
-    header(stream::in::fast&& stream) NOEXCEPT;
+    header(const data_slice& data) NOEXCEPT;
     header(stream::in::fast& stream) NOEXCEPT;
-    header(std::istream&& stream) NOEXCEPT;
     header(std::istream& stream) NOEXCEPT;
-    header(reader&& source) NOEXCEPT;
     header(reader& source) NOEXCEPT;
 
     /// Operators.
@@ -122,6 +120,8 @@ class BC_API header
     code accept(const context& ctx) const NOEXCEPT;
 
 protected:
+    header(stream::in::fast&& stream) NOEXCEPT;
+    header(reader&& source) NOEXCEPT;
     header(uint32_t version, hash_digest&& previous_block_hash,
         hash_digest&& merkle_root, uint32_t timestamp, uint32_t bits,
         uint32_t nonce, bool valid) NOEXCEPT;

include/bitcoin/system/chain/input.hpp

@@ -26,6 +26,7 @@
 #include <bitcoin/system/chain/prevout.hpp>
 #include <bitcoin/system/chain/script.hpp>
 #include <bitcoin/system/chain/witness.hpp>
+#include <bitcoin/system/data/data.hpp>
 #include <bitcoin/system/define.hpp>
 #include <bitcoin/system/hash/hash.hpp>
 #include <bitcoin/system/stream/stream.hpp>
@@ -66,11 +67,9 @@ class BC_API input
     input(const chain::point::cptr& point, const chain::script::cptr& script,
         const chain::witness::cptr& witness, uint32_t sequence) NOEXCEPT;
 
-    input(stream::in::fast&& stream) NOEXCEPT;
+    input(const data_slice& data) NOEXCEPT;
     input(stream::in::fast& stream) NOEXCEPT;
-    input(std::istream&& stream) NOEXCEPT;
     input(std::istream& stream) NOEXCEPT;
-    input(reader&& source) NOEXCEPT;
     input(reader& source) NOEXCEPT;
 
     /// Operators.
@@ -118,6 +117,8 @@ class BC_API input
         uint32_t median_time_past) const NOEXCEPT;
 
 protected:
+    input(stream::in::fast&& stream) NOEXCEPT;
+    input(reader&& source) NOEXCEPT;
     input(const chain::point::cptr& point, const chain::script::cptr& script,
         const chain::witness::cptr& witness, uint32_t sequence,
         bool valid) NOEXCEPT;

include/bitcoin/system/chain/operation.hpp

@@ -105,11 +105,9 @@ class BC_API operation
     operation(const chunk_cptr& push_data, bool minimal) NOEXCEPT;
 
     /// These deserialize operations (with codes), not from push-data.
-    operation(stream::in::fast&& stream) NOEXCEPT;
+    operation(const data_slice& data) NOEXCEPT;
     operation(stream::in::fast& stream) NOEXCEPT;
-    operation(std::istream&& stream) NOEXCEPT;
     operation(std::istream& stream) NOEXCEPT;
-    operation(reader&& source) NOEXCEPT;
     operation(reader& source) NOEXCEPT;
 
     // TODO: move to config serialization wrapper.
@@ -148,6 +146,8 @@ class BC_API operation
     size_t serialized_size() const NOEXCEPT;
 
 protected:
+    operation(stream::in::fast&& stream) NOEXCEPT;
+    operation(reader&& source) NOEXCEPT;
     operation(opcode code, const chunk_cptr& push_data_ptr,
         bool underflow) NOEXCEPT;
 

include/bitcoin/system/chain/output.hpp

@@ -21,6 +21,7 @@
 
 #include <memory>
 #include <bitcoin/system/chain/script.hpp>
+#include <bitcoin/system/data/data.hpp>
 #include <bitcoin/system/define.hpp>
 #include <bitcoin/system/hash/hash.hpp>
 #include <bitcoin/system/stream/stream.hpp>
@@ -49,11 +50,9 @@ class BC_API output
     output(uint64_t value, const chain::script& script) NOEXCEPT;
     output(uint64_t value, const chain::script::cptr& script) NOEXCEPT;
 
-    output(stream::in::fast&& stream) NOEXCEPT;
+    output(const data_slice& data) NOEXCEPT;
     output(stream::in::fast& stream) NOEXCEPT;
-    output(std::istream&& stream) NOEXCEPT;
     output(std::istream& stream) NOEXCEPT;
-    output(reader&& source) NOEXCEPT;
     output(reader& source) NOEXCEPT;
 
     /// Operators.
@@ -95,6 +94,8 @@ class BC_API output
     const hash_digest& get_hash() const NOEXCEPT;
 
 protected:
+    output(stream::in::fast&& stream) NOEXCEPT;
+    output(reader&& source) NOEXCEPT;
     output(uint64_t value, const chain::script::cptr& script,
         bool valid) NOEXCEPT;
 

include/bitcoin/system/chain/point.hpp

@@ -55,11 +55,9 @@ class BC_API point
     point(hash_digest&& hash, uint32_t index) NOEXCEPT;
     point(const hash_digest& hash, uint32_t index) NOEXCEPT;
 
-    point(stream::in::fast&& stream) NOEXCEPT;
+    point(const data_slice& data) NOEXCEPT;
     point(stream::in::fast& stream) NOEXCEPT;
-    point(std::istream&& stream) NOEXCEPT;
     point(std::istream& stream) NOEXCEPT;
-    point(reader&& source) NOEXCEPT;
     point(reader& source) NOEXCEPT;
 
     /// Operators.
@@ -87,6 +85,8 @@ class BC_API point
     bool is_null() const NOEXCEPT;
 
 protected:
+    point(stream::in::fast&& stream) NOEXCEPT;
+    point(reader&& source) NOEXCEPT;
     point(hash_digest&& hash, uint32_t index, bool valid) NOEXCEPT;
     point(const hash_digest& hash, uint32_t index, bool valid) NOEXCEPT;
 

include/bitcoin/system/chain/script.hpp

@@ -102,11 +102,9 @@ class BC_API script
     script(operations&& ops) NOEXCEPT;
     script(const operations& ops) NOEXCEPT;
 
-    script(stream::in::fast&& stream, bool prefix) NOEXCEPT;
+    script(const data_slice& data, bool prefix) NOEXCEPT;
     script(stream::in::fast& stream, bool prefix) NOEXCEPT;
-    script(std::istream&& stream, bool prefix) NOEXCEPT;
     script(std::istream& stream, bool prefix) NOEXCEPT;
-    script(reader&& source, bool prefix) NOEXCEPT;
     script(reader& source, bool prefix) NOEXCEPT;
 
     // TODO: move to config serialization wrapper.
@@ -167,6 +165,8 @@ class BC_API script
     size_t signature_operations(bool accurate) const NOEXCEPT;
 
 protected:
+    script(stream::in::fast&& stream, bool prefix) NOEXCEPT;
+    script(reader&& source, bool prefix) NOEXCEPT;
     script(const operations& ops, bool valid, bool easier, bool failer,
         bool roller, size_t size) NOEXCEPT;
 

include/bitcoin/system/chain/transaction.hpp

@@ -26,6 +26,7 @@
 #include <bitcoin/system/chain/input.hpp>
 #include <bitcoin/system/chain/output.hpp>
 #include <bitcoin/system/chain/point.hpp>
+#include <bitcoin/system/data/data.hpp>
 #include <bitcoin/system/define.hpp>
 #include <bitcoin/system/error/error.hpp>
 #include <bitcoin/system/hash/hash.hpp>
@@ -70,11 +71,9 @@ class BC_API transaction
     transaction(uint32_t version, const inputs_cptr& inputs,
         const outputs_cptr& outputs, uint32_t locktime) NOEXCEPT;
 
-    transaction(stream::in::fast&& stream, bool witness) NOEXCEPT;
+    transaction(const data_slice& data, bool witness) NOEXCEPT;
     transaction(stream::in::fast& stream, bool witness) NOEXCEPT;
-    transaction(std::istream&& stream, bool witness) NOEXCEPT;
     transaction(std::istream& stream, bool witness) NOEXCEPT;
-    transaction(reader&& source, bool witness) NOEXCEPT;
     transaction(reader& source, bool witness) NOEXCEPT;
 
     /// Operators.
@@ -173,6 +172,8 @@ class BC_API transaction
     code confirm(const context& ctx) const NOEXCEPT;
 
 protected:
+    transaction(stream::in::fast&& stream, bool witness) NOEXCEPT;
+    transaction(reader&& source, bool witness) NOEXCEPT;
     transaction(uint32_t version, const inputs_cptr& inputs,
         const outputs_cptr& outputs, uint32_t locktime, bool segregated,
         bool valid) NOEXCEPT;

include/bitcoin/system/chain/witness.hpp

@@ -55,11 +55,9 @@ class BC_API witness
     witness(chunk_cptrs&& stack) NOEXCEPT;
     witness(const chunk_cptrs& stack) NOEXCEPT;
 
-    witness(stream::in::fast&& stream, bool prefix) NOEXCEPT;
+    witness(const data_slice& data, bool prefix) NOEXCEPT;
     witness(stream::in::fast& stream, bool prefix) NOEXCEPT;
-    witness(std::istream&& stream, bool prefix) NOEXCEPT;
     witness(std::istream& stream, bool prefix) NOEXCEPT;
-    witness(reader&& source, bool prefix) NOEXCEPT;
     witness(reader& source, bool prefix) NOEXCEPT;
 
     // TODO: move to config serialization wrapper.
@@ -120,6 +118,8 @@ class BC_API witness
         chunk_cptrs_ptr& out_stack, const script& program_script) const NOEXCEPT;
 
 protected:
+    witness(stream::in::fast&& stream, bool prefix) NOEXCEPT;
+    witness(reader&& source, bool prefix) NOEXCEPT;
     witness(chunk_cptrs&& stack, bool valid) NOEXCEPT;
     witness(const chunk_cptrs& stack, bool valid) NOEXCEPT;
     witness(const chunk_cptrs& stack, bool valid, size_t size) NOEXCEPT;

include/bitcoin/system/impl/stream/iostream/iostream.ipp

@@ -20,6 +20,7 @@
 #define LIBBITCOIN_SYSTEM_STREAM_IOSTREAM_IOSTREAM_IPP
 
 #include <algorithm>
+#include <bitcoin/system/data/data.hpp>
 #include <bitcoin/system/define.hpp>
 #include <bitcoin/system/math/math.hpp>
 
@@ -30,8 +31,7 @@ namespace system {
 BC_PUSH_WARNING(NO_POINTER_ARITHMETIC)
 
 template <typename Character>
-template <typename Buffer>
-iostream<Character>::iostream(Buffer& buffer) NOEXCEPT
+iostream<Character>::iostream(const data_slab& buffer) NOEXCEPT
   : position_(buffer.data()),
     begin_(position_),
     end_(begin_ + buffer.size()),