(fixup) quitChan

Author: starius

staticaddr/deposit/fsm.go

@@ -141,6 +141,7 @@ type FSM struct {
 
 	blockNtfnChan chan uint32
 
+	// quitChan stops after the FSM stops consuming blockNtfnChan.
 	quitChan chan struct{}
 
 	finalizedDepositChan chan wire.OutPoint
@@ -195,16 +196,15 @@ func NewFSM(ctx context.Context, deposit *Deposit, cfg *ManagerConfig,
 	depoFsm.ActionEntryFunc = depoFsm.updateDeposit
 
 	go func() {
+		defer close(depoFsm.quitChan)
+
 		for {
 			select {
 			case currentHeight := <-depoFsm.blockNtfnChan:
 				depoFsm.handleBlockNotification(
 					ctx, currentHeight,
 				)
 
-			case <-depoFsm.quitChan:
-				return
-
 			case <-ctx.Done():
 				return
 			}

staticaddr/deposit/manager.go

@@ -132,31 +132,30 @@ func (m *Manager) Run(ctx context.Context) error {
 		case height := <-newBlockChan:
 			// Inform all active deposits about a new block arrival.
 			m.mu.Lock()
+			activeDeposits := make([]*FSM, 0, len(m.activeDeposits))
 			for _, fsm := range m.activeDeposits {
+				activeDeposits = append(activeDeposits, fsm)
+			}
+			m.mu.Unlock()
+
+			for _, fsm := range activeDeposits {
 				select {
 				case fsm.blockNtfnChan <- uint32(height):
 
+				case <-fsm.quitChan:
+					continue
+
 				case <-ctx.Done():
 					return ctx.Err()
 				}
 			}
-			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.
 			m.mu.Lock()
-			if fsm := m.activeDeposits[outpoint]; fsm != nil {
-				select {
-				case fsm.quitChan <- struct{}{}:
-
-				case <-ctx.Done():
-					return ctx.Err()
-				}
-			}
-
 			delete(m.activeDeposits, outpoint)
 			m.mu.Unlock()