GlcoinCore/pool
1
0
Fork 0
mirror of https://github.com/lightninglabs/pool.git synced 2026-08-16 13:00:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

account: extract resumeAccount operations on StateOpen into method

Browse source
This commit is contained in:
Wilmer Paulino 2020-04-09 15:46:58 -07:00
parent 883632c0d6
commit dc8ad76c60
1 changed files with 44 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

73
account/manager.go
View file

@ -372,36 +372,11 @@ func (m *Manager) resumeAccount(ctx context.Context, account *Account,
fallthrough
// In StateOpen, the funding transaction for the account has already
// confirmed, so we only need to watch for its spend and expiration.
// confirmed, so we only need to watch for its spend and expiration and
// register for account updates.
case StateOpen:
log.Infof("Watching account %x for spend and expiration",
account.TraderKey.PubKey.SerializeCompressed())
err := m.watcher.WatchAccountSpend(
account.TraderKey.PubKey, account.OutPoint,
accountOutput.PkScript, account.HeightHint,
)
if err != nil {
return fmt.Errorf("unable to watch for spend: %v", err)
}
err = m.watcher.WatchAccountExpiration(
account.TraderKey.PubKey, account.Expiry,
)
if err != nil {
return fmt.Errorf("unable to watch for expiration: %v",
err)
}
// Now that we have an open account, subscribe for updates to it
// to the server. We subscribe for the account instead of the
// individual orders because all signing operations will need to
// be executed on an account level anyway. And we might end up
// executing multiple orders for the same account in one batch.
// The messages from the server are received and dispatched to
// the correct manager by the rpcServer.
err = m.cfg.Auctioneer.SubscribeAccountUpdates(ctx, account)
if err != nil {
return fmt.Errorf("error subscribing to account "+
"updates: %v", err)
if err := m.handleStateOpen(ctx, account); err != nil {
return err
}
// In StateExpired, we'll wait for the account to be spent such that it
@ -490,6 +465,46 @@ func (m *Manager) locateTxByHash(ctx context.Context,
return nil, errTxNotFound
}
// handleStateOpen performs the necessary operations for accounts found in
// StateOpen.
func (m *Manager) handleStateOpen(ctx context.Context, account *Account) error {
log.Infof("Watching account %x for spend and expiration",
account.TraderKey.PubKey.SerializeCompressed())
accountOutput, err := account.Output()
if err != nil {
return err
}
err = m.watcher.WatchAccountSpend(
account.TraderKey.PubKey, account.OutPoint,
accountOutput.PkScript, account.HeightHint,
)
if err != nil {
return fmt.Errorf("unable to watch for spend: %v", err)
}
err = m.watcher.WatchAccountExpiration(
account.TraderKey.PubKey, account.Expiry,
)
if err != nil {
return fmt.Errorf("unable to watch for expiration: %v", err)
}
// Now that we have an open account, subscribe for updates to it to the
// server. We subscribe for the account instead of the individual orders
// because all signing operations will need to be executed on an account
// level anyway. And we might end up executing multiple orders for the
// same account in one batch. The messages from the server are received
// and dispatched to the correct manager by the rpcServer.
err = m.cfg.Auctioneer.SubscribeAccountUpdates(ctx, account)
if err != nil {
return fmt.Errorf("unable to subscribe for account updates: %v",
err)
}
return nil
}
// handleAccountConf takes the necessary steps after detecting the confirmation
// of an account on-chain.
func (m *Manager) handleAccountConf(traderKey *btcec.PublicKey,