Skip to content

Commit ac310b1

Browse files
abitmorepmconrad
authored andcommitted
Fixed test cases after rebase
1 parent f2c608e commit ac310b1

File tree

2 files changed

+17
-20
lines changed

2 files changed

+17
-20
lines changed

tests/tests/authority_tests.cpp

+14-14
Original file line numberDiff line numberDiff line change
@@ -1738,59 +1738,59 @@ BOOST_FIXTURE_TEST_CASE( parent_owner_test, database_fixture )
17381738
// signing tests
17391739
sign( tx, alice_owner_key );
17401740
PUSH_TX( db, tx, database::skip_transaction_dupe_check );
1741-
tx.signatures.clear();
1741+
tx.clear_signatures();
17421742

17431743
sign( tx, alice_active_key );
17441744
PUSH_TX( db, tx, database::skip_transaction_dupe_check );
1745-
tx.signatures.clear();
1745+
tx.clear_signatures();
17461746

17471747
sign( tx, bob_owner_key );
17481748
PUSH_TX( db, tx, database::skip_transaction_dupe_check );
1749-
tx.signatures.clear();
1749+
tx.clear_signatures();
17501750

17511751
sign( tx, bob_active_key );
17521752
PUSH_TX( db, tx, database::skip_transaction_dupe_check );
1753-
tx.signatures.clear();
1753+
tx.clear_signatures();
17541754

17551755
sign( tx, cindy_owner_key );
17561756
PUSH_TX( db, tx, database::skip_transaction_dupe_check );
1757-
tx.signatures.clear();
1757+
tx.clear_signatures();
17581758

17591759
sign( tx, cindy_active_key );
17601760
PUSH_TX( db, tx, database::skip_transaction_dupe_check );
1761-
tx.signatures.clear();
1761+
tx.clear_signatures();
17621762

17631763
sign( tx, daisy_owner_key );
17641764
PUSH_TX( db, tx, database::skip_transaction_dupe_check );
1765-
tx.signatures.clear();
1765+
tx.clear_signatures();
17661766

17671767
sign( tx, daisy_active_key );
17681768
PUSH_TX( db, tx, database::skip_transaction_dupe_check );
1769-
tx.signatures.clear();
1769+
tx.clear_signatures();
17701770

17711771
sign( tx, edwin_owner_key );
17721772
PUSH_TX( db, tx, database::skip_transaction_dupe_check );
1773-
tx.signatures.clear();
1773+
tx.clear_signatures();
17741774

17751775
sign( tx, edwin_active_key );
17761776
PUSH_TX( db, tx, database::skip_transaction_dupe_check );
1777-
tx.signatures.clear();
1777+
tx.clear_signatures();
17781778

17791779
sign( tx, frank_owner_key );
17801780
PUSH_TX( db, tx, database::skip_transaction_dupe_check );
1781-
tx.signatures.clear();
1781+
tx.clear_signatures();
17821782

17831783
sign( tx, frank_active_key );
17841784
PUSH_TX( db, tx, database::skip_transaction_dupe_check );
1785-
tx.signatures.clear();
1785+
tx.clear_signatures();
17861786

17871787
sign( tx, gavin_owner_key );
17881788
PUSH_TX( db, tx, database::skip_transaction_dupe_check );
1789-
tx.signatures.clear();
1789+
tx.clear_signatures();
17901790

17911791
sign( tx, gavin_active_key );
17921792
PUSH_TX( db, tx, database::skip_transaction_dupe_check );
1793-
tx.signatures.clear();
1793+
tx.clear_signatures();
17941794

17951795
// proposal tests
17961796
pid = new_proposal();

tests/tests/database_api_tests.cpp

+3-6
Original file line numberDiff line numberDiff line change
@@ -153,26 +153,23 @@ BOOST_AUTO_TEST_CASE( get_signatures_non_immediate_owner )
153153
trx.operations.push_back(op);
154154
sign(trx, nathan_key1);
155155
PUSH_TX( db, trx, database::skip_transaction_dupe_check );
156-
trx.operations.clear();
157-
trx.signatures.clear();
156+
trx.clear();
158157

159158
op.account = ashley_id;
160159
op.active = authority(1, a_pub_key_active, 1);
161160
op.owner = authority(1, a_pub_key_owner, 1);
162161
trx.operations.push_back(op);
163162
sign(trx, ashley_key1);
164163
PUSH_TX( db, trx, database::skip_transaction_dupe_check );
165-
trx.operations.clear();
166-
trx.signatures.clear();
164+
trx.clear();
167165

168166
op.account = oliver_id;
169167
op.active = authority(1, o_pub_key_active, 1);
170168
op.owner = authority(1, o_pub_key_owner, 1);
171169
trx.operations.push_back(op);
172170
sign(trx, oliver_key1);
173171
PUSH_TX( db, trx, database::skip_transaction_dupe_check );
174-
trx.operations.clear();
175-
trx.signatures.clear();
172+
trx.clear();
176173
} FC_CAPTURE_AND_RETHROW ((nathan.active))
177174

178175
// this transaction requires active

0 commit comments

Comments
 (0)