mirrors/eclair
1
0
Fork 0
mirror of https://github.com/ACINQ/eclair.git synced 2025-02-24 06:47:46 +01:00
Code Issues Projects Releases Wiki Activity

Minor: catch harmless unhandled events (#1407)

Browse source 
* minor: catch harmless unhandled events

This prevents unnecessary warnings to clog up the logs.

* fix race condition in test

Changing the fake ip address from 1.2.3.4:42000 to localhost:42000
in 32f15c85eb made the dummy connection
fail much faster, creating a race in the test. Reverting to the previous
ip and increasing the timeout should improve things a bit.
This commit is contained in:
Pierre-Marie Padiou 2020-05-05 12:09:16 +02:00 • committed by GitHub
parent 7e223e5f5e
commit e38f706c46
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
eclair-core/src/main/scala/fr/acinq/eclair/io/ReconnectionTask.scala
View file

@ -121,6 +121,10 @@ class ReconnectionTask(nodeParams: NodeParams, remoteNodeId: PublicKey) extends
}
whenUnhandled {
case Event("connected", _) => stay
case Event(Status.Failure(_: Client.ConnectionFailed), _) => stay
case Event(TickReconnect, _) => stay
case Event(Peer.Connect(_, hostAndPort_opt), _) =>

6
eclair-core/src/test/scala/fr/acinq/eclair/io/ReconnectionTaskSpec.scala
View file

@ -33,7 +33,7 @@ import scala.concurrent.duration._
class ReconnectionTaskSpec extends TestKitBaseClass with FixtureAnyFunSuiteLike with StateTestsHelperMethods {
val fakeIPAddress = NodeAddress.fromParts("localhost", 42000).get
val fakeIPAddress = NodeAddress.fromParts("1.2.3.4", 42000).get
val channels = Map(Peer.FinalChannelId(randomBytes32) -> system.deadLetters)
val PeerNothingData = Peer.Nothing
@ -134,13 +134,13 @@ class ReconnectionTaskSpec extends TestKitBaseClass with FixtureAnyFunSuiteLike
probe.send(reconnectionTask, ReconnectionTask.TickReconnect) // we send it manually in order to not have to actually wait (duplicates don't matter since we look at transitions sequentially)
val TransitionWithData(ReconnectionTask.WAITING, ReconnectionTask.CONNECTING, _, _) = monitor.expectMsgType[TransitionWithData]
val TransitionWithData(ReconnectionTask.CONNECTING, ReconnectionTask.WAITING, _, waitingData1: WaitingData) = monitor.expectMsgType[TransitionWithData]
val TransitionWithData(ReconnectionTask.CONNECTING, ReconnectionTask.WAITING, _, waitingData1: WaitingData) = monitor.expectMsgType[TransitionWithData](60 seconds)
assert(waitingData1.nextReconnectionDelay === (waitingData0.nextReconnectionDelay * 2))
probe.send(reconnectionTask, ReconnectionTask.TickReconnect)
val TransitionWithData(ReconnectionTask.WAITING, ReconnectionTask.CONNECTING, _, _) = monitor.expectMsgType[TransitionWithData]
val TransitionWithData(ReconnectionTask.CONNECTING, ReconnectionTask.WAITING, _, waitingData2: WaitingData) = monitor.expectMsgType[TransitionWithData]
val TransitionWithData(ReconnectionTask.CONNECTING, ReconnectionTask.WAITING, _, waitingData2: WaitingData) = monitor.expectMsgType[TransitionWithData](60 seconds)
assert(waitingData2.nextReconnectionDelay === (waitingData0.nextReconnectionDelay * 4))
probe.send(reconnectionTask, ReconnectionTask.TickReconnect)