[refactor] Make feebumper namespace

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.

src/qt/walletmodel.cpp

@@ -666,14 +666,14 @@ bool WalletModel::transactionCanBeBumped(uint256 hash) const
 
 bool WalletModel::bumpFee(uint256 hash)
 {
-    std::unique_ptr<FeeBumper> feeBump;
+    std::unique_ptr<feebumper::FeeBumper> feeBump;
     {
         CCoinControl coin_control;
         coin_control.signalRbf = true;
         LOCK2(cs_main, wallet->cs_wallet);
-        feeBump.reset(new FeeBumper(wallet, hash, coin_control, 0));
+        feeBump.reset(new feebumper::FeeBumper(wallet, hash, coin_control, 0));
     }
-    if (feeBump->getResult() != BumpFeeResult::OK)
+    if (feeBump->getResult() != feebumper::Result::OK)
     {
         QMessageBox::critical(0, tr("Fee bump error"), tr("Increasing transaction fee failed") + "<br />(" +
             (feeBump->getErrors().size() ? QString::fromStdString(feeBump->getErrors()[0]) : "") +")");

src/wallet/feebumper.cpp

@@ -23,7 +23,7 @@
 // calculation, but we should be able to refactor after priority is removed).
 // NOTE: this requires that all inputs must be in mapWallet (eg the tx should
 // be IsAllFromMe).
-int64_t CalculateMaximumSignedTxSize(const CTransaction &tx, const CWallet *wallet)
+static int64_t CalculateMaximumSignedTxSize(const CTransaction &tx, const CWallet *wallet)
 {
     CMutableTransaction txNew(tx);
     std::vector<CInputCoin> vCoins;
@@ -43,10 +43,12 @@ int64_t CalculateMaximumSignedTxSize(const CTransaction &tx, const CWallet *wall
     return GetVirtualTransactionSize(txNew);
 }
 
+namespace feebumper {
+
 bool FeeBumper::preconditionChecks(const CWallet *wallet, const CWalletTx& wtx) {
     if (wallet->HasWalletSpend(wtx.GetHash())) {
         errors.push_back("Transaction has descendants in the wallet");
-        current_result = BumpFeeResult::INVALID_PARAMETER;
+        current_result = Result::INVALID_PARAMETER;
         return false;
     }
 
@@ -55,14 +57,14 @@ bool FeeBumper::preconditionChecks(const CWallet *wallet, const CWalletTx& wtx)
         auto it_mp = mempool.mapTx.find(wtx.GetHash());
         if (it_mp != mempool.mapTx.end() && it_mp->GetCountWithDescendants() > 1) {
             errors.push_back("Transaction has descendants in the mempool");
-            current_result = BumpFeeResult::INVALID_PARAMETER;
+            current_result = Result::INVALID_PARAMETER;
             return false;
         }
     }
 
     if (wtx.GetDepthInMainChain() != 0) {
         errors.push_back("Transaction has been mined, or is conflicted with a mined transaction");
-        current_result = BumpFeeResult::WALLET_ERROR;
+        current_result = Result::WALLET_ERROR;
         return false;
     }
     return true;
@@ -80,7 +82,7 @@ FeeBumper::FeeBumper(const CWallet *wallet, const uint256 txid_in, const CCoinCo
     auto it = wallet->mapWallet.find(txid);
     if (it == wallet->mapWallet.end()) {
         errors.push_back("Invalid or non-wallet transaction id");
-        current_result = BumpFeeResult::INVALID_ADDRESS_OR_KEY;
+        current_result = Result::INVALID_ADDRESS_OR_KEY;
         return;
     }
     const CWalletTx& wtx = it->second;
@@ -91,13 +93,13 @@ FeeBumper::FeeBumper(const CWallet *wallet, const uint256 txid_in, const CCoinCo
 
     if (!SignalsOptInRBF(*wtx.tx)) {
         errors.push_back("Transaction is not BIP 125 replaceable");
-        current_result = BumpFeeResult::WALLET_ERROR;
+        current_result = Result::WALLET_ERROR;
         return;
     }
 
     if (wtx.mapValue.count("replaced_by_txid")) {
         errors.push_back(strprintf("Cannot bump transaction %s which was already bumped by transaction %s", txid.ToString(), wtx.mapValue.at("replaced_by_txid")));
-        current_result = BumpFeeResult::WALLET_ERROR;
+        current_result = Result::WALLET_ERROR;
         return;
     }
 
@@ -105,7 +107,7 @@ FeeBumper::FeeBumper(const CWallet *wallet, const uint256 txid_in, const CCoinCo
     // if not, we can't bump the fee, because the wallet has no way of knowing the value of the other inputs (thus the fee)
     if (!wallet->IsAllFromMe(*wtx.tx, ISMINE_SPENDABLE)) {
         errors.push_back("Transaction contains inputs that don't belong to this wallet");
-        current_result = BumpFeeResult::WALLET_ERROR;
+        current_result = Result::WALLET_ERROR;
         return;
     }
 
@@ -116,7 +118,7 @@ FeeBumper::FeeBumper(const CWallet *wallet, const uint256 txid_in, const CCoinCo
         if (wallet->IsChange(wtx.tx->vout[i])) {
             if (nOutput != -1) {
                 errors.push_back("Transaction has multiple change outputs");
-                current_result = BumpFeeResult::WALLET_ERROR;
+                current_result = Result::WALLET_ERROR;
                 return;
             }
             nOutput = i;
@@ -124,7 +126,7 @@ FeeBumper::FeeBumper(const CWallet *wallet, const uint256 txid_in, const CCoinCo
     }
     if (nOutput == -1) {
         errors.push_back("Transaction does not have a change output");
-        current_result = BumpFeeResult::WALLET_ERROR;
+        current_result = Result::WALLET_ERROR;
         return;
     }
 
@@ -133,7 +135,7 @@ FeeBumper::FeeBumper(const CWallet *wallet, const uint256 txid_in, const CCoinCo
     const int64_t maxNewTxSize = CalculateMaximumSignedTxSize(*wtx.tx, wallet);
     if (maxNewTxSize < 0) {
         errors.push_back("Transaction contains inputs that cannot be signed");
-        current_result = BumpFeeResult::INVALID_ADDRESS_OR_KEY;
+        current_result = Result::INVALID_ADDRESS_OR_KEY;
         return;
     }
 
@@ -154,14 +156,14 @@ FeeBumper::FeeBumper(const CWallet *wallet, const uint256 txid_in, const CCoinCo
         if (total_fee < minTotalFee) {
             errors.push_back(strprintf("Insufficient totalFee, must be at least %s (oldFee %s + incrementalFee %s)",
                                                                 FormatMoney(minTotalFee), FormatMoney(nOldFeeRate.GetFee(maxNewTxSize)), FormatMoney(::incrementalRelayFee.GetFee(maxNewTxSize))));
-            current_result = BumpFeeResult::INVALID_PARAMETER;
+            current_result = Result::INVALID_PARAMETER;
             return;
         }
         CAmount requiredFee = GetRequiredFee(maxNewTxSize);
         if (total_fee < requiredFee) {
             errors.push_back(strprintf("Insufficient totalFee (cannot be less than required fee %s)",
                                                                 FormatMoney(requiredFee)));
-            current_result = BumpFeeResult::INVALID_PARAMETER;
+            current_result = Result::INVALID_PARAMETER;
             return;
         }
         new_fee = total_fee;
@@ -185,7 +187,7 @@ FeeBumper::FeeBumper(const CWallet *wallet, const uint256 txid_in, const CCoinCo
      if (new_fee > maxTxFee) {
          errors.push_back(strprintf("Specified or calculated fee %s is too high (cannot be higher than maxTxFee %s)",
                                FormatMoney(new_fee), FormatMoney(maxTxFee)));
-         current_result = BumpFeeResult::WALLET_ERROR;
+         current_result = Result::WALLET_ERROR;
          return;
      }
 
@@ -203,7 +205,7 @@ FeeBumper::FeeBumper(const CWallet *wallet, const uint256 txid_in, const CCoinCo
             FormatMoney(minMempoolFeeRate.GetFeePerK()),
             FormatMoney(minMempoolFeeRate.GetFee(maxNewTxSize)),
             FormatMoney(minMempoolFeeRate.GetFeePerK())));
-        current_result = BumpFeeResult::WALLET_ERROR;
+        current_result = Result::WALLET_ERROR;
         return;
     }
 
@@ -215,7 +217,7 @@ FeeBumper::FeeBumper(const CWallet *wallet, const uint256 txid_in, const CCoinCo
     CTxOut* poutput = &(mtx.vout[nOutput]);
     if (poutput->nValue < nDelta) {
         errors.push_back("Change output is too small to bump the fee");
-        current_result = BumpFeeResult::WALLET_ERROR;
+        current_result = Result::WALLET_ERROR;
         return;
     }
 
@@ -234,7 +236,7 @@ FeeBumper::FeeBumper(const CWallet *wallet, const uint256 txid_in, const CCoinCo
         }
     }
 
-    current_result = BumpFeeResult::OK;
+    current_result = Result::OK;
 }
 
 bool FeeBumper::signTransaction(CWallet *wallet)
@@ -245,13 +247,13 @@ bool FeeBumper::signTransaction(CWallet *wallet)
 bool FeeBumper::commit(CWallet *wallet)
 {
     AssertLockHeld(wallet->cs_wallet);
-    if (!errors.empty() || current_result != BumpFeeResult::OK) {
+    if (!errors.empty() || current_result != Result::OK) {
         return false;
     }
     auto it = txid.IsNull() ? wallet->mapWallet.end() : wallet->mapWallet.find(txid);
     if (it == wallet->mapWallet.end()) {
         errors.push_back("Invalid or non-wallet transaction id");
-        current_result = BumpFeeResult::MISC_ERROR;
+        current_result = Result::MISC_ERROR;
         return false;
     }
     CWalletTx& oldWtx = it->second;
@@ -295,3 +297,5 @@ bool FeeBumper::commit(CWallet *wallet)
     return true;
 }
 
+} // namespace feebumper
+

src/wallet/feebumper.h

@@ -13,7 +13,9 @@ class uint256;
 class CCoinControl;
 enum class FeeEstimateMode;
 
-enum class BumpFeeResult
+namespace feebumper {
+
+enum class Result
 {
     OK,
     INVALID_ADDRESS_OR_KEY,
@@ -27,7 +29,7 @@ class FeeBumper
 {
 public:
     FeeBumper(const CWallet *wallet, const uint256 txid_in, const CCoinControl& coin_control, CAmount total_fee);
-    BumpFeeResult getResult() const { return current_result; }
+    Result getResult() const { return current_result; }
     const std::vector<std::string>& getErrors() const { return errors; }
     CAmount getOldFee() const { return old_fee; }
     CAmount getNewFee() const { return new_fee; }
@@ -53,9 +55,11 @@ private:
     uint256 bumped_txid;
     CMutableTransaction mtx;
     std::vector<std::string> errors;
-    BumpFeeResult current_result;
+    Result current_result;
     CAmount old_fee;
     CAmount new_fee;
 };
 
+} // namespace feebumper
+
 #endif // BITCOIN_WALLET_FEEBUMPER_H

src/wallet/rpcwallet.cpp

@@ -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: