txnotifier: delete ntfn by confirm height always

When we cancel a confirmation request, we should remove the request from
the height map regardless of the current height. Otherwise we end up in
the situation when the height is reached, the notification is attempted
sent which results in a crash.
This commit is contained in:
Johan T. Halseth 2020-09-16 10:46:12 +02:00
parent 3a12b5867f
commit 2665836fa3
No known key found for this signature in database
GPG Key ID: 15BAADA29DA20D26

@ -763,9 +763,7 @@ func (n *TxNotifier) CancelConf(confRequest ConfRequest, confID uint64) {
if confSet.details != nil { if confSet.details != nil {
confHeight := confSet.details.BlockHeight + confHeight := confSet.details.BlockHeight +
ntfn.NumConfirmations - 1 ntfn.NumConfirmations - 1
if confHeight <= n.currentHeight { delete(n.ntfnsByConfirmHeight[confHeight], ntfn)
delete(n.ntfnsByConfirmHeight[confHeight], ntfn)
}
} }
} }