staticaddr: withdrawal changes to be squashed

Author: hieblmi

staticaddr/deposit/manager.go

@@ -146,9 +146,9 @@ func (m *Manager) Run(ctx context.Context, currentHeight uint32) error {
 			}
 		case outpoint := <-m.finalizedDepositChan:
 			// If deposits notify us about their finalization, we
-			// update the manager's internal state and flush the
+			// update the manager's internal state by flushing the
 			// finalized deposit from memory.
-			m.finalizeDeposit(outpoint)
+			delete(m.activeDeposits, outpoint)
 
 		case err = <-newBlockErrChan:
 			return err
@@ -403,12 +403,6 @@ func (m *Manager) startDepositFsm(ctx context.Context, deposit *Deposit) error {
 	return nil
 }
 
-func (m *Manager) finalizeDeposit(outpoint wire.OutPoint) {
-	m.mu.Lock()
-	delete(m.activeDeposits, outpoint)
-	m.mu.Unlock()
-}
-
 // GetActiveDepositsInState returns all active deposits. This function is called
 // on a client restart before the manager is fully initialized, hence we don't
 // have to lock the deposits.