multi: provide mempool=true to RegisterSpendNtfn

This commit is contained in:
Johan T. Halseth 2018-03-29 15:31:09 +02:00
parent 9e7e023194
commit 8b02064c7b
No known key found for this signature in database
GPG Key ID: 15BAADA29DA20D26
4 changed files with 7 additions and 7 deletions

@ -519,7 +519,7 @@ secondLevelCheck:
if !ok { if !ok {
spendNtfn, err = b.cfg.Notifier.RegisterSpendNtfn( spendNtfn, err = b.cfg.Notifier.RegisterSpendNtfn(
&breachedOutput.outpoint, &breachedOutput.outpoint,
breachInfo.breachHeight, breachInfo.breachHeight, true,
) )
if err != nil { if err != nil {
brarLog.Errorf("unable to check for "+ brarLog.Errorf("unable to check for "+

@ -477,7 +477,7 @@ func (c *ChainArbitrator) Stop() error {
// NOTE: This must be launched as a goroutine. // NOTE: This must be launched as a goroutine.
func (c *ChainArbitrator) watchForChannelClose(closeInfo *channeldb.ChannelCloseSummary) { func (c *ChainArbitrator) watchForChannelClose(closeInfo *channeldb.ChannelCloseSummary) {
spendNtfn, err := c.cfg.Notifier.RegisterSpendNtfn( spendNtfn, err := c.cfg.Notifier.RegisterSpendNtfn(
&closeInfo.ChanPoint, closeInfo.CloseHeight, &closeInfo.ChanPoint, closeInfo.CloseHeight, true,
) )
if err != nil { if err != nil {
log.Errorf("unable to register for spend: %v", err) log.Errorf("unable to register for spend: %v", err)

@ -180,7 +180,7 @@ func (c *chainWatcher) Start() error {
} }
spendNtfn, err := c.notifier.RegisterSpendNtfn( spendNtfn, err := c.notifier.RegisterSpendNtfn(
fundingOut, heightHint, fundingOut, heightHint, true,
) )
if err != nil { if err != nil {
return err return err

@ -173,7 +173,7 @@ func (h *htlcTimeoutResolver) Resolve() (ContractResolver, error) {
// to confirm. // to confirm.
spendNtfn, err := h.Notifier.RegisterSpendNtfn( spendNtfn, err := h.Notifier.RegisterSpendNtfn(
&h.htlcResolution.ClaimOutpoint, &h.htlcResolution.ClaimOutpoint,
h.broadcastHeight, h.broadcastHeight, true,
) )
if err != nil { if err != nil {
return err return err
@ -608,7 +608,7 @@ func (h *htlcSuccessResolver) Resolve() (ContractResolver, error) {
// To wrap this up, we'll wait until the second-level transaction has // To wrap this up, we'll wait until the second-level transaction has
// been spent, then fully resolve the contract. // been spent, then fully resolve the contract.
spendNtfn, err := h.Notifier.RegisterSpendNtfn( spendNtfn, err := h.Notifier.RegisterSpendNtfn(
&h.htlcResolution.ClaimOutpoint, h.broadcastHeight, &h.htlcResolution.ClaimOutpoint, h.broadcastHeight, true,
) )
if err != nil { if err != nil {
return nil, err return nil, err
@ -820,7 +820,7 @@ func (h *htlcOutgoingContestResolver) Resolve() (ContractResolver, error) {
// the remote party sweeps with the pre-image, we'll be notified. // the remote party sweeps with the pre-image, we'll be notified.
spendNtfn, err := h.Notifier.RegisterSpendNtfn( spendNtfn, err := h.Notifier.RegisterSpendNtfn(
&outPointToWatch, &outPointToWatch,
h.broadcastHeight, h.broadcastHeight, true,
) )
if err != nil { if err != nil {
return nil, err return nil, err
@ -1316,7 +1316,7 @@ func (c *commitSweepResolver) Resolve() (ContractResolver, error) {
// until the commitment output has been spent. // until the commitment output has been spent.
spendNtfn, err := c.Notifier.RegisterSpendNtfn( spendNtfn, err := c.Notifier.RegisterSpendNtfn(
&c.commitResolution.SelfOutPoint, &c.commitResolution.SelfOutPoint,
c.broadcastHeight, c.broadcastHeight, true,
) )
if err != nil { if err != nil {
return nil, err return nil, err