Skip to content

Commit 01ccfbe

Browse files
committed
scripted-diff: use static constexpr in policy/policy.h
-BEGIN VERIFY SCRIPT- sed -i -e "s/static const /static constexpr /" src/policy/policy.h -END VERIFY SCRIPT-
1 parent 62d56bb commit 01ccfbe

File tree

1 file changed

+17
-17
lines changed

1 file changed

+17
-17
lines changed

src/policy/policy.h

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -20,43 +20,43 @@ class CFeeRate;
2020
class CScript;
2121

2222
/** Default for -blockmaxweight, which controls the range of block weights the mining code will create **/
23-
static const unsigned int DEFAULT_BLOCK_MAX_WEIGHT = MAX_BLOCK_WEIGHT - 4000;
23+
static constexpr unsigned int DEFAULT_BLOCK_MAX_WEIGHT = MAX_BLOCK_WEIGHT - 4000;
2424
/** Default for -blockmintxfee, which sets the minimum feerate for a transaction in blocks created by mining code **/
25-
static const unsigned int DEFAULT_BLOCK_MIN_TX_FEE = 1000;
25+
static constexpr unsigned int DEFAULT_BLOCK_MIN_TX_FEE = 1000;
2626
/** The maximum weight for transactions we're willing to relay/mine */
27-
static const unsigned int MAX_STANDARD_TX_WEIGHT = 400000;
27+
static constexpr unsigned int MAX_STANDARD_TX_WEIGHT = 400000;
2828
/** The minimum non-witness size for transactions we're willing to relay/mine (1 segwit input + 1 P2WPKH output = 82 bytes) */
29-
static const unsigned int MIN_STANDARD_TX_NONWITNESS_SIZE = 82;
29+
static constexpr unsigned int MIN_STANDARD_TX_NONWITNESS_SIZE = 82;
3030
/** Maximum number of signature check operations in an IsStandard() P2SH script */
31-
static const unsigned int MAX_P2SH_SIGOPS = 15;
31+
static constexpr unsigned int MAX_P2SH_SIGOPS = 15;
3232
/** The maximum number of sigops we're willing to relay/mine in a single tx */
33-
static const unsigned int MAX_STANDARD_TX_SIGOPS_COST = MAX_BLOCK_SIGOPS_COST/5;
33+
static constexpr unsigned int MAX_STANDARD_TX_SIGOPS_COST = MAX_BLOCK_SIGOPS_COST/5;
3434
/** Default for -maxmempool, maximum megabytes of mempool memory usage */
35-
static const unsigned int DEFAULT_MAX_MEMPOOL_SIZE = 300;
35+
static constexpr unsigned int DEFAULT_MAX_MEMPOOL_SIZE = 300;
3636
/** Default for -incrementalrelayfee, which sets the minimum feerate increase for mempool limiting or BIP 125 replacement **/
37-
static const unsigned int DEFAULT_INCREMENTAL_RELAY_FEE = 1000;
37+
static constexpr unsigned int DEFAULT_INCREMENTAL_RELAY_FEE = 1000;
3838
/** Default for -bytespersigop */
39-
static const unsigned int DEFAULT_BYTES_PER_SIGOP = 20;
39+
static constexpr unsigned int DEFAULT_BYTES_PER_SIGOP = 20;
4040
/** Default for -permitbaremultisig */
41-
static const bool DEFAULT_PERMIT_BAREMULTISIG = true;
41+
static constexpr bool DEFAULT_PERMIT_BAREMULTISIG = true;
4242
/** The maximum number of witness stack items in a standard P2WSH script */
43-
static const unsigned int MAX_STANDARD_P2WSH_STACK_ITEMS = 100;
43+
static constexpr unsigned int MAX_STANDARD_P2WSH_STACK_ITEMS = 100;
4444
/** The maximum size in bytes of each witness stack item in a standard P2WSH script */
45-
static const unsigned int MAX_STANDARD_P2WSH_STACK_ITEM_SIZE = 80;
45+
static constexpr unsigned int MAX_STANDARD_P2WSH_STACK_ITEM_SIZE = 80;
4646
/** The maximum size in bytes of each witness stack item in a standard BIP 342 script (Taproot, leaf version 0xc0) */
47-
static const unsigned int MAX_STANDARD_TAPSCRIPT_STACK_ITEM_SIZE = 80;
47+
static constexpr unsigned int MAX_STANDARD_TAPSCRIPT_STACK_ITEM_SIZE = 80;
4848
/** The maximum size in bytes of a standard witnessScript */
49-
static const unsigned int MAX_STANDARD_P2WSH_SCRIPT_SIZE = 3600;
49+
static constexpr unsigned int MAX_STANDARD_P2WSH_SCRIPT_SIZE = 3600;
5050
/** The maximum size of a standard ScriptSig */
51-
static const unsigned int MAX_STANDARD_SCRIPTSIG_SIZE = 1650;
51+
static constexpr unsigned int MAX_STANDARD_SCRIPTSIG_SIZE = 1650;
5252
/** Min feerate for defining dust. Historically this has been based on the
5353
* minRelayTxFee, however changing the dust limit changes which transactions are
5454
* standard and should be done with care and ideally rarely. It makes sense to
5555
* only increase the dust limit after prior releases were already not creating
5656
* outputs below the new threshold */
57-
static const unsigned int DUST_RELAY_TX_FEE = 3000;
57+
static constexpr unsigned int DUST_RELAY_TX_FEE = 3000;
5858
/** Default for -minrelaytxfee, minimum relay fee for transactions */
59-
static const unsigned int DEFAULT_MIN_RELAY_TX_FEE = 1000;
59+
static constexpr unsigned int DEFAULT_MIN_RELAY_TX_FEE = 1000;
6060
/** Default for -limitancestorcount, max number of in-mempool ancestors */
6161
static constexpr unsigned int DEFAULT_ANCESTOR_LIMIT{25};
6262
/** Default for -limitancestorsize, maximum kilobytes of tx + all in-mempool ancestors */

0 commit comments

Comments
 (0)