aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2026-01-06 07:34:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

lightningd: rename htlc_in field from failcode to badonion.

Browse Source 
That's all it's used for now.

And remove unreferenced failoutchannel.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2020-02-21 15:40:44 +10:30
parent 447730e70f
commit c9e73dc4e0
4 changed files with 31 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
lightningd/htlc_end.c
View File

@@ -100,9 +100,9 @@ struct htlc_in *htlc_in_check(const struct htlc_in *hin, const char *abortstr)
htlc_state_name(hin->hstate));
else if (hin->failonion && hin->preimage)
return corrupt(abortstr, "Both failonion and succeeded");
else if (hin->failcode != 0 && hin->preimage)
return corrupt(abortstr, "Both failcode and succeeded");
else if (hin->failonion && (hin->failcode & BADONION))
else if (hin->badonion != 0 && hin->preimage)
return corrupt(abortstr, "Both badonion and succeeded");
else if (hin->failonion && hin->badonion)
return corrupt(abortstr, "Both failed and malformed");
/* Can't have a resolution while still being added. */
@@ -112,11 +112,11 @@ struct htlc_in *htlc_in_check(const struct htlc_in *hin, const char *abortstr)
return corrupt(abortstr, "Still adding, has preimage");
if (hin->failonion)
return corrupt(abortstr, "Still adding, has failmsg");
if (hin->failcode)
return corrupt(abortstr, "Still adding, has failcode");
if (hin->badonion)
return corrupt(abortstr, "Still adding, has badonion");
} else if (hin->hstate >= SENT_REMOVE_HTLC
&& hin->hstate <= SENT_REMOVE_ACK_REVOCATION) {
if (!hin->preimage && !hin->failonion && !hin->failcode)
if (!hin->preimage && !hin->failonion && !hin->badonion)
return corrupt(abortstr, "Removing, no resolution");
} else
return corrupt(abortstr, "Bad state %s",
@@ -148,7 +148,7 @@ struct htlc_in *new_htlc_in(const tal_t *ctx,
sizeof(hin->onion_routing_packet));
hin->hstate = RCVD_ADD_COMMIT;
hin->failcode = 0;
hin->badonion = 0;
hin->failonion = NULL;
hin->preimage = NULL;
@@ -186,9 +186,9 @@ struct htlc_out *htlc_out_check(const struct htlc_out *hout,
/* If output is resolved, input must be resolved same
* way (or not resolved yet). */
if (hout->failonion) {
if (hout->in->failcode)
if (hout->in->badonion)
return corrupt(abortstr,
"Output failmsg, input failcode");
"Output failmsg, input badonion");
if (hout->in->preimage)
return corrupt(abortstr,
"Output failmsg, input preimage");
@@ -203,9 +203,9 @@ struct htlc_out *htlc_out_check(const struct htlc_out *hout,
if (hout->in->failonion)
return corrupt(abortstr,
"Output preimage, input failonion");
if (hout->in->failcode)
if (hout->in->badonion)
return corrupt(abortstr,
"Output preimage, input failcode");
"Output preimage, input badonion");
} else {
if (hout->in->preimage)
return corrupt(abortstr,
@@ -213,9 +213,9 @@ struct htlc_out *htlc_out_check(const struct htlc_out *hout,
if (hout->in->failonion)
return corrupt(abortstr,
"Output unresovled, input failmsg");
if (hout->in->failcode)
if (hout->in->badonion)
return corrupt(abortstr,
"Output unresolved, input failcode");
"Output unresolved, input badonion");
}
}