Cached work was being calculated for incorrect block.

nanocurrency · Jan 18, 2015 · f9c2a8a · f9c2a8a
1 parent cbc9748
commit f9c2a8a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 8 deletions.
diff --git a/rai/core_test/ledger.cpp b/rai/core_test/ledger.cpp
@@ -1896,5 +1896,5 @@ TEST (ledger, latest_root)
     send.hashables.balance = 1;
     rai::sign_message (rai::test_genesis_key.prv, rai::test_genesis_key.pub, send.hash (), send.signature);
     ASSERT_EQ (rai::process_result::progress, ledger.process (send));
-    ASSERT_EQ (hash1, ledger.latest_root (rai::test_genesis_key.pub));
+    ASSERT_EQ (send.hash (), ledger.latest_root (rai::test_genesis_key.pub));
 }
diff --git a/rai/node.cpp b/rai/node.cpp
@@ -3974,10 +3974,7 @@ void rai::network::send_complete (boost::system::error_code const & ec, size_t s
             auto & front (sends.front ());
             if (network_packet_logging ())
             {
-                if (network_packet_logging ())
-                {
-                    BOOST_LOG (node.log) << "Sending packet";
-                }
+				BOOST_LOG (node.log) << "Sending packet";
             }
             socket.async_send_to (boost::asio::buffer (std::get <0> (front), std::get <1> (front)), std::get <2> (front), [this] (boost::system::error_code const & ec, size_t size_a)
             {

diff --git a/rai/secure.cpp b/rai/secure.cpp
@@ -440,6 +440,7 @@ uint64_t rai::send_block::block_work () const
 
 void rai::send_block::block_work_set (uint64_t work_a)
 {
+	assert (!rai::work_validate (root (), work_a));
     work = work_a;
 }
 
@@ -2831,9 +2832,7 @@ rai::block_hash rai::ledger::latest_root (rai::account const & account_a)
     }
     else
     {
-        auto block (store.block_get (frontier.hash));
-        assert (block != nullptr);
-        result = block->root ();
+        result = frontier.hash;
     }
     return result;
 }