Merge pull request #2479 from barton2526/CTransaction

jamescowens · web-flow · commit a6bde68ac845 · 2022-04-05T23:05:23.000-05:00
test: Avoid copies of CTransaction
diff --git a/src/test/multisig_tests.cpp b/src/test/multisig_tests.cpp
@@ -26,7 +26,7 @@ extern bool VerifyScript(const CScript& scriptSig, const CScript& scriptPubKey,
 BOOST_AUTO_TEST_SUITE(multisig_tests)
 
 CScript
-sign_multisig(CScript scriptPubKey, vector<CKey> keys, CTransaction transaction, int whichIn)
+sign_multisig(const CScript& scriptPubKey, const std::vector<CKey>& keys, const CTransaction& transaction, int whichIn)
 {
     uint256 hash = SignatureHash(scriptPubKey, transaction, whichIn, SIGHASH_ALL);
 
diff --git a/src/test/script_tests.cpp b/src/test/script_tests.cpp
@@ -181,7 +181,7 @@ BOOST_AUTO_TEST_CASE(script_PushData)
 }
 
 CScript
-sign_multisig(CScript scriptPubKey, std::vector<CKey> keys, CTransaction transaction)
+sign_multisig(const CScript& scriptPubKey, const std::vector<CKey>& keys, const CTransaction& transaction)
 {
     uint256 hash = SignatureHash(scriptPubKey, transaction, 0, SIGHASH_ALL);
 
@@ -204,7 +204,7 @@ sign_multisig(CScript scriptPubKey, std::vector<CKey> keys, CTransaction transac
     return result;
 }
 CScript
-sign_multisig(CScript scriptPubKey, CKey key, CTransaction transaction)
+sign_multisig(const CScript& scriptPubKey, const CKey& key, const CTransaction& transaction)
 {
     std::vector<CKey> keys;
     keys.push_back(key);

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ extern bool VerifyScript(const CScript& scriptSig, const CScript& scriptPubKey,`
`26`	`26`	`BOOST_AUTO_TEST_SUITE(multisig_tests)`
`27`	`27`
`28`	`28`	`CScript`
`29`		`-sign_multisig(CScript scriptPubKey, vector<CKey> keys, CTransaction transaction, int whichIn)`
	`29`	`+sign_multisig(const CScript& scriptPubKey, const std::vector<CKey>& keys, const CTransaction& transaction, int whichIn)`
`30`	`30`	`{`
`31`	`31`	`uint256 hash = SignatureHash(scriptPubKey, transaction, whichIn, SIGHASH_ALL);`
`32`	`32`
Original file line number	Diff line number	Diff line change
`@@ -181,7 +181,7 @@ BOOST_AUTO_TEST_CASE(script_PushData)`
`181`	`181`	`}`
`182`	`182`
`183`	`183`	`CScript`
`184`		`-sign_multisig(CScript scriptPubKey, std::vector<CKey> keys, CTransaction transaction)`
	`184`	`+sign_multisig(const CScript& scriptPubKey, const std::vector<CKey>& keys, const CTransaction& transaction)`
`185`	`185`	`{`
`186`	`186`	`uint256 hash = SignatureHash(scriptPubKey, transaction, 0, SIGHASH_ALL);`
`187`	`187`
`@@ -204,7 +204,7 @@ sign_multisig(CScript scriptPubKey, std::vector<CKey> keys, CTransaction transac`
`204`	`204`	`return result;`
`205`	`205`	`}`
`206`	`206`	`CScript`
`207`		`-sign_multisig(CScript scriptPubKey, CKey key, CTransaction transaction)`
	`207`	`+sign_multisig(const CScript& scriptPubKey, const CKey& key, const CTransaction& transaction)`
`208`	`208`	`{`
`209`	`209`	`std::vector<CKey> keys;`
`210`	`210`	`keys.push_back(key);`