aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2026-02-23 15:04:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

pytest: remove use dev-override-feerates.

Browse Source 
Manipulate fees via fake-bitcoin-cli.  It's not quite the same, as
these are pre-smoothing, so we need a restart to override that where
we really need an exact change.  Or we can wait until it reaches a
certain value in cases we don't care about exact amounts.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2018-08-23 08:57:24 +09:30
parent a75de62477
commit d93be58bd0
7 changed files with 27 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
lightningd/chaintopology.c
View File

@@ -648,12 +648,6 @@ static u32 guess_feerate(const struct chain_topology *topo, enum feerate feerate
u32 get_feerate(const struct chain_topology *topo, enum feerate feerate)
{
#if DEVELOPER
if (topo->dev_override_fee_rate) {
log_debug(topo->log, "Forcing fee rate, ignoring estimate");
return topo->dev_override_fee_rate[feerate];
}
#endif
if (topo->feerate[feerate] == 0) {
return guess_feerate(topo, feerate);
}
@@ -661,62 +655,6 @@ u32 get_feerate(const struct chain_topology *topo, enum feerate feerate)
}
#if DEVELOPER
static void json_dev_setfees(struct command *cmd,
const char *buffer, const jsmntok_t *params)
{
struct chain_topology *topo = cmd->ld->topology;
struct json_result *response;
u32 *imm, *norm, *slow;
if (!topo->dev_override_fee_rate) {
u32 fees[NUM_FEERATES];
for (size_t i = 0; i < ARRAY_SIZE(fees); i++)
fees[i] = get_feerate(topo, i);
topo->dev_override_fee_rate = tal_dup_arr(topo, u32, fees,
ARRAY_SIZE(fees), 0);
}
if (!param(cmd, buffer, params,
p_opt("immediate", json_tok_number, &imm),
p_opt("normal", json_tok_number, &norm),
p_opt("slow", json_tok_number, &slow),
NULL))
return;
if (imm)
topo->dev_override_fee_rate[FEERATE_IMMEDIATE] = *imm;
if (norm)
topo->dev_override_fee_rate[FEERATE_NORMAL] = *norm;
if (slow)
topo->dev_override_fee_rate[FEERATE_SLOW] = *slow;
log_debug(topo->log,
"dev-setfees: fees now %u/%u/%u",
topo->dev_override_fee_rate[FEERATE_IMMEDIATE],
topo->dev_override_fee_rate[FEERATE_NORMAL],
topo->dev_override_fee_rate[FEERATE_SLOW]);
notify_feerate_change(cmd->ld);
response = new_json_result(cmd);
json_object_start(response, NULL);
json_add_num(response, "immediate",
topo->dev_override_fee_rate[FEERATE_IMMEDIATE]);
json_add_num(response, "normal",
topo->dev_override_fee_rate[FEERATE_NORMAL]);
json_add_num(response, "slow",
topo->dev_override_fee_rate[FEERATE_SLOW]);
json_object_end(response);
command_success(cmd, response);
}
static const struct json_command dev_setfees_command = {
"dev-setfees",
json_dev_setfees,
"Set feerate in satoshi-per-kw for {immediate}, {normal} and {slow} (each is optional, when set, separate by spaces) and show the value of those three feerates"
};
AUTODATA(json_command, &dev_setfees_command);
void chaintopology_mark_pointers_used(struct htable *memtable,
const struct chain_topology *topo)
{
@@ -764,9 +702,6 @@ struct chain_topology *new_topology(struct lightningd *ld, struct log *log)
topo->poll_seconds = 30;
topo->feerate_uninitialized = true;
topo->root = NULL;
#if DEVELOPER
topo->dev_override_fee_rate = NULL;
#endif
return topo;
}
@@ -787,18 +722,7 @@ void setup_topology(struct chain_topology *topo,
tal_add_destructor(topo, destroy_chain_topology);
#if DEVELOPER
if (topo->dev_override_fee_rate) {
log_info(topo->log, "Fee estimation disabled because: "
"--dev-override-fee-rates");
topo->feerate_uninitialized = false;
} else {
/* Begin fee estimation. */
start_fee_estimate(topo);
}
#else
start_fee_estimate(topo);
#endif
/* Once it gets initial block, it calls io_break() and we return. */
io_loop(NULL, NULL);

5
lightningd/chaintopology.h
View File

@@ -111,11 +111,6 @@ struct chain_topology {
/* Transactions/txos we are watching. */
struct txwatch_hash txwatches;
struct txowatch_hash txowatches;
#if DEVELOPER
/* Force a particular fee rate regardless of estimatefee (satoshis/kw) */
u32 *dev_override_fee_rate;
#endif
};
/* Information relevant to locating a TX in a blockchain. */

26
lightningd/options.c
View File

@@ -401,29 +401,6 @@ static void config_register_opts(struct lightningd *ld)
}
#if DEVELOPER
static char *opt_set_fee_rates(const char *arg, struct chain_topology *topo)
{
tal_free(topo->dev_override_fee_rate);
topo->dev_override_fee_rate = tal_arr(topo, u32, 3);
for (size_t i = 0; i < tal_count(topo->dev_override_fee_rate); i++) {
char *endp;
char term;
if (i == tal_count(topo->dev_override_fee_rate)-1)
term = '\0';
else
term = '/';
topo->dev_override_fee_rate[i] = strtol(arg, &endp, 10);
if (endp == arg || *endp != term)
return tal_fmt(NULL,
"Feerates must be <num>/<num>/<num>");
arg = endp + 1;
}
return NULL;
}
static void dev_register_opts(struct lightningd *ld)
{
opt_register_noarg("--dev-no-reconnect", opt_set_invbool,
@@ -451,9 +428,6 @@ static void dev_register_opts(struct lightningd *ld)
"will cause channels to be closed more often due to "
"fee fluctuations, large values may result in large "
"fees.");
opt_register_arg("--dev-override-fee-rates", opt_set_fee_rates, NULL,
ld->topology,
"Force a specific rates (immediate/normal/slow) in satoshis per kw regardless of estimated fees");
opt_register_arg(
"--dev-channel-update-interval=<s>", opt_set_u32, opt_show_u32,