mirrors/eclair
1
0
Fork 0
mirror of https://github.com/ACINQ/eclair.git synced 2024-11-20 18:50:43 +01:00
Code Issues Projects Releases Wiki Activity

simplified error handling when there are no commitments yet

Browse Source
This commit is contained in:
pm47 2017-02-16 15:04:30 +01:00
parent b4c0494d9f
commit 002464d2be
1 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
eclair-node/src/main/scala/fr/acinq/eclair/channel/Channel.scala
View File

@ -146,9 +146,7 @@ class Channel(val remote: ActorRef, val blockchain: ActorRef, router: ActorRef,
case Event(CMD_CLOSE(_), _) => goto(CLOSED) case Event(CMD_CLOSE(_), _) => goto(CLOSED)
case Event(e: Error, _) => case Event(e: Error, _) => handleRemoteErrorNoCommitments(e)
log.error(s"peer sent $e, closing connection") // see bolt #2: A node MUST fail the connection if it receives an err message
goto(CLOSED)
}) })
when(WAIT_FOR_ACCEPT_CHANNEL)(handleExceptions { when(WAIT_FOR_ACCEPT_CHANNEL)(handleExceptions {
@ -188,9 +186,7 @@ class Channel(val remote: ActorRef, val blockchain: ActorRef, router: ActorRef,
case Event(CMD_CLOSE(_), _) => goto(CLOSED) case Event(CMD_CLOSE(_), _) => goto(CLOSED)
case Event(e: Error, _) => case Event(e: Error, _) => handleRemoteErrorNoCommitments(e)
log.error(s"peer sent $e, closing connection") // see bolt #2: A node MUST fail the connection if it receives an err message
goto(CLOSED)
}) })
when(WAIT_FOR_FUNDING_CREATED_INTERNAL)(handleExceptions { when(WAIT_FOR_FUNDING_CREATED_INTERNAL)(handleExceptions {
@ -212,9 +208,7 @@ class Channel(val remote: ActorRef, val blockchain: ActorRef, router: ActorRef,
case Event(CMD_CLOSE(_), _) => goto(CLOSED) case Event(CMD_CLOSE(_), _) => goto(CLOSED)
case Event(e: Error, _) => case Event(e: Error, _) => handleRemoteErrorNoCommitments(e)
log.error(s"peer sent $e, closing connection") // see bolt #2: A node MUST fail the connection if it receives an err message
goto(CLOSED)
}) })
when(WAIT_FOR_FUNDING_CREATED)(handleExceptions { when(WAIT_FOR_FUNDING_CREATED)(handleExceptions {
@ -256,9 +250,7 @@ class Channel(val remote: ActorRef, val blockchain: ActorRef, router: ActorRef,
case Event(CMD_CLOSE(_), _) => goto(CLOSED) case Event(CMD_CLOSE(_), _) => goto(CLOSED)
case Event(e: Error, _) => case Event(e: Error, _) => handleRemoteErrorNoCommitments(e)
log.error(s"peer sent $e, closing connection") // see bolt #2: A node MUST fail the connection if it receives an err message
goto(CLOSED)
}) })
when(WAIT_FOR_FUNDING_SIGNED)(handleExceptions { when(WAIT_FOR_FUNDING_SIGNED)(handleExceptions {
@ -291,9 +283,7 @@ class Channel(val remote: ActorRef, val blockchain: ActorRef, router: ActorRef,
case Event(CMD_CLOSE(_), _) => goto(CLOSED) case Event(CMD_CLOSE(_), _) => goto(CLOSED)
case Event(e: Error, _) => case Event(e: Error, _) => handleRemoteErrorNoCommitments(e)
log.error(s"peer sent $e, closing connection") // see bolt #2: A node MUST fail the connection if it receives an err message
goto(CLOSED)
}) })
when(WAIT_FOR_FUNDING_CONFIRMED)(handleExceptions { when(WAIT_FOR_FUNDING_CONFIRMED)(handleExceptions {
@ -319,7 +309,7 @@ class Channel(val remote: ActorRef, val blockchain: ActorRef, router: ActorRef,
case Event(WatchEventSpent(BITCOIN_FUNDING_SPENT, _), d: DATA_WAIT_FOR_FUNDING_LOCKED_INTERNAL) => handleInformationLeak(d) case Event(WatchEventSpent(BITCOIN_FUNDING_SPENT, _), d: DATA_WAIT_FOR_FUNDING_LOCKED_INTERNAL) => handleInformationLeak(d)
case Event(cmd: CMD_CLOSE, d: DATA_WAIT_FOR_FUNDING_LOCKED_INTERNAL) => spendLocalCurrent(d) case Event(CMD_CLOSE(_), d: DATA_WAIT_FOR_FUNDING_LOCKED_INTERNAL) => spendLocalCurrent(d)
case Event(e: Error, d: DATA_WAIT_FOR_FUNDING_LOCKED_INTERNAL) => handleRemoteError(e, d) case Event(e: Error, d: DATA_WAIT_FOR_FUNDING_LOCKED_INTERNAL) => handleRemoteError(e, d)
}) })
@ -347,7 +337,7 @@ class Channel(val remote: ActorRef, val blockchain: ActorRef, router: ActorRef,
case Event(WatchEventSpent(BITCOIN_FUNDING_SPENT, _), d: DATA_NORMAL) => handleInformationLeak(d) case Event(WatchEventSpent(BITCOIN_FUNDING_SPENT, _), d: DATA_NORMAL) => handleInformationLeak(d)
case Event(cmd: CMD_CLOSE, d: DATA_NORMAL) => spendLocalCurrent(d) case Event(CMD_CLOSE(_), d: DATA_NORMAL) => spendLocalCurrent(d)
case Event(e: Error, d: DATA_NORMAL) => handleRemoteError(e, d) case Event(e: Error, d: DATA_NORMAL) => handleRemoteError(e, d)
}) })
@ -372,7 +362,7 @@ class Channel(val remote: ActorRef, val blockchain: ActorRef, router: ActorRef,
case Event(WatchEventSpent(BITCOIN_FUNDING_SPENT, _), d: DATA_NORMAL) => handleInformationLeak(d) case Event(WatchEventSpent(BITCOIN_FUNDING_SPENT, _), d: DATA_NORMAL) => handleInformationLeak(d)
case Event(cmd: CMD_CLOSE, d: DATA_NORMAL) => spendLocalCurrent(d) case Event(CMD_CLOSE(_), d: DATA_NORMAL) => spendLocalCurrent(d)
case Event(e: Error, d: DATA_NORMAL) => handleRemoteError(e, d) case Event(e: Error, d: DATA_NORMAL) => handleRemoteError(e, d)
}) })
@ -781,6 +771,12 @@ class Channel(val remote: ActorRef, val blockchain: ActorRef, router: ActorRef,
spendLocalCurrent(d) spendLocalCurrent(d)
} }
def handleRemoteErrorNoCommitments(e: Error) = {
// when there is no commitment yet, we just go to CLOSED state in case an error occurs
log.error(s"peer sent $e, closing connection") // see bolt #2: A node MUST fail the connection if it receives an err message
goto(CLOSED)
}
def handleRemoteError(e: Error, d: HasCommitments) = { def handleRemoteError(e: Error, d: HasCommitments) = {
log.error(s"peer sent $e, closing connection") // see bolt #2: A node MUST fail the connection if it receives an err message log.error(s"peer sent $e, closing connection") // see bolt #2: A node MUST fail the connection if it receives an err message
spendLocalCurrent(d) spendLocalCurrent(d)