highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-11-12 15:09:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

[refactor] Make feebumper namespace

Browse Source 
Future commit will remove the FeeBumper class. This commit simply places
everything into a feebumper namespace, and changes the enum class name
from BumpeFeeResult to feebumper::Result.
This commit is contained in:
Russell Yanofsky
2017-09-20 16:19:30 -04:00
committed by John Newbery
parent 7c4f009195
commit 37bdcca3c3
4 changed files with 40 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/wallet/rpcwallet.cpp
View File

@@ -3125,21 +3125,21 @@ UniValue bumpfee(const JSONRPCRequest& request)
LOCK2(cs_main, pwallet->cs_wallet);
EnsureWalletIsUnlocked(pwallet);
FeeBumper feeBump(pwallet, hash, coin_control, totalFee);
BumpFeeResult res = feeBump.getResult();
if (res != BumpFeeResult::OK)
feebumper::FeeBumper feeBump(pwallet, hash, coin_control, totalFee);
feebumper::Result res = feeBump.getResult();
if (res != feebumper::Result::OK)
{
switch(res) {
case BumpFeeResult::INVALID_ADDRESS_OR_KEY:
case feebumper::Result::INVALID_ADDRESS_OR_KEY:
throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, feeBump.getErrors()[0]);
break;
case BumpFeeResult::INVALID_REQUEST:
case feebumper::Result::INVALID_REQUEST:
throw JSONRPCError(RPC_INVALID_REQUEST, feeBump.getErrors()[0]);
break;
case BumpFeeResult::INVALID_PARAMETER:
case feebumper::Result::INVALID_PARAMETER:
throw JSONRPCError(RPC_INVALID_PARAMETER, feeBump.getErrors()[0]);
break;
case BumpFeeResult::WALLET_ERROR:
case feebumper::Result::WALLET_ERROR:
throw JSONRPCError(RPC_WALLET_ERROR, feeBump.getErrors()[0]);
break;
default: