From db2b9fd9ff88a8efbf50a6d7370e598b94e289dc Mon Sep 17 00:00:00 2001 From: Olaoluwa Osuntokun Date: Fri, 19 Jan 2018 17:24:20 -0800 Subject: [PATCH] contractcourt: remove the existing ManuallyResolveChannel methiod MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We’re removing this method as it’s no longer needed, since the chainWatcher will properly handle on-chain co-op closes. --- contractcourt/chain_arbitrator.go | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/contractcourt/chain_arbitrator.go b/contractcourt/chain_arbitrator.go index 3b984a8d2..0fdcc1346 100644 --- a/contractcourt/chain_arbitrator.go +++ b/contractcourt/chain_arbitrator.go @@ -606,31 +606,10 @@ func (c *ChainArbitrator) WatchNewChannel(newChan *channeldb.OpenChannel) error return channelArb.Start() } -// ManuallyResolveChannel is a method to be called by outside sub-systems if a -// channel becomes fully resolved, but due to manual intervention. An example -// of such a manual intervention includes a cooperative channel closuer. -// -// TODO(roasbeef): remove after arbs watch chain for all actions directly -func (c *ChainArbitrator) ManuallyResolveChannel(chanPoint wire.OutPoint) error { - c.Lock() - defer c.Unlock() - - log.Infof("Manually resolving ChannelArbitrator for ChannelPoint(%v)", - chanPoint) - - channelArb, ok := c.activeChannels[chanPoint] - if !ok { - return fmt.Errorf("unable to find arbitrator for: %v", chanPoint) - } - - if err := channelArb.Stop(); err != nil { if err := channelArb.Start(); err != nil { return err } - delete(c.activeChannels, chanPoint) - - return channelArb.log.WipeHistory() return chainWatcher.Start() }