Merge remote-tracking branch 'zcash/master' into dPoW

2016-10-28 13:50:21 -03:00
parent 78dece340d 1feaefac51
commit 30853e4ab9
137 changed files with 5475 additions and 1453 deletions
--- a/src/test/pow_tests.cpp
+++ b/src/test/pow_tests.cpp
@@ -39,7 +39,7 @@ BOOST_AUTO_TEST_CASE(get_next_work_pow_limit)
    // TODO change once the harder genesis block is generated
    bnAvg.SetCompact(KOMODO_MINDIFF_NBITS);
    BOOST_CHECK_EQUAL(KOMODO_MINDIFF_NBITS,
-                      CalculateNextWorkRequired(bnAvg, nThisTime, nLastRetargetTime, params));
+    CalculateNextWorkRequired(bnAvg, nThisTime, nLastRetargetTime, params));
 }

 /* Test the constraint on the lower bound for actual time taken */