Skip to content

Commit b0a3887

Browse files
ismaelsadeeqismaelsadeeq
committed
scripted-diff: fix leftover references to policy/fees.h
-BEGIN VERIFY SCRIPT- git grep -l "policy\/fees\.h" | xargs sed -i "s/policy\/fees.h/policy\/fees\/block_policy_estimator.h/g" -END VERIFY SCRIPT-
1 parent e652b69 commit b0a3887

File tree

6 files changed

+6
-6
lines changed

6 files changed

+6
-6
lines changed

‎src/wallet/rpc/spend.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ UniValue SendMoney(CWallet& wallet, const CCoinControl &coin_control, std::vecto
203203
*
204204
* @param[in] wallet Wallet reference
205205
* @param[in,out] cc Coin control to be updated
206-
* @param[in] conf_target UniValue integer; confirmation target in blocks, values between 1 and 1008 are valid per policy/fees.h;
206+
* @param[in] conf_target UniValue integer; confirmation target in blocks, values between 1 and 1008 are valid per policy/fees/block_policy_estimator.h;
207207
* @param[in] estimate_mode UniValue string; fee estimation mode, valid values are "unset", "economical" or "conservative";
208208
* @param[in] fee_rate UniValue real; fee rate in sat/vB;
209209
* if present, both conf_target and estimate_mode must either be null, or "unset"

‎test/functional/rpc_estimatefee.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ def run_test(self):
3636
assert_raises_rpc_error(-1, "estimatesmartfee", self.nodes[0].estimatesmartfee, 1, 'ECONOMICAL', 1)
3737
assert_raises_rpc_error(-1, "estimaterawfee", self.nodes[0].estimaterawfee, 1, 1, 1)
3838

39-
# max value of 1008 per src/policy/fees.h
39+
# max value of 1008 per src/policy/fees/block_policy_estimator.h
4040
assert_raises_rpc_error(-8, "Invalid conf_target, must be between 1 and 1008", self.nodes[0].estimaterawfee, 1009)
4141

4242
# valid calls

‎test/functional/rpc_psbt.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -601,7 +601,7 @@ def run_test(self):
601601
assert_raises_rpc_error(-3, f"JSON value of type {k} for field conf_target is not of expected type number",
602602
self.nodes[1].walletcreatefundedpsbt, inputs, outputs, 0, {"estimate_mode": mode, "conf_target": v, "add_inputs": True})
603603
for n in [-1, 0, 1009]:
604-
assert_raises_rpc_error(-8, "Invalid conf_target, must be between 1 and 1008", # max value of 1008 per src/policy/fees.h
604+
assert_raises_rpc_error(-8, "Invalid conf_target, must be between 1 and 1008", # max value of 1008 per src/policy/fees/block_policy_estimator.h
605605
self.nodes[1].walletcreatefundedpsbt, inputs, outputs, 0, {"estimate_mode": mode, "conf_target": n, "add_inputs": True})
606606

607607
self.log.info("Test walletcreatefundedpsbt with too-high fee rate produces total fee well above -maxtxfee and raises RPC error")

‎test/functional/wallet_basic.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ def run_test(self):
334334

335335
self.log.info("Test sendmany raises if an invalid conf_target or estimate_mode is passed")
336336
for target, mode in product([-1, 0, 1009], ["economical", "conservative"]):
337-
assert_raises_rpc_error(-8, "Invalid conf_target, must be between 1 and 1008", # max value of 1008 per src/policy/fees.h
337+
assert_raises_rpc_error(-8, "Invalid conf_target, must be between 1 and 1008", # max value of 1008 per src/policy/fees/block_policy_estimator.h
338338
self.nodes[2].sendmany, amounts={address: 1}, conf_target=target, estimate_mode=mode)
339339
for target, mode in product([-1, 0], ["btc/kb", "sat/b"]):
340340
assert_raises_rpc_error(-8, 'Invalid estimate_mode parameter, must be one of: "unset", "economical", "conservative"',

‎test/functional/wallet_fundrawtransaction.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -848,7 +848,7 @@ def test_option_feerate(self):
848848
assert_raises_rpc_error(-3, f"JSON value of type {k} for field conf_target is not of expected type number",
849849
node.fundrawtransaction, rawtx, estimate_mode=mode, conf_target=v, add_inputs=True)
850850
for n in [-1, 0, 1009]:
851-
assert_raises_rpc_error(-8, "Invalid conf_target, must be between 1 and 1008", # max value of 1008 per src/policy/fees.h
851+
assert_raises_rpc_error(-8, "Invalid conf_target, must be between 1 and 1008", # max value of 1008 per src/policy/fees/block_policy_estimator.h
852852
node.fundrawtransaction, rawtx, estimate_mode=mode, conf_target=n, add_inputs=True)
853853

854854
self.log.info("Test invalid fee rate settings")

‎test/functional/wallet_send.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ def run_test(self):
312312

313313
for target, mode in product([-1, 0, 1009], ["economical", "conservative"]):
314314
self.test_send(from_wallet=w0, to_wallet=w1, amount=1, conf_target=target, estimate_mode=mode,
315-
expect_error=(-8, "Invalid conf_target, must be between 1 and 1008")) # max value of 1008 per src/policy/fees.h
315+
expect_error=(-8, "Invalid conf_target, must be between 1 and 1008")) # max value of 1008 per src/policy/fees/block_policy_estimator.h
316316
msg = 'Invalid estimate_mode parameter, must be one of: "unset", "economical", "conservative"'
317317
for target, mode in product([-1, 0], ["btc/kb", "sat/b"]):
318318
self.test_send(from_wallet=w0, to_wallet=w1, amount=1, conf_target=target, estimate_mode=mode, expect_error=(-8, msg))

0 commit comments

Comments
 (0)