mirror of
https://github.com/aljazceru/lightning.git
synced 2025-12-19 15:14:23 +01:00
df-mfc: remove guard-rails for failures
This will cause blow ups for v2 multifundchannel attempts with failures, but allows us to return the expected errors for single-shot fundchannel attempts. Error handling is coming, i promise
This commit is contained in:
committed by
Christian Decker
parent
b040a893ed
commit
0726d2912e
@@ -416,14 +416,6 @@ openchannel_signed_err(struct command *cmd,
|
|||||||
struct multifundchannel_command *mfc = dest->mfc;
|
struct multifundchannel_command *mfc = dest->mfc;
|
||||||
const jsmntok_t *code_tok;
|
const jsmntok_t *code_tok;
|
||||||
|
|
||||||
plugin_log(mfc->cmd->plugin, LOG_DBG,
|
|
||||||
"mfc %"PRIu64", dest %u: "
|
|
||||||
"failed! openchannel_signed %s: %.*s.",
|
|
||||||
mfc->id, dest->index,
|
|
||||||
node_id_to_hexstr(tmpctx, &dest->id),
|
|
||||||
json_tok_full_len(error),
|
|
||||||
json_tok_full(buf, error));
|
|
||||||
|
|
||||||
code_tok = json_get_member(buf, error, "code");
|
code_tok = json_get_member(buf, error, "code");
|
||||||
if (!code_tok)
|
if (!code_tok)
|
||||||
plugin_err(cmd->plugin,
|
plugin_err(cmd->plugin,
|
||||||
@@ -780,16 +772,8 @@ openchannel_update_err(struct command *cmd,
|
|||||||
const jsmntok_t *error,
|
const jsmntok_t *error,
|
||||||
struct multifundchannel_destination *dest)
|
struct multifundchannel_destination *dest)
|
||||||
{
|
{
|
||||||
struct multifundchannel_command *mfc = dest->mfc;
|
|
||||||
const jsmntok_t *code_tok;
|
const jsmntok_t *code_tok;
|
||||||
|
|
||||||
plugin_err(mfc->cmd->plugin,
|
|
||||||
"mfc %"PRIu64", dest %u: "
|
|
||||||
"failed! `openchannel_update` %s: %.*s",
|
|
||||||
mfc->id, dest->index,
|
|
||||||
node_id_to_hexstr(tmpctx, &dest->id),
|
|
||||||
json_tok_full_len(error), json_tok_full(buf, error));
|
|
||||||
|
|
||||||
code_tok = json_get_member(buf, error, "code");
|
code_tok = json_get_member(buf, error, "code");
|
||||||
if (!code_tok)
|
if (!code_tok)
|
||||||
plugin_err(cmd->plugin,
|
plugin_err(cmd->plugin,
|
||||||
@@ -1006,17 +990,8 @@ openchannel_init_err(struct command *cmd,
|
|||||||
const jsmntok_t *error,
|
const jsmntok_t *error,
|
||||||
struct multifundchannel_destination *dest)
|
struct multifundchannel_destination *dest)
|
||||||
{
|
{
|
||||||
struct multifundchannel_command *mfc = dest->mfc;
|
|
||||||
const jsmntok_t *code_tok;
|
const jsmntok_t *code_tok;
|
||||||
|
|
||||||
plugin_err(mfc->cmd->plugin,
|
|
||||||
"mfc %"PRIu64", dest %u: "
|
|
||||||
"failed! openchannel_init %s: %.*s.",
|
|
||||||
mfc->id, dest->index,
|
|
||||||
node_id_to_hexstr(tmpctx, &dest->id),
|
|
||||||
json_tok_full_len(error),
|
|
||||||
json_tok_full(buf, error));
|
|
||||||
|
|
||||||
code_tok = json_get_member(buf, error, "code");
|
code_tok = json_get_member(buf, error, "code");
|
||||||
if (!code_tok)
|
if (!code_tok)
|
||||||
plugin_err(cmd->plugin,
|
plugin_err(cmd->plugin,
|
||||||
|
|||||||
Reference in New Issue
Block a user