@@ -70,9 +70,9 @@ BOOST_AUTO_TEST_CASE(naive_blinding_test)
7070 tx3.vin [1 ].prevout .hash = ArithToUint256 (2 );
7171 tx3.vin [1 ].prevout .n = 0 ;
7272 tx3.vout .resize (0 );
73- tx3.vout .push_back ( CTxOut ( bitcoinID, 100 , CScript () << OP_TRUE) );
73+ tx3.vout .emplace_back ( bitcoinID, 100 , CScript () << OP_TRUE);
7474 // Fee outputs are blank scriptpubkeys, and unblinded value/asset
75- tx3.vout .push_back ( CTxOut ( bitcoinID, 22 , CScript () ));
75+ tx3.vout .emplace_back ( bitcoinID, 22 , CScript ());
7676 BOOST_CHECK (VerifyAmounts (inputs, CTransaction (tx3), nullptr , false ));
7777
7878 // Malleate the output and check for correct handling of bad commitments
@@ -108,20 +108,20 @@ BOOST_AUTO_TEST_CASE(naive_blinding_test)
108108 std::vector<uint256> output_blinds;
109109 std::vector<uint256> output_asset_blinds;
110110 std::vector<CPubKey> output_pubkeys;
111- input_blinds.push_back (uint256 ());
112- input_blinds.push_back (uint256 ());
113- input_asset_blinds.push_back (uint256 ());
114- input_asset_blinds.push_back (uint256 ());
111+ input_blinds.emplace_back (uint256 ());
112+ input_blinds.emplace_back (uint256 ());
113+ input_asset_blinds.emplace_back (uint256 ());
114+ input_asset_blinds.emplace_back (uint256 ());
115115 input_assets.push_back (bitcoinID);
116116 input_assets.push_back (bitcoinID);
117117 input_amounts.push_back (11 );
118118 input_amounts.push_back (111 );
119119 output_pubkeys.push_back (pubkey1);
120- output_pubkeys.push_back (CPubKey ());
120+ output_pubkeys.emplace_back (CPubKey ());
121121 BOOST_CHECK (BlindTransaction (input_blinds, input_asset_blinds, input_assets, input_amounts, output_blinds, output_asset_blinds, output_pubkeys, vDummy, vDummy, tx3) == 0 );
122122
123123 // Add a dummy output. Must be unspendable since it's 0-valued.
124- tx3.vout .push_back ( CTxOut ( bitcoinID, 0 , CScript () << OP_RETURN) );
124+ tx3.vout .emplace_back ( bitcoinID, 0 , CScript () << OP_RETURN);
125125 output_pubkeys.push_back (pubkeyDummy);
126126 BOOST_CHECK (BlindTransaction (input_blinds, input_asset_blinds, input_assets, input_amounts, output_blinds, output_asset_blinds, output_pubkeys, vDummy, vDummy, tx3) == 2 );
127127 BOOST_CHECK (!tx3.vout [0 ].nValue .IsExplicit ());
@@ -160,9 +160,9 @@ BOOST_AUTO_TEST_CASE(naive_blinding_test)
160160 tx4.vin [0 ].prevout .n = 0 ;
161161 tx4.vin [1 ].prevout .hash = ArithToUint256 (3 );
162162 tx4.vin [1 ].prevout .n = 0 ;
163- tx4.vout .push_back ( CTxOut ( bitcoinID, 30 , CScript () << OP_TRUE) );
164- tx4.vout .push_back ( CTxOut ( bitcoinID, 40 , CScript () << OP_TRUE) );
165- tx4.vout .push_back ( CTxOut ( bitcoinID, 111 + 100 - 30 - 40 , CScript () ));
163+ tx4.vout .emplace_back ( bitcoinID, 30 , CScript () << OP_TRUE);
164+ tx4.vout .emplace_back ( bitcoinID, 40 , CScript () << OP_TRUE);
165+ tx4.vout .emplace_back ( bitcoinID, 111 + 100 - 30 - 40 , CScript ());
166166 BOOST_CHECK (!VerifyAmounts (inputs, CTransaction (tx4), nullptr , false )); // Spends a blinded coin with no blinded outputs to compensate.
167167
168168 std::vector<uint256> input_blinds;
@@ -172,17 +172,17 @@ BOOST_AUTO_TEST_CASE(naive_blinding_test)
172172 std::vector<uint256> output_blinds;
173173 std::vector<uint256> output_asset_blinds;
174174 std::vector<CPubKey> output_pubkeys;
175- input_blinds.push_back (uint256 ());
175+ input_blinds.emplace_back (uint256 ());
176176 input_blinds.push_back (blind3);
177- input_asset_blinds.push_back (uint256 ());
177+ input_asset_blinds.emplace_back (uint256 ());
178178 input_asset_blinds.push_back (asset_blind);
179179 input_amounts.push_back (111 );
180180 input_amounts.push_back (100 );
181181 input_assets.push_back (unblinded_id);
182182 input_assets.push_back (unblinded_id);
183- output_pubkeys.push_back (CPubKey ());
184- output_pubkeys.push_back (CPubKey ());
185- output_pubkeys.push_back (CPubKey ());
183+ output_pubkeys.emplace_back (CPubKey ());
184+ output_pubkeys.emplace_back (CPubKey ());
185+ output_pubkeys.emplace_back (CPubKey ());
186186 BOOST_CHECK (BlindTransaction (input_blinds, input_asset_blinds, input_assets, input_amounts, output_blinds, output_asset_blinds, output_pubkeys, vDummy, vDummy, tx4) == 0 ); // Blinds nothing
187187 }
188188
@@ -198,11 +198,11 @@ BOOST_AUTO_TEST_CASE(naive_blinding_test)
198198 tx4.vin [0 ].prevout .n = 0 ;
199199 tx4.vin [1 ].prevout .hash = ArithToUint256 (3 );
200200 tx4.vin [1 ].prevout .n = 0 ;
201- tx4.vout .push_back ( CTxOut ( bitcoinID, 30 , CScript () << OP_TRUE) );
202- tx4.vout .push_back ( CTxOut ( bitcoinID, 40 , CScript () << OP_TRUE) );
203- tx4.vout .push_back ( CTxOut ( bitcoinID, 50 , CScript () << OP_TRUE) );
201+ tx4.vout .emplace_back ( bitcoinID, 30 , CScript () << OP_TRUE);
202+ tx4.vout .emplace_back ( bitcoinID, 40 , CScript () << OP_TRUE);
203+ tx4.vout .emplace_back ( bitcoinID, 50 , CScript () << OP_TRUE);
204204 // Fee
205- tx4.vout .push_back ( CTxOut ( bitcoinID, 111 + 100 - 30 - 40 - 50 , CScript () ));
205+ tx4.vout .emplace_back ( bitcoinID, 111 + 100 - 30 - 40 - 50 , CScript ());
206206 BOOST_CHECK (!VerifyAmounts (inputs, CTransaction (tx4), nullptr , false )); // Spends a blinded coin with no blinded outputs to compensate.
207207
208208 std::vector<uint256> input_blinds;
@@ -213,19 +213,19 @@ BOOST_AUTO_TEST_CASE(naive_blinding_test)
213213 std::vector<uint256> output_asset_blinds;
214214 std::vector<CPubKey> output_pubkeys;
215215
216- input_blinds.push_back (uint256 ());
216+ input_blinds.emplace_back (uint256 ());
217217 input_blinds.push_back (blind3);
218- input_asset_blinds.push_back (uint256 ());
218+ input_asset_blinds.emplace_back (uint256 ());
219219 input_asset_blinds.push_back (asset_blind);
220220 input_amounts.push_back (111 );
221221 input_amounts.push_back (100 );
222222 input_assets.push_back (unblinded_id);
223223 input_assets.push_back (unblinded_id);
224224
225225 output_pubkeys.push_back (pubkey2);
226- output_pubkeys.push_back (CPubKey ());
226+ output_pubkeys.emplace_back (CPubKey ());
227227 output_pubkeys.push_back (pubkey2);
228- output_pubkeys.push_back (CPubKey ());
228+ output_pubkeys.emplace_back (CPubKey ());
229229
230230 BOOST_CHECK (BlindTransaction (input_blinds, input_asset_blinds, input_assets, input_amounts, output_blinds, output_asset_blinds, output_pubkeys, vDummy, vDummy, tx4) == 2 );
231231 BOOST_CHECK (!tx4.vout [0 ].nValue .IsExplicit ());
@@ -288,15 +288,15 @@ BOOST_AUTO_TEST_CASE(naive_blinding_test)
288288 CMutableTransaction tx5;
289289 tx5.vin .resize (0 );
290290 tx5.vout .resize (0 );
291- tx5.vin .push_back ( CTxIn ( COutPoint (ArithToUint256 (3 ), 0 ) ));
292- tx5.vin .push_back ( CTxIn ( COutPoint (ArithToUint256 (5 ), 0 ) ));
293- tx5.vout .push_back ( CTxOut ( bitcoinID, 29 , CScript () << OP_TRUE) );
294- tx5.vout .push_back ( CTxOut ( bitcoinID, 70 , CScript () << OP_TRUE) );
295- tx5.vout .push_back ( CTxOut ( otherID, 250 , CScript () << OP_TRUE) );
296- tx5.vout .push_back ( CTxOut ( otherID, 249 , CScript () << OP_TRUE) );
291+ tx5.vin .emplace_back ( COutPoint (ArithToUint256 (3 ), 0 ));
292+ tx5.vin .emplace_back ( COutPoint (ArithToUint256 (5 ), 0 ));
293+ tx5.vout .emplace_back ( bitcoinID, 29 , CScript () << OP_TRUE);
294+ tx5.vout .emplace_back ( bitcoinID, 70 , CScript () << OP_TRUE);
295+ tx5.vout .emplace_back ( otherID, 250 , CScript () << OP_TRUE);
296+ tx5.vout .emplace_back ( otherID, 249 , CScript () << OP_TRUE);
297297 // Fees
298- tx5.vout .push_back ( CTxOut ( bitcoinID, 1 , CScript () ));
299- tx5.vout .push_back ( CTxOut ( otherID, 1 , CScript () ));
298+ tx5.vout .emplace_back ( bitcoinID, 1 , CScript ());
299+ tx5.vout .emplace_back ( otherID, 1 , CScript ());
300300
301301 // Blinds don't balance
302302 BOOST_CHECK (!VerifyAmounts (inputs, CTransaction (tx5), nullptr , false ));
@@ -310,9 +310,9 @@ BOOST_AUTO_TEST_CASE(naive_blinding_test)
310310 std::vector<uint256> output_asset_blinds;
311311 std::vector<CPubKey> output_pubkeys;
312312 input_blinds.push_back (blind3);
313- input_blinds.push_back (uint256 ()); //
313+ input_blinds.emplace_back (uint256 ());
314314 input_asset_blinds.push_back (asset_blind);
315- input_asset_blinds.push_back (uint256 ());
315+ input_asset_blinds.emplace_back (uint256 ());
316316 input_amounts.push_back (100 );
317317 input_amounts.push_back (500 );
318318 input_assets.push_back (bitcoinID);
@@ -335,7 +335,7 @@ BOOST_AUTO_TEST_CASE(naive_blinding_test)
335335 BOOST_CHECK (VerifyAmounts (inputs, CTransaction (txtemp), nullptr , false ));
336336
337337 // Transaction may not have spendable 0-value output
338- txtemp.vout .push_back ( CTxOut ( CAsset (), 0 , CScript () << OP_TRUE) );
338+ txtemp.vout .emplace_back ( CAsset (), 0 , CScript () << OP_TRUE);
339339 BOOST_CHECK (!VerifyAmounts (inputs, CTransaction (txtemp), nullptr , false ));
340340
341341 // Create imbalance by removing fees, should still be able to blind
0 commit comments