diff options
| author | Sebastian Falbesoner <sebastian.falbesoner@gmail.com> | 2020-12-13 03:15:40 +0100 |
|---|---|---|
| committer | Sebastian Falbesoner <sebastian.falbesoner@gmail.com> | 2022-05-16 17:46:34 +0200 |
| commit | 4c5ceb040cf50d24201903a9200fb23be88d96fb (patch) | |
| tree | b3b1fc04fdd06e41166c461a2e272d52ffe3f981 /src/wallet/rpc | |
| parent | c9fdaa5e3ae09b45be6a5c2d4ee6b1e8cef9d8a8 (diff) | |
| download | bitcoin-4c5ceb040cf50d24201903a9200fb23be88d96fb.tar.xz | |
wallet: CreateTransaction(): return out-params as (optional) struct
Diffstat (limited to 'src/wallet/rpc')
| -rw-r--r-- | src/wallet/rpc/spend.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/wallet/rpc/spend.cpp b/src/wallet/rpc/spend.cpp index 07119133b7..3d975b5402 100644 --- a/src/wallet/rpc/spend.cpp +++ b/src/wallet/rpc/spend.cpp @@ -155,15 +155,14 @@ UniValue SendMoney(CWallet& wallet, const CCoinControl &coin_control, std::vecto std::shuffle(recipients.begin(), recipients.end(), FastRandomContext()); // Send - CAmount nFeeRequired = 0; - int nChangePosRet = -1; + constexpr int RANDOM_CHANGE_POSITION = -1; bilingual_str error; - CTransactionRef tx; FeeCalculation fee_calc_out; - const bool fCreated = CreateTransaction(wallet, recipients, tx, nFeeRequired, nChangePosRet, error, coin_control, fee_calc_out, true); - if (!fCreated) { + std::optional<CreatedTransactionResult> txr = CreateTransaction(wallet, recipients, RANDOM_CHANGE_POSITION, error, coin_control, fee_calc_out, true); + if (!txr) { throw JSONRPCError(RPC_WALLET_INSUFFICIENT_FUNDS, error.original); } + CTransactionRef tx = txr->tx; wallet.CommitTransaction(tx, std::move(map_value), {} /* orderForm */); if (verbose) { UniValue entry(UniValue::VOBJ); |