diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2019-02-22 11:09:44 -0500 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2019-02-22 11:13:43 -0500 |
| commit | 169dced9a42bd741b3265adee23e6a8d1f852227 (patch) | |
| tree | 3391e5277947cb18b62abc2b1c4b8109a5f29ebe /src/wallet/test/psbt_wallet_tests.cpp | |
| parent | 77fcf252f65e7005da13784333147439fd432af6 (diff) | |
| parent | fa9b60c842741dc92a33925fca5796ebaa4510bd (diff) | |
Merge #15408: Remove unused TransactionError constants
fa9b60c842 Remove unused TransactionError constants (MarcoFalke)
Pull request description:
Fixup to #14978, which introduced a bunch of unused enum values, such as `UNKNOWN_ERROR`, `ERROR_COUNT` and `TRANSACTION_ERR_LAST`. None of those have a meaning in the context of an `enum class`, where the compiler can infer if all cases have been covered in a switch-case.
Also, move the global `::maxTxFee` back to the rpc caller, so it can be set on a per call basis (in the future).
Tree-SHA512: 7f1e2d795f1c1278ecd54ddab2b92c2a862f3c637b482d1d008208925befa1c9dd4b3c4bb1bfcbc5ca4b66a41004aaf01ea96ea95236f944250b8a6cf99ff173
Diffstat (limited to 'src/wallet/test/psbt_wallet_tests.cpp')
| -rw-r--r-- | src/wallet/test/psbt_wallet_tests.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/wallet/test/psbt_wallet_tests.cpp b/src/wallet/test/psbt_wallet_tests.cpp index 2a3149de46..789e86e21b 100644 --- a/src/wallet/test/psbt_wallet_tests.cpp +++ b/src/wallet/test/psbt_wallet_tests.cpp @@ -62,9 +62,8 @@ BOOST_AUTO_TEST_CASE(psbt_updater_test) ssData >> psbtx; // Fill transaction with our data - TransactionError err; bool complete = true; - FillPSBT(&m_wallet, psbtx, err, complete, SIGHASH_ALL, false, true); + BOOST_REQUIRE_EQUAL(TransactionError::OK, FillPSBT(&m_wallet, psbtx, complete, SIGHASH_ALL, false, true)); // Get the final tx CDataStream ssTx(SER_NETWORK, PROTOCOL_VERSION); |