提交 a18e3998 编写于 作者: A Anton Perkov

fix delay_tests for 128-bit deferred transaction ids, removed unnecessary...

fix delay_tests for 128-bit deferred transaction ids, removed unnecessary calls to push_deferred_transactions #1853
上级 4819563e
......@@ -128,8 +128,6 @@ BOOST_AUTO_TEST_CASE( link_delay_direct_test ) { try {
liquid_balance = get_currency_balance(chain, N(tester2));
BOOST_REQUIRE_EQUAL(asset::from_string("1.0000 CUR"), liquid_balance);
chain.control->push_deferred_transactions(true);
chain.produce_blocks();
liquid_balance = get_currency_balance(chain, N(tester));
......@@ -137,8 +135,6 @@ BOOST_AUTO_TEST_CASE( link_delay_direct_test ) { try {
liquid_balance = get_currency_balance(chain, N(tester2));
BOOST_REQUIRE_EQUAL(asset::from_string("1.0000 CUR"), liquid_balance);
chain.control->push_deferred_transactions(true);
chain.produce_blocks(18);
liquid_balance = get_currency_balance(chain, N(tester));
......@@ -146,8 +142,6 @@ BOOST_AUTO_TEST_CASE( link_delay_direct_test ) { try {
liquid_balance = get_currency_balance(chain, N(tester2));
BOOST_REQUIRE_EQUAL(asset::from_string("1.0000 CUR"), liquid_balance);
chain.control->push_deferred_transactions(true);
chain.produce_blocks();
liquid_balance = get_currency_balance(chain, N(tester));
......@@ -155,8 +149,6 @@ BOOST_AUTO_TEST_CASE( link_delay_direct_test ) { try {
liquid_balance = get_currency_balance(chain, N(tester2));
BOOST_REQUIRE_EQUAL(asset::from_string("1.0000 CUR"), liquid_balance);
chain.control->push_deferred_transactions(true);
chain.produce_blocks();
liquid_balance = get_currency_balance(chain, N(tester));
......@@ -276,8 +268,6 @@ BOOST_AUTO_TEST_CASE( link_delay_direct_parent_permission_test ) { try {
liquid_balance = get_currency_balance(chain, N(tester2));
BOOST_REQUIRE_EQUAL(asset::from_string("1.0000 CUR"), liquid_balance);
chain.control->push_deferred_transactions(true);
chain.produce_blocks();
liquid_balance = get_currency_balance(chain, N(tester));
......@@ -285,8 +275,6 @@ BOOST_AUTO_TEST_CASE( link_delay_direct_parent_permission_test ) { try {
liquid_balance = get_currency_balance(chain, N(tester2));
BOOST_REQUIRE_EQUAL(asset::from_string("1.0000 CUR"), liquid_balance);
chain.control->push_deferred_transactions(true);
chain.produce_blocks(28);
liquid_balance = get_currency_balance(chain, N(tester));
......@@ -294,8 +282,6 @@ BOOST_AUTO_TEST_CASE( link_delay_direct_parent_permission_test ) { try {
liquid_balance = get_currency_balance(chain, N(tester2));
BOOST_REQUIRE_EQUAL(asset::from_string("1.0000 CUR"), liquid_balance);
chain.control->push_deferred_transactions(true);
chain.produce_blocks();
liquid_balance = get_currency_balance(chain, N(tester));
......@@ -303,8 +289,6 @@ BOOST_AUTO_TEST_CASE( link_delay_direct_parent_permission_test ) { try {
liquid_balance = get_currency_balance(chain, N(tester2));
BOOST_REQUIRE_EQUAL(asset::from_string("1.0000 CUR"), liquid_balance);
chain.control->push_deferred_transactions(true);
chain.produce_blocks();
liquid_balance = get_currency_balance(chain, N(tester));
......@@ -430,8 +414,6 @@ BOOST_AUTO_TEST_CASE( link_delay_direct_walk_parent_permissions_test ) { try {
liquid_balance = get_currency_balance(chain, N(tester2));
BOOST_REQUIRE_EQUAL(asset::from_string("1.0000 CUR"), liquid_balance);
chain.control->push_deferred_transactions(true);
chain.produce_blocks();
liquid_balance = get_currency_balance(chain, N(tester));
......@@ -439,8 +421,6 @@ BOOST_AUTO_TEST_CASE( link_delay_direct_walk_parent_permissions_test ) { try {
liquid_balance = get_currency_balance(chain, N(tester2));
BOOST_REQUIRE_EQUAL(asset::from_string("1.0000 CUR"), liquid_balance);
chain.control->push_deferred_transactions(true);
chain.produce_blocks(38);
liquid_balance = get_currency_balance(chain, N(tester));
......@@ -448,8 +428,6 @@ BOOST_AUTO_TEST_CASE( link_delay_direct_walk_parent_permissions_test ) { try {
liquid_balance = get_currency_balance(chain, N(tester2));
BOOST_REQUIRE_EQUAL(asset::from_string("1.0000 CUR"), liquid_balance);
chain.control->push_deferred_transactions(true);
chain.produce_blocks();
liquid_balance = get_currency_balance(chain, N(tester));
......@@ -457,8 +435,6 @@ BOOST_AUTO_TEST_CASE( link_delay_direct_walk_parent_permissions_test ) { try {
liquid_balance = get_currency_balance(chain, N(tester2));
BOOST_REQUIRE_EQUAL(asset::from_string("1.0000 CUR"), liquid_balance);
chain.control->push_deferred_transactions(true);
chain.produce_blocks();
liquid_balance = get_currency_balance(chain, N(tester));
......@@ -573,8 +549,6 @@ BOOST_AUTO_TEST_CASE( link_delay_permission_change_test ) { try {
liquid_balance = get_currency_balance(chain, N(tester2));
BOOST_REQUIRE_EQUAL(asset::from_string("0.0000 CUR"), liquid_balance);
chain.control->push_deferred_transactions(true);
chain.produce_blocks(16);
liquid_balance = get_currency_balance(chain, N(tester));
......@@ -601,8 +575,6 @@ BOOST_AUTO_TEST_CASE( link_delay_permission_change_test ) { try {
liquid_balance = get_currency_balance(chain, N(tester2));
BOOST_REQUIRE_EQUAL(asset::from_string("0.0000 CUR"), liquid_balance);
chain.control->push_deferred_transactions(true);
chain.produce_blocks();
liquid_balance = get_currency_balance(chain, N(tester));
......@@ -611,8 +583,6 @@ BOOST_AUTO_TEST_CASE( link_delay_permission_change_test ) { try {
BOOST_REQUIRE_EQUAL(asset::from_string("0.0000 CUR"), liquid_balance);
// first transfer will finally be performed
chain.control->push_deferred_transactions(true);
chain.produce_blocks();
liquid_balance = get_currency_balance(chain, N(tester));
......@@ -630,8 +600,6 @@ BOOST_AUTO_TEST_CASE( link_delay_permission_change_test ) { try {
BOOST_REQUIRE_EQUAL(transaction_receipt::executed, trace.status);
BOOST_REQUIRE_EQUAL(0, trace.deferred_transaction_requests.size());
chain.control->push_deferred_transactions(true);
chain.produce_blocks();
liquid_balance = get_currency_balance(chain, N(tester));
......@@ -639,8 +607,6 @@ BOOST_AUTO_TEST_CASE( link_delay_permission_change_test ) { try {
liquid_balance = get_currency_balance(chain, N(tester2));
BOOST_REQUIRE_EQUAL(asset::from_string("11.0000 CUR"), liquid_balance);
chain.control->push_deferred_transactions(true);
chain.produce_blocks(15);
liquid_balance = get_currency_balance(chain, N(tester));
......@@ -648,8 +614,6 @@ BOOST_AUTO_TEST_CASE( link_delay_permission_change_test ) { try {
liquid_balance = get_currency_balance(chain, N(tester2));
BOOST_REQUIRE_EQUAL(asset::from_string("11.0000 CUR"), liquid_balance);
chain.control->push_deferred_transactions(true);
chain.produce_blocks();
liquid_balance = get_currency_balance(chain, N(tester));
......@@ -658,8 +622,6 @@ BOOST_AUTO_TEST_CASE( link_delay_permission_change_test ) { try {
BOOST_REQUIRE_EQUAL(asset::from_string("11.0000 CUR"), liquid_balance);
// second transfer finally is performed
chain.control->push_deferred_transactions(true);
chain.produce_blocks();
liquid_balance = get_currency_balance(chain, N(tester));
......@@ -780,8 +742,6 @@ BOOST_AUTO_TEST_CASE( link_delay_permission_change_with_delay_heirarchy_test ) {
liquid_balance = get_currency_balance(chain, N(tester2));
BOOST_REQUIRE_EQUAL(asset::from_string("0.0000 CUR"), liquid_balance);
chain.control->push_deferred_transactions(true);
chain.produce_blocks(16);
liquid_balance = get_currency_balance(chain, N(tester));
......@@ -808,8 +768,6 @@ BOOST_AUTO_TEST_CASE( link_delay_permission_change_with_delay_heirarchy_test ) {
liquid_balance = get_currency_balance(chain, N(tester2));
BOOST_REQUIRE_EQUAL(asset::from_string("0.0000 CUR"), liquid_balance);
chain.control->push_deferred_transactions(true);
chain.produce_blocks();
liquid_balance = get_currency_balance(chain, N(tester));
......@@ -818,8 +776,6 @@ BOOST_AUTO_TEST_CASE( link_delay_permission_change_with_delay_heirarchy_test ) {
BOOST_REQUIRE_EQUAL(asset::from_string("0.0000 CUR"), liquid_balance);
// first transfer will finally be performed
chain.control->push_deferred_transactions(true);
chain.produce_blocks();
liquid_balance = get_currency_balance(chain, N(tester));
......@@ -837,8 +793,6 @@ BOOST_AUTO_TEST_CASE( link_delay_permission_change_with_delay_heirarchy_test ) {
BOOST_REQUIRE_EQUAL(transaction_receipt::executed, trace.status);
BOOST_REQUIRE_EQUAL(0, trace.deferred_transaction_requests.size());
chain.control->push_deferred_transactions(true);
chain.produce_blocks();
liquid_balance = get_currency_balance(chain, N(tester));
......@@ -846,8 +800,6 @@ BOOST_AUTO_TEST_CASE( link_delay_permission_change_with_delay_heirarchy_test ) {
liquid_balance = get_currency_balance(chain, N(tester2));
BOOST_REQUIRE_EQUAL(asset::from_string("11.0000 CUR"), liquid_balance);
chain.control->push_deferred_transactions(true);
chain.produce_blocks(15);
liquid_balance = get_currency_balance(chain, N(tester));
......@@ -855,8 +807,6 @@ BOOST_AUTO_TEST_CASE( link_delay_permission_change_with_delay_heirarchy_test ) {
liquid_balance = get_currency_balance(chain, N(tester2));
BOOST_REQUIRE_EQUAL(asset::from_string("11.0000 CUR"), liquid_balance);
chain.control->push_deferred_transactions(true);
chain.produce_blocks();
liquid_balance = get_currency_balance(chain, N(tester));
......@@ -865,8 +815,6 @@ BOOST_AUTO_TEST_CASE( link_delay_permission_change_with_delay_heirarchy_test ) {
BOOST_REQUIRE_EQUAL(asset::from_string("11.0000 CUR"), liquid_balance);
// second transfer finally is performed
chain.control->push_deferred_transactions(true);
chain.produce_blocks();
liquid_balance = get_currency_balance(chain, N(tester));
......@@ -986,8 +934,6 @@ BOOST_AUTO_TEST_CASE( link_delay_link_change_test ) { try {
liquid_balance = get_currency_balance(chain, N(tester2));
BOOST_REQUIRE_EQUAL(asset::from_string("0.0000 CUR"), liquid_balance);
chain.control->push_deferred_transactions(true);
chain.produce_blocks(16);
liquid_balance = get_currency_balance(chain, N(tester));
......@@ -1014,8 +960,6 @@ BOOST_AUTO_TEST_CASE( link_delay_link_change_test ) { try {
liquid_balance = get_currency_balance(chain, N(tester2));
BOOST_REQUIRE_EQUAL(asset::from_string("0.0000 CUR"), liquid_balance);
chain.control->push_deferred_transactions(true);
chain.produce_blocks();
liquid_balance = get_currency_balance(chain, N(tester));
......@@ -1024,8 +968,6 @@ BOOST_AUTO_TEST_CASE( link_delay_link_change_test ) { try {
BOOST_REQUIRE_EQUAL(asset::from_string("0.0000 CUR"), liquid_balance);
// first transfer will finally be performed
chain.control->push_deferred_transactions(true);
chain.produce_blocks();
liquid_balance = get_currency_balance(chain, N(tester));
......@@ -1043,8 +985,6 @@ BOOST_AUTO_TEST_CASE( link_delay_link_change_test ) { try {
BOOST_REQUIRE_EQUAL(transaction_receipt::executed, trace.status);
BOOST_REQUIRE_EQUAL(0, trace.deferred_transaction_requests.size());
chain.control->push_deferred_transactions(true);
chain.produce_blocks();
liquid_balance = get_currency_balance(chain, N(tester));
......@@ -1052,8 +992,6 @@ BOOST_AUTO_TEST_CASE( link_delay_link_change_test ) { try {
liquid_balance = get_currency_balance(chain, N(tester2));
BOOST_REQUIRE_EQUAL(asset::from_string("11.0000 CUR"), liquid_balance);
chain.control->push_deferred_transactions(true);
chain.produce_blocks(15);
liquid_balance = get_currency_balance(chain, N(tester));
......@@ -1061,8 +999,6 @@ BOOST_AUTO_TEST_CASE( link_delay_link_change_test ) { try {
liquid_balance = get_currency_balance(chain, N(tester2));
BOOST_REQUIRE_EQUAL(asset::from_string("11.0000 CUR"), liquid_balance);
chain.control->push_deferred_transactions(true);
chain.produce_blocks();
liquid_balance = get_currency_balance(chain, N(tester));
......@@ -1071,8 +1007,6 @@ BOOST_AUTO_TEST_CASE( link_delay_link_change_test ) { try {
BOOST_REQUIRE_EQUAL(asset::from_string("11.0000 CUR"), liquid_balance);
// second transfer finally is performed
chain.control->push_deferred_transactions(true);
chain.produce_blocks();
liquid_balance = get_currency_balance(chain, N(tester));
......@@ -1198,8 +1132,6 @@ BOOST_AUTO_TEST_CASE( link_delay_link_change_heirarchy_test ) { try {
liquid_balance = get_currency_balance(chain, N(tester2));
BOOST_REQUIRE_EQUAL(asset::from_string("0.0000 CUR"), liquid_balance);
chain.control->push_deferred_transactions(true);
chain.produce_blocks(16);
liquid_balance = get_currency_balance(chain, N(tester));
......@@ -1226,8 +1158,6 @@ BOOST_AUTO_TEST_CASE( link_delay_link_change_heirarchy_test ) { try {
liquid_balance = get_currency_balance(chain, N(tester2));
BOOST_REQUIRE_EQUAL(asset::from_string("0.0000 CUR"), liquid_balance);
chain.control->push_deferred_transactions(true);
chain.produce_blocks();
liquid_balance = get_currency_balance(chain, N(tester));
......@@ -1236,8 +1166,6 @@ BOOST_AUTO_TEST_CASE( link_delay_link_change_heirarchy_test ) { try {
BOOST_REQUIRE_EQUAL(asset::from_string("0.0000 CUR"), liquid_balance);
// first transfer will finally be performed
chain.control->push_deferred_transactions(true);
chain.produce_blocks();
liquid_balance = get_currency_balance(chain, N(tester));
......@@ -1255,8 +1183,6 @@ BOOST_AUTO_TEST_CASE( link_delay_link_change_heirarchy_test ) { try {
BOOST_REQUIRE_EQUAL(transaction_receipt::executed, trace.status);
BOOST_REQUIRE_EQUAL(0, trace.deferred_transaction_requests.size());
chain.control->push_deferred_transactions(true);
chain.produce_blocks();
liquid_balance = get_currency_balance(chain, N(tester));
......@@ -1264,8 +1190,6 @@ BOOST_AUTO_TEST_CASE( link_delay_link_change_heirarchy_test ) { try {
liquid_balance = get_currency_balance(chain, N(tester2));
BOOST_REQUIRE_EQUAL(asset::from_string("11.0000 CUR"), liquid_balance);
chain.control->push_deferred_transactions(true);
chain.produce_blocks(15);
liquid_balance = get_currency_balance(chain, N(tester));
......@@ -1273,8 +1197,6 @@ BOOST_AUTO_TEST_CASE( link_delay_link_change_heirarchy_test ) { try {
liquid_balance = get_currency_balance(chain, N(tester2));
BOOST_REQUIRE_EQUAL(asset::from_string("11.0000 CUR"), liquid_balance);
chain.control->push_deferred_transactions(true);
chain.produce_blocks();
liquid_balance = get_currency_balance(chain, N(tester));
......@@ -1283,8 +1205,6 @@ BOOST_AUTO_TEST_CASE( link_delay_link_change_heirarchy_test ) { try {
BOOST_REQUIRE_EQUAL(asset::from_string("11.0000 CUR"), liquid_balance);
// second transfer finally is performed
chain.control->push_deferred_transactions(true);
chain.produce_blocks();
liquid_balance = get_currency_balance(chain, N(tester));
......@@ -1400,8 +1320,6 @@ BOOST_AUTO_TEST_CASE( mindelay_test ) { try {
liquid_balance = get_currency_balance(chain, N(tester2));
BOOST_REQUIRE_EQUAL(asset::from_string("1.0000 CUR"), liquid_balance);
chain.control->push_deferred_transactions(true);
chain.produce_blocks();
liquid_balance = get_currency_balance(chain, N(tester));
......@@ -1409,8 +1327,6 @@ BOOST_AUTO_TEST_CASE( mindelay_test ) { try {
liquid_balance = get_currency_balance(chain, N(tester2));
BOOST_REQUIRE_EQUAL(asset::from_string("1.0000 CUR"), liquid_balance);
chain.control->push_deferred_transactions(true);
chain.produce_blocks(18);
liquid_balance = get_currency_balance(chain, N(tester));
......@@ -1418,8 +1334,6 @@ BOOST_AUTO_TEST_CASE( mindelay_test ) { try {
liquid_balance = get_currency_balance(chain, N(tester2));
BOOST_REQUIRE_EQUAL(asset::from_string("1.0000 CUR"), liquid_balance);
chain.control->push_deferred_transactions(true);
chain.produce_blocks();
liquid_balance = get_currency_balance(chain, N(tester));
......@@ -1427,8 +1341,6 @@ BOOST_AUTO_TEST_CASE( mindelay_test ) { try {
liquid_balance = get_currency_balance(chain, N(tester2));
BOOST_REQUIRE_EQUAL(asset::from_string("1.0000 CUR"), liquid_balance);
chain.control->push_deferred_transactions(true);
chain.produce_blocks();
liquid_balance = get_currency_balance(chain, N(tester));
......@@ -1543,8 +1455,6 @@ BOOST_AUTO_TEST_CASE( canceldelay_test ) { try {
liquid_balance = get_currency_balance(chain, N(tester2));
BOOST_REQUIRE_EQUAL(asset::from_string("0.0000 CUR"), liquid_balance);
chain.control->push_deferred_transactions(true);
chain.produce_blocks(16);
liquid_balance = get_currency_balance(chain, N(tester));
......@@ -1582,9 +1492,7 @@ BOOST_AUTO_TEST_CASE( canceldelay_test ) { try {
BOOST_REQUIRE_EQUAL(transaction_receipt::executed, trace.status);
BOOST_REQUIRE_EQUAL(1, trace.deferred_transaction_requests.size());
const auto sender_id_canceled = trace.deferred_transaction_requests[0].get<deferred_reference>().sender_id;
BOOST_REQUIRE_EQUAL(sender_id_to_cancel, sender_id_canceled);
chain.control->push_deferred_transactions(true);
BOOST_REQUIRE_EQUAL(std::string(uint128(sender_id_to_cancel)), std::string(uint128(sender_id_canceled)));
chain.produce_blocks();
......@@ -1594,8 +1502,6 @@ BOOST_AUTO_TEST_CASE( canceldelay_test ) { try {
BOOST_REQUIRE_EQUAL(asset::from_string("0.0000 CUR"), liquid_balance);
// first transfer will finally be performed
chain.control->push_deferred_transactions(true);
chain.produce_blocks();
liquid_balance = get_currency_balance(chain, N(tester));
......@@ -1613,8 +1519,6 @@ BOOST_AUTO_TEST_CASE( canceldelay_test ) { try {
BOOST_REQUIRE_EQUAL(transaction_receipt::executed, trace.status);
BOOST_REQUIRE_EQUAL(0, trace.deferred_transaction_requests.size());
chain.control->push_deferred_transactions(true);
chain.produce_blocks();
liquid_balance = get_currency_balance(chain, N(tester));
......@@ -1622,8 +1526,6 @@ BOOST_AUTO_TEST_CASE( canceldelay_test ) { try {
liquid_balance = get_currency_balance(chain, N(tester2));
BOOST_REQUIRE_EQUAL(asset::from_string("10.0000 CUR"), liquid_balance);
chain.control->push_deferred_transactions(true);
chain.produce_blocks(15);
liquid_balance = get_currency_balance(chain, N(tester));
......@@ -1631,8 +1533,6 @@ BOOST_AUTO_TEST_CASE( canceldelay_test ) { try {
liquid_balance = get_currency_balance(chain, N(tester2));
BOOST_REQUIRE_EQUAL(asset::from_string("10.0000 CUR"), liquid_balance);
chain.control->push_deferred_transactions(true);
chain.produce_blocks();
liquid_balance = get_currency_balance(chain, N(tester));
......@@ -1641,8 +1541,6 @@ BOOST_AUTO_TEST_CASE( canceldelay_test ) { try {
BOOST_REQUIRE_EQUAL(asset::from_string("10.0000 CUR"), liquid_balance);
// second transfer finally is performed
chain.control->push_deferred_transactions(true);
chain.produce_blocks();
liquid_balance = get_currency_balance(chain, N(tester));
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册