From 92cf397d1d93bfb6cb48dedc5203d5c499566a86 Mon Sep 17 00:00:00 2001 From: Thomas HUET Date: Wed, 10 Nov 2021 16:25:24 +0100 Subject: [PATCH] Fix integration test --- .../fr/acinq/eclair/integration/ChannelIntegrationSpec.scala | 2 +- .../scala/fr/acinq/eclair/integration/IntegrationSpec.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eclair-core/src/test/scala/fr/acinq/eclair/integration/ChannelIntegrationSpec.scala b/eclair-core/src/test/scala/fr/acinq/eclair/integration/ChannelIntegrationSpec.scala index 165c1da6de..491c267735 100644 --- a/eclair-core/src/test/scala/fr/acinq/eclair/integration/ChannelIntegrationSpec.scala +++ b/eclair-core/src/test/scala/fr/acinq/eclair/integration/ChannelIntegrationSpec.scala @@ -534,7 +534,7 @@ class StandardChannelIntegrationSpec extends ChannelIntegrationSpec { address_opt = Some(HostAndPort.fromParts(funder.nodeParams.publicAddresses.head.socketAddress.getHostString, funder.nodeParams.publicAddresses.head.socketAddress.getPort)), sender.ref.toTyped )) - sender.expectMsgAnyOf(30 seconds, PeerConnection.ConnectionResult.Connected, PeerConnection.ConnectionResult.AlreadyConnected) + sender.expectMsgType[PeerConnection.ConnectionResult.HasConnection](30 seconds) fundee.register ! Register.Forward(sender.ref, channelId, CMD_GETSTATE(ActorRef.noSender)) val fundeeState = sender.expectMsgType[RES_GETSTATE[ChannelState]].state diff --git a/eclair-core/src/test/scala/fr/acinq/eclair/integration/IntegrationSpec.scala b/eclair-core/src/test/scala/fr/acinq/eclair/integration/IntegrationSpec.scala index e844b02b6a..94923246a6 100644 --- a/eclair-core/src/test/scala/fr/acinq/eclair/integration/IntegrationSpec.scala +++ b/eclair-core/src/test/scala/fr/acinq/eclair/integration/IntegrationSpec.scala @@ -158,7 +158,7 @@ abstract class IntegrationSpec extends TestKitBaseClass with BitcoindService wit address_opt = Some(HostAndPort.fromParts(address.socketAddress.getHostString, address.socketAddress.getPort)), sender.ref.toTyped )) - sender.expectMsgAnyOf(10 seconds, PeerConnection.ConnectionResult.Connected, PeerConnection.ConnectionResult.AlreadyConnected) + sender.expectMsgType[PeerConnection.ConnectionResult.HasConnection](10 seconds) sender.send(node1.switchboard, Peer.OpenChannel( remoteNodeId = node2.nodeParams.nodeId, fundingSatoshis = fundingSatoshis,