Merge pull request #3650 from steemit/fix/unittest_vesting_withdraw_r…

…oute unittest vesting withdraw route
steemit · Jun 10, 2020 · 5661b3f · 5661b3f
2 parents a58daad + 61b102d
commit 5661b3f
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 9 deletions.
diff --git a/libraries/chain/database.cpp b/libraries/chain/database.cpp
@@ -5162,14 +5162,14 @@ void database::init_hardforks()
    FC_ASSERT( STEEM_HARDFORK_0_22 == 22, "Invalid hardfork configuration" );
    _hardfork_versions.times[ STEEM_HARDFORK_0_22 ] = fc::time_point_sec( STEEM_HARDFORK_0_22_TIME );
    _hardfork_versions.versions[ STEEM_HARDFORK_0_22 ] = STEEM_HARDFORK_0_22_VERSION;
-#ifdef IS_TEST_NET
-    FC_ASSERT( STEEM_HARDFORK_0_23 == 23, "Invalid hardfork configuration" );
-   _hardfork_versions.times[ STEEM_HARDFORK_0_23 ] = fc::time_point_sec( STEEM_HARDFORK_0_23_TIME );
-   _hardfork_versions.versions[ STEEM_HARDFORK_0_23 ] = STEEM_HARDFORK_0_23_VERSION;
-#endif
    FC_ASSERT( STEEM_HARDFORK_0_23 == 23, "Invalid hardfork configuration" );
    _hardfork_versions.times[ STEEM_HARDFORK_0_23 ] = fc::time_point_sec( STEEM_HARDFORK_0_23_TIME );
    _hardfork_versions.versions[ STEEM_HARDFORK_0_23 ] = STEEM_HARDFORK_0_23_VERSION;
+#ifdef IS_TEST_NET
+    FC_ASSERT( STEEM_HARDFORK_0_24 == 24, "Invalid hardfork configuration" );
+    _hardfork_versions.times[ STEEM_HARDFORK_0_24 ] = fc::time_point_sec( STEEM_HARDFORK_0_24_TIME );
+    _hardfork_versions.versions[ STEEM_HARDFORK_0_24 ] = STEEM_HARDFORK_0_24_VERSION;
+#endif
 
    const auto& hardforks = get_hardfork_property_object();
    FC_ASSERT( hardforks.last_hardfork <= STEEM_NUM_HARDFORKS, "Chain knows of more hardforks than configuration", ("hardforks.last_hardfork",hardforks.last_hardfork)("STEEM_NUM_HARDFORKS",STEEM_NUM_HARDFORKS) );

diff --git a/libraries/protocol/hardfork.d/0-preamble.hf b/libraries/protocol/hardfork.d/0-preamble.hf
@@ -13,7 +13,7 @@
 #include <set>
 
 #ifdef IS_TEST_NET
-#define STEEM_NUM_HARDFORKS 23
+#define STEEM_NUM_HARDFORKS 24
 #else
 #define STEEM_NUM_HARDFORKS 23
 #endif
diff --git a/libraries/protocol/hardfork.d/0_23.hf b/libraries/protocol/hardfork.d/0_23.hf
@@ -1,7 +1,5 @@
 #ifndef STEEM_HARDFORK_0_23
 #define STEEM_HARDFORK_0_23 23
-// #define STEEM_SMT_HARDFORK STEEM_HARDFORK_0_23
-#define STEEM_SMT_HARDFORK 24
 
 #define STEEM_HARDFORK_0_23_TIME 1589983200 // Wed, 20 May 2020 14:00:00 UTC (10:00:00 EDT)
 

diff --git a/libraries/protocol/hardfork.d/0_24.hf b/libraries/protocol/hardfork.d/0_24.hf
@@ -0,0 +1,13 @@
+#ifndef STEEM_HARDFORK_0_24
+#define STEEM_HARDFORK_0_24 24
+#define STEEM_SMT_HARDFORK STEEM_HARDFORK_0_24
+
+#ifdef IS_TEST_NET
+#define STEEM_HARDFORK_0_24_TIME 1571065200 // Mon, 14 October 2019 11:00:00 EDT
+#else
+#define STEEM_HARDFORK_0_24_TIME 1597970800 // Future 2020...
+#endif
+
+#define STEEM_HARDFORK_0_24_VERSION hardfork_version( 0, 24 )
+
+#endif
diff --git a/libraries/protocol/include/steem/protocol/config.hpp b/libraries/protocol/include/steem/protocol/config.hpp
@@ -9,7 +9,7 @@
 // This is checked by get_config_check.sh called from Dockerfile
 
 #ifdef IS_TEST_NET
-#define STEEM_BLOCKCHAIN_VERSION              ( version(0, 23, 0) )
+#define STEEM_BLOCKCHAIN_VERSION              ( version(0, 24, 0) )
 
 #define STEEM_INIT_PRIVATE_KEY                (fc::ecc::private_key::regenerate(fc::sha256::hash(std::string("init_key"))))
 #define STEEM_INIT_PUBLIC_KEY_STR             (std::string( steem::protocol::public_key_type(STEEM_INIT_PRIVATE_KEY.get_public_key()) ))

diff --git a/tests/tests/operation_time_tests.cpp b/tests/tests/operation_time_tests.cpp
@@ -1296,6 +1296,7 @@ BOOST_AUTO_TEST_CASE( vesting_withdraw_route )
       vest( "alice", 1040000 );
 
       auto withdraw_amount = alice.vesting_shares - original_vesting;
+      withdraw_amount.amount /= 10;
 
       BOOST_TEST_MESSAGE( "Setup vesting withdraw" );
       withdraw_vesting_operation wv;