diff --git a/tests/common/database_fixture.cpp b/tests/common/database_fixture.cpp index de7dd3ee..5207514f 100644 --- a/tests/common/database_fixture.cpp +++ b/tests/common/database_fixture.cpp @@ -492,13 +492,14 @@ const asset_object& database_fixture::create_user_issued_asset( const string& na void database_fixture::issue_uia( const account_object& recipient, asset amount ) { + BOOST_TEST_MESSAGE( "Issuing UIA" ); asset_issue_operation op; op.issuer = amount.asset_id(db).issuer; op.asset_to_issue = amount; op.issue_to_account = recipient.id; - trx.validate(); trx.operations.push_back(op); - return; + db.push_transaction( trx, ~0 ); + trx.operations.clear(); } const account_object& database_fixture::create_account( diff --git a/tests/tests/authority_tests.cpp b/tests/tests/authority_tests.cpp index b694b98f..12ce3cda 100644 --- a/tests/tests/authority_tests.cpp +++ b/tests/tests/authority_tests.cpp @@ -902,7 +902,6 @@ BOOST_FIXTURE_TEST_CASE( max_authority_membership, database_fixture ) int keys_to_create = 2*GRAPHENE_DEFAULT_MAX_AUTHORITY_MEMBERSHIP; vector private_keys; - tx = transaction(); private_keys.reserve( keys_to_create ); for( int i=0; i key_ids; diff --git a/tests/tests/serialization_tests.cpp b/tests/tests/serialization_tests.cpp index 8094639a..a1714e66 100644 --- a/tests/tests/serialization_tests.cpp +++ b/tests/tests/serialization_tests.cpp @@ -34,6 +34,11 @@ BOOST_AUTO_TEST_CASE( serialization_raw_test ) { try { make_account(); + transfer_operation op; + op.from = account_id_type(1); + op.to = account_id_type(2); + op.amount = asset(100); + trx.operations.push_back( op ); auto packed = fc::raw::pack( trx ); signed_transaction unpacked = fc::raw::unpack(packed); unpacked.validate(); @@ -47,6 +52,11 @@ BOOST_AUTO_TEST_CASE( serialization_json_test ) { try { make_account(); + transfer_operation op; + op.from = account_id_type(1); + op.to = account_id_type(2); + op.amount = asset(100); + trx.operations.push_back( op ); fc::variant packed(trx); signed_transaction unpacked = packed.as(); unpacked.validate(); diff --git a/tests/tests/uia_tests.cpp b/tests/tests/uia_tests.cpp index b0f7ad82..c3f0280a 100644 --- a/tests/tests/uia_tests.cpp +++ b/tests/tests/uia_tests.cpp @@ -73,13 +73,11 @@ BOOST_AUTO_TEST_CASE( override_transfer_test ) { try { ACTORS( (dan)(eric)(sam) ); const asset_object& advanced = create_user_issued_asset( "ADVANCED", sam, override_authority ); + BOOST_TEST_MESSAGE( "Issuing 1000 ADVANCED to dan" ); issue_uia( dan, advanced.amount( 1000 ) ); - trx.validate(); - db.push_transaction(trx, ~0); - trx.operations.clear(); + BOOST_TEST_MESSAGE( "Checking dan's balance" ); BOOST_REQUIRE_EQUAL( get_balance( dan, advanced ), 1000 ); - trx.operations.clear(); override_transfer_operation otrans; otrans.issuer = advanced.issuer; otrans.from = dan.id; @@ -106,9 +104,6 @@ BOOST_AUTO_TEST_CASE( override_transfer_test2 ) ACTORS( (dan)(eric)(sam) ); const asset_object& advanced = create_user_issued_asset( "ADVANCED", sam, 0 ); issue_uia( dan, advanced.amount( 1000 ) ); - trx.validate(); - db.push_transaction(trx, ~0); - trx.operations.clear(); BOOST_REQUIRE_EQUAL( get_balance( dan, advanced ), 1000 ); trx.operations.clear();