diff options
author | Andrew Chow <achow101-github@achow101.com> | 2022-03-16 14:38:34 -0400 |
---|---|---|
committer | Andrew Chow <achow101-github@achow101.com> | 2022-03-17 10:53:30 -0400 |
commit | 10379f007fd2c18f4cd24d0a0783d6d929f45556 (patch) | |
tree | 0e9d7c4bb643b868369381b319d95c58ad12addb /src/wallet/spend.h | |
parent | c7c64db41e1718584aa2f30ff27f60ab0966de62 (diff) | |
download | bitcoin-10379f007fd2c18f4cd24d0a0783d6d929f45556.tar.xz |
scripted-diff: Rename COutput member variables
Update the member variables to match the new style
-BEGIN VERIFY SCRIPT-
sed -i 's/fSpendableIn/spendable/' $(git grep -l "fSpendableIn")
sed -i 's/fSpendable/spendable/' $(git grep -l "fSpendable")
sed -i 's/fSolvableIn/solvable/' $(git grep -l "fSolvableIn")
sed -i 's/fSolvable/solvable/' $(git grep -l "fSolvable")
sed -i 's/fSafeIn/safe/' $(git grep -l "fSafeIn")
sed -i 's/fSafe/safe/' $(git grep -l "fSafe")
sed -i 's/nInputBytes/input_bytes/' $(git grep -l "nInputBytes")
sed -i 's/nDepthIn/depth/' $(git grep -l "nDepthIn" src/wallet src/bench)
sed -i 's/nDepth/depth/' src/wallet/spend.h
sed -i 's/\.nDepth/.depth/' $(git grep -l "\.nDepth" src/wallet/)
sed -i 's/nDepth, FormatMoney/depth, FormatMoney/' src/wallet/spend.cpp
-END VERIFY SCRIPT-
Diffstat (limited to 'src/wallet/spend.h')
-rw-r--r-- | src/wallet/spend.h | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/wallet/spend.h b/src/wallet/spend.h index 90aab71cf7..62b28c33c8 100644 --- a/src/wallet/spend.h +++ b/src/wallet/spend.h @@ -27,16 +27,16 @@ public: * If > 0: the tx is on chain and has this many confirmations. * If = 0: the tx is waiting confirmation. * If < 0: a conflicting tx is on chain and has this many confirmations. */ - int nDepth; + int depth; /** Pre-computed estimated size of this output as a fully-signed input in a transaction. Can be -1 if it could not be calculated */ - int nInputBytes; + int input_bytes; /** Whether we have the private keys to spend this output */ - bool fSpendable; + bool spendable; /** Whether we know how to spend this output, ignoring the lack of keys */ - bool fSolvable; + bool solvable; /** Whether to use the maximum sized, 72 byte signature when calculating the size of the input spend. This should only be set when watch-only outputs are allowed */ bool use_max_sig; @@ -46,22 +46,22 @@ public: * from outside keys and unconfirmed replacement transactions are considered * unsafe and will not be used to fund new spending transactions. */ - bool fSafe; + bool safe; - COutput(const CWallet& wallet, const CWalletTx& wtx, int iIn, int nDepthIn, bool fSpendableIn, bool fSolvableIn, bool fSafeIn, bool use_max_sig_in = false) + COutput(const CWallet& wallet, const CWalletTx& wtx, int iIn, int depth, bool spendable, bool solvable, bool safe, bool use_max_sig_in = false) : tx(&wtx), i(iIn), - nDepth(nDepthIn), - nInputBytes(-1), - fSpendable(fSpendableIn), - fSolvable(fSolvableIn), + depth(depth), + input_bytes(-1), + spendable(spendable), + solvable(solvable), use_max_sig(use_max_sig_in), - fSafe(fSafeIn) + safe(safe) { - // If known and signable by the given wallet, compute nInputBytes + // If known and signable by the given wallet, compute input_bytes // Failure will keep this value -1 - if (fSpendable) { - nInputBytes = GetTxSpendSize(wallet, wtx, i, use_max_sig); + if (spendable) { + input_bytes = GetTxSpendSize(wallet, wtx, i, use_max_sig); } } @@ -69,7 +69,7 @@ public: inline CInputCoin GetInputCoin() const { - return CInputCoin(tx->tx, i, nInputBytes); + return CInputCoin(tx->tx, i, input_bytes); } }; |