diff options
author | MarcoFalke <falke.marco@gmail.com> | 2019-10-23 09:19:45 -0400 |
---|---|---|
committer | MarcoFalke <falke.marco@gmail.com> | 2019-10-23 09:24:07 -0400 |
commit | 8f14d2002b114195fccfe8479a70e323c5f3aa09 (patch) | |
tree | 76e2a1c449927f85b4184af407fd541a2d81e8c8 /build_msvc | |
parent | a884b32854965a6990ef8d8ecccccd91736e0dca (diff) | |
parent | a0fc0764763329df2c4b11a4e22715ccfc0cf7d3 (diff) | |
download | bitcoin-8f14d2002b114195fccfe8479a70e323c5f3aa09.tar.xz |
Merge #17183: refactor: test/bench: dedup Build{Crediting,Spending}Transaction()
a0fc0764763329df2c4b11a4e22715ccfc0cf7d3 refactor: test/bench: dedup Build{Crediting,Spending}Transaction() (Sebastian Falbesoner)
Pull request description:
prototypes used in `src/test/script_tests.cpp`:
- `CMutableTransaction BuildCreditingTransaction(const CScript& scriptPubKey, int nValue = 0);`
- `CMutableTransaction BuildSpendingTransaction(const CScript& scriptSig, const CScriptWitness& scriptWitness, const CTransaction& txCredit);`
prototypes used in `bench/verify_script.cpp`:
- `CMutableTransaction BuildCreditingTransaction(const CScript& scriptPubKey);`
- `CMutableTransaction BuildSpendingTransaction(const CScript& scriptSig, const CMutableTransaction& txCredit);`
The more generic versions from the script tests are moved into `setup_common.cpp` and the calls are adapted accordingly in the verify_script benchmark (passing the nValue of 1 explicitely for `BuildCreditingTransaction()`, passing empty scriptWitness explicitely and converting txCredit parameter to CTransaction in `BuildSpendingTransaction()`).
Top commit has no ACKs.
Tree-SHA512: 8444f8a18f15070eeec1e5dfd255b55a851dfc2e6647c12b1995a6f7abd7196e830db2181d0e860bcd4cf4c815967584a3756dd450346bca70649dd1d4493e04
Diffstat (limited to 'build_msvc')
-rw-r--r-- | build_msvc/test_bitcoin/test_bitcoin.vcxproj | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/build_msvc/test_bitcoin/test_bitcoin.vcxproj b/build_msvc/test_bitcoin/test_bitcoin.vcxproj index 47e87b59e4..703f616f8e 100644 --- a/build_msvc/test_bitcoin/test_bitcoin.vcxproj +++ b/build_msvc/test_bitcoin/test_bitcoin.vcxproj @@ -13,6 +13,7 @@ <ClCompile Include="..\..\src\test\*_properties.cpp" /> <ClCompile Include="..\..\src\test\gen\*_gen.cpp" /> <ClCompile Include="..\..\src\wallet\test\*_tests.cpp" /> + <ClCompile Include="..\..\src\test\lib\*.cpp" /> <ClCompile Include="..\..\src\test\setup_common.cpp" /> <ClCompile Include="..\..\src\test\main.cpp" /> <ClCompile Include="..\..\src\wallet\test\*_fixture.cpp" /> |