staticaddr: quit deposit fsm handler when finialized

Author: hieblmi

staticaddr/deposit/fsm.go

@@ -141,6 +141,8 @@ type FSM struct {
 
 	blockNtfnChan chan uint32
 
+	quitChan chan struct{}
+
 	finalizedDepositChan chan wire.OutPoint
 }
 
@@ -167,6 +169,7 @@ func NewFSM(ctx context.Context, deposit *Deposit, cfg *ManagerConfig,
 		params:               params,
 		address:              address,
 		blockNtfnChan:        make(chan uint32),
+		quitChan:             make(chan struct{}),
 		finalizedDepositChan: finalizedDepositChan,
 	}
 
@@ -199,6 +202,9 @@ func NewFSM(ctx context.Context, deposit *Deposit, cfg *ManagerConfig,
 					ctx, currentHeight,
 				)
 
+			case <-depoFsm.quitChan:
+				return
+
 			case <-ctx.Done():
 				return
 			}

staticaddr/deposit/manager.go

@@ -141,10 +141,21 @@ func (m *Manager) Run(ctx context.Context) error {
 				}
 			}
 			m.mu.Unlock()
+
 		case outpoint := <-m.finalizedDepositChan:
 			// If deposits notify us about their finalization, we
+			// quit the block notification handler of the fsm,
 			// update the manager's internal state and flush the
 			// finalized deposit from memory.
+			if fsm := m.activeDeposits[outpoint]; fsm != nil {
+				select {
+				case fsm.quitChan <- struct{}{}:
+
+				case <-ctx.Done():
+					return ctx.Err()
+				}
+			}
+
 			m.mu.Lock()
 			delete(m.activeDeposits, outpoint)
 			m.mu.Unlock()