channeldb+lnrpc: invoice state #2354
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
joostjager
force-pushed
the
invoice-state
branch
2 times, most recently
from
f6c8849
to
f890ff7
Compare
halseth
suggested changes
Dec 20, 2018
| @@ -2334,7 +2334,7 @@ func (l *channelLink) processRemoteAdds(fwdPkg *channeldb.FwdPkg, | |||
| // TODO(conner): track ownership of settlements to | |||
| // properly recover from failures? or add batch invoice | |||
| // settlement | |||
| if invoice.Terms.Settled { | |||
| if invoice.Terms.State != channeldb.ContractOpen { | |||
There was a problem hiding this comment.
Is this intended? Comment should possibly be updated to reflect change?
There was a problem hiding this comment.
Yes. In this PR both are equivalent, but I am inverting the condition as a preparation for the hold invoice.
There was a problem hiding this comment.
Same for comment below
joostjager
force-pushed
the
invoice-state
branch
from
f890ff7
to
86e9ae7
Compare
|
comments processed |
|
also added |
Roasbeef
added
database
Roasbeef
previously approved these changes
Jan 3, 2019
channeldb/invoices.go
Outdated
|
|
||
| // ContractSettled means the htlc is settled and the invoice has been | ||
| // paid. | ||
| ContractSettled = 1 |
There was a problem hiding this comment.
I think this one also needs to be explicitly specified as the prior one isn't using iota?
joostjager
force-pushed
the
invoice-state
branch
from
86e9ae7
to
320b775
Compare
|
Ready to land after sign+rebase! (may need to sync with some of the other PRs that also modify |
This commit is a preparation for the addition of new invoice states. A database migration is not needed because we keep the same field length and values.
Expose the new invoice state field over rpc.
joostjager
force-pushed
the
invoice-state
branch
from
320b775
to
1199f17
Compare
|
Ptal @Roasbeef |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR converts the invoice
settledboolean into a state. This is a preparation that enables creation of new invoice states.