-
Notifications
You must be signed in to change notification settings - Fork 123
staticaddr: method to fetch deposits by outpoints #959
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: master
Are you sure you want to change the base?
Conversation
5f5780d
to
1cc4bbb
Compare
1cc4bbb
to
824ea43
Compare
staticaddr/deposit/manager.go
Outdated
outpoints []string) ([]*Deposit, error) { | ||
|
||
// Check for duplicates. | ||
duplicates := make(map[string]struct{}) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit: i'd call this existingOutpoints
.
|
||
// DepositsForOutpoints returns all deposits that are behind the given | ||
// outpoints. | ||
func (m *Manager) DepositsForOutpoints(ctx context.Context, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Where would we use the function? Could you please add coverage?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes sure, it is used to restore deposits of a swap after fetching it from the db, see hieblmi@349b930#diff-2c26627ef62d3f06764cb007a83924ef8abb36066a183b4d05e7f42e7c6a7ac9R23-R283
Ideally this would all be handled by GetLoopInByHash
, but it isn't currently.
824ea43
to
bed8b40
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM! 💾
Few comments.
staticaddr/deposit/interface.go
Outdated
@@ -26,6 +27,10 @@ type Store interface { | |||
// GetDeposit retrieves a deposit with depositID from the database. | |||
GetDeposit(ctx context.Context, depositID ID) (*Deposit, error) | |||
|
|||
// DepositForOutpoint retrieves the deposit with the given outpoint. | |||
DepositForOutpoint(ctx context.Context, txHash chainhash.Hash, | |||
idx uint32) (*Deposit, error) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I propose to change the signature to more high level:
DepositForOutpoint(ctx context.Context, outpoint string) (*Deposit, error)
staticaddr/deposit/manager.go
Outdated
outpoints []string) ([]*Deposit, error) { | ||
|
||
// Check for duplicates. | ||
duplicates := make(map[string]struct{}) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I propose to pre-allocate the map. We now the max size.
row, err := q.DepositForOutpoint(ctx, params) | ||
if err != nil { | ||
return err | ||
} | ||
|
||
latestUpdate, err := q.GetLatestDepositUpdate( | ||
ctx, row.DepositID, | ||
) | ||
if err != nil { | ||
return err | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We can do it with SQL join and avoid making an explicit DB transaction (ExecTx).
78bc133
to
a3531a9
Compare
Rebased master |
This PR adds method
DepositsForOutpoints
to the deposit manager and required sub-methods to the deposit store.This PR was extracted from and is required by #887 to ease review.