Merge 05ee914 into 81b6174

libbitcoin · Aug 17, 2018 · b176b75 · b176b75
2 parents 81b6174 + 05ee914
commit b176b75
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 0 deletions.
diff --git a/include/bitcoin/bitcoin/config/block.hpp b/include/bitcoin/bitcoin/config/block.hpp
@@ -58,6 +58,12 @@ class BC_API block
      */
     block(const block& other);
 
+    /**
+     * Copy assignment operator.
+     * @param[in]  other  The object to copy into self on assignment.
+     */
+    block& operator=(const block& other);
+
     /**
      * Move assignment operator.
      * @param[in]  other  The object to move into self on assignment.

diff --git a/src/config/block.cpp b/src/config/block.cpp
@@ -49,6 +49,13 @@ block::block(const block& other)
 {
 }
 
+block& block::operator=(const block& other)
+{
+    chain::block value = block(other);
+    value_ = std::move(value);
+    return *this;
+}
+
 block& block::operator=(chain::block&& other)
 {
     value_ = std::move(other);

diff --git a/test/config/block.cpp b/test/config/block.cpp
@@ -65,6 +65,12 @@ BOOST_AUTO_TEST_CASE(block__construct__copy__expected)
     BOOST_REQUIRE_EQUAL(block, genesis_block);
 }
 
+BOOST_AUTO_TEST_CASE(block__copy_assign__always__expected)
+{
+    const auto block = genesis_block;
+    BOOST_REQUIRE_EQUAL(block, genesis_block);
+}
+
 BOOST_AUTO_TEST_CASE(block__construct__string__expected)
 {
     const block block(encoded_genesis_block);