Skip to content

Commit 682bd04

Browse files
committed
Merge bitcoin/bitcoin#33236: doc: Remove wrong and redundant doxygen tag
966666d doc: Remove wrong and redundant doxygen tag (MarcoFalke) Pull request description: `param@[in]` is not a valid doxygen tag. Also, no other function in this file uses the annotations, and they are redundant with the line above, so just remove them in `feerate` to fix all issues. In other places, fix them. ACKs for top commit: cedwies: ACK 966666d janb84: ACK 966666d pablomartin4btc: ACK 966666d w0xlt: ACK bitcoin/bitcoin@966666d Tree-SHA512: fcb6aa75c0f03b36f3caad023854ba276e0335cf47908a77006e182633b6a68f7b7d3115ef9fb97d143ca23730def05550f970265bb1fde97594ba68e724bde9
2 parents a9701de + 966666d commit 682bd04

File tree

3 files changed

+22
-25
lines changed

3 files changed

+22
-25
lines changed

src/policy/feerate.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,6 @@ class CFeeRate
4646
/**
4747
* Construct a fee rate from a fee in satoshis and a vsize in vB.
4848
*
49-
* param@[in] nFeePaid The fee paid by a transaction, in satoshis
50-
* param@[in] virtual_bytes The vsize of a transaction, in vbytes
51-
*
5249
* Passing any virtual_bytes less than or equal to 0 will result in 0 fee rate per 0 size.
5350
*/
5451
CFeeRate(const CAmount& nFeePaid, int32_t virtual_bytes);

src/wallet/coinselection.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -589,15 +589,15 @@ util::Result<SelectionResult> SelectCoinsSRD(const std::vector<OutputGroup>& utx
589589

590590
/** Find a subset of the OutputGroups that is at least as large as, but as close as possible to, the
591591
* target amount; solve subset sum.
592-
* param@[in] groups OutputGroups to choose from, sorted by value in descending order.
593-
* param@[in] nTotalLower Total (effective) value of the UTXOs in groups.
594-
* param@[in] nTargetValue Subset sum target, not including change.
595-
* param@[out] vfBest Boolean vector representing the subset chosen that is closest to
592+
* @param[in] groups OutputGroups to choose from, sorted by value in descending order.
593+
* @param[in] nTotalLower Total (effective) value of the UTXOs in groups.
594+
* @param[in] nTargetValue Subset sum target, not including change.
595+
* @param[out] vfBest Boolean vector representing the subset chosen that is closest to
596596
* nTargetValue, with indices corresponding to groups. If the ith
597597
* entry is true, that means the ith group in groups was selected.
598-
* param@[out] nBest Total amount of subset chosen that is closest to nTargetValue.
599-
* paramp[in] max_selection_weight The maximum allowed weight for a selection result to be valid.
600-
* param@[in] iterations Maximum number of tries.
598+
* @param[out] nBest Total amount of subset chosen that is closest to nTargetValue.
599+
* @param[in] max_selection_weight The maximum allowed weight for a selection result to be valid.
600+
* @param[in] iterations Maximum number of tries.
601601
*/
602602
static void ApproximateBestSubset(FastRandomContext& insecure_rand, const std::vector<OutputGroup>& groups,
603603
const CAmount& nTotalLower, const CAmount& nTargetValue,

src/wallet/spend.h

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -123,14 +123,14 @@ FilteredOutputGroups GroupOutputs(const CWallet& wallet,
123123
* the solution (according to the waste metric) will be chosen. If a valid input cannot be found from any
124124
* single OutputType, fallback to running `ChooseSelectionResult()` over all available coins.
125125
*
126-
* param@[in] chain The chain interface to get information on unconfirmed UTXOs bump fees
127-
* param@[in] nTargetValue The target value
128-
* param@[in] groups The grouped outputs mapped by coin eligibility filters
129-
* param@[in] coin_selection_params Parameters for the coin selection
130-
* param@[in] allow_mixed_output_types Relax restriction that SelectionResults must be of the same OutputType
126+
* @param[in] chain The chain interface to get information on bump fees for unconfirmed UTXOs
127+
* @param[in] nTargetValue The target value
128+
* @param[in] groups The grouped outputs mapped by coin eligibility filters
129+
* @param[in] coin_selection_params Parameters for the coin selection
130+
* @param[in] allow_mixed_output_types Relax restriction that SelectionResults must be of the same OutputType
131131
* returns If successful, a SelectionResult containing the input set
132132
* If failed, returns (1) an empty error message if the target was not reached (general "Insufficient funds")
133-
* or (2) an specific error message if there was something particularly wrong (e.g. a selection
133+
* or (2) a specific error message if there was something particularly wrong (e.g. a selection
134134
* result that surpassed the tx max weight size).
135135
*/
136136
util::Result<SelectionResult> AttemptSelection(interfaces::Chain& chain, const CAmount& nTargetValue, OutputGroupTypeMap& groups,
@@ -141,13 +141,13 @@ util::Result<SelectionResult> AttemptSelection(interfaces::Chain& chain, const C
141141
* Multiple coin selection algorithms will be run and the input set that produces the least waste
142142
* (according to the waste metric) will be chosen.
143143
*
144-
* param@[in] chain The chain interface to get information on unconfirmed UTXOs bump fees
145-
* param@[in] nTargetValue The target value
146-
* param@[in] groups The struct containing the outputs grouped by script and divided by (1) positive only outputs and (2) all outputs (positive + negative).
147-
* param@[in] coin_selection_params Parameters for the coin selection
144+
* @param[in] chain The chain interface to get information on bump fees for unconfirmed UTXOs
145+
* @param[in] nTargetValue The target value
146+
* @param[in] groups The struct containing the outputs grouped by script and divided by (1) positive only outputs and (2) all outputs (positive + negative).
147+
* @param[in] coin_selection_params Parameters for the coin selection
148148
* returns If successful, a SelectionResult containing the input set
149149
* If failed, returns (1) an empty error message if the target was not reached (general "Insufficient funds")
150-
* or (2) an specific error message if there was something particularly wrong (e.g. a selection
150+
* or (2) a specific error message if there was something particularly wrong (e.g. a selection
151151
* result that surpassed the tx max weight size).
152152
*/
153153
util::Result<SelectionResult> ChooseSelectionResult(interfaces::Chain& chain, const CAmount& nTargetValue, Groups& groups, const CoinSelectionParams& coin_selection_params);
@@ -181,10 +181,10 @@ util::Result<PreSelectedInputs> FetchSelectedInputs(const CWallet& wallet, const
181181

182182
/**
183183
* Select a set of coins such that nTargetValue is met; never select unconfirmed coins if they are not ours
184-
* param@[in] wallet The wallet which provides data necessary to spend the selected coins
185-
* param@[in] available_coins The struct of coins, organized by OutputType, available for selection prior to filtering
186-
* param@[in] nTargetValue The target value
187-
* param@[in] coin_selection_params Parameters for this coin selection such as feerates, whether to avoid partial spends,
184+
* @param[in] wallet The wallet which provides data necessary to spend the selected coins
185+
* @param[in] available_coins The struct of coins, organized by OutputType, available for selection prior to filtering
186+
* @param[in] nTargetValue The target value
187+
* @param[in] coin_selection_params Parameters for this coin selection such as feerates, whether to avoid partial spends,
188188
* and whether to subtract the fee from the outputs.
189189
* returns If successful, a SelectionResult containing the selected coins
190190
* If failed, returns (1) an empty error message if the target was not reached (general "Insufficient funds")

0 commit comments

Comments
 (0)