From ade9ca012139ebf37814cedb11206d6c810ffdfb Mon Sep 17 00:00:00 2001 From: pm47 Date: Fri, 10 Mar 2017 16:47:48 +0100 Subject: [PATCH] ignoring INPUT_DISCONNECTED in CLOSED state --- .../main/scala/fr/acinq/eclair/channel/Channel.scala | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/eclair-node/src/main/scala/fr/acinq/eclair/channel/Channel.scala b/eclair-node/src/main/scala/fr/acinq/eclair/channel/Channel.scala index f32807d86..5b6b7f6fa 100644 --- a/eclair-node/src/main/scala/fr/acinq/eclair/channel/Channel.scala +++ b/eclair-node/src/main/scala/fr/acinq/eclair/channel/Channel.scala @@ -748,6 +748,8 @@ class Channel(nodeParams: NodeParams, remoteNodeId: PublicKey, blockchain: Actor case Event(StateTimeout, _) => log.info("shutting down") stop(FSM.Normal) + + case Event(INPUT_DISCONNECTED, _) => stay } when(OFFLINE) { @@ -813,19 +815,19 @@ class Channel(nodeParams: NodeParams, remoteNodeId: PublicKey, blockchain: Actor case Event(CMD_GETSTATE, _) => sender ! stateName - goto(stateName) + stay case Event(CMD_GETSTATEDATA, _) => sender ! stateData - goto(stateName) + stay case Event(CMD_GETINFO, _) => val channelId = Helpers.getChannelId(stateData) sender ! RES_GETINFO(remoteNodeId, channelId, stateName, stateData) - goto(stateName) + stay // we only care about this event in NORMAL and SHUTDOWN state, and we never unregister to the event stream - case Event(CurrentBlockCount(_), _) => goto(stateName) + case Event(CurrentBlockCount(_), _) => stay } onTransition {