diff --git a/eclair-core/src/main/scala/fr/acinq/eclair/io/OpenChannelInterceptor.scala b/eclair-core/src/main/scala/fr/acinq/eclair/io/OpenChannelInterceptor.scala index b5870db55c..3a11a10c02 100644 --- a/eclair-core/src/main/scala/fr/acinq/eclair/io/OpenChannelInterceptor.scala +++ b/eclair-core/src/main/scala/fr/acinq/eclair/io/OpenChannelInterceptor.scala @@ -149,12 +149,12 @@ private class OpenChannelInterceptor(peer: ActorRef[Any], private def sanityCheckNonInitiator(request: OpenChannelNonInitiator): Behavior[Command] = { validateRemoteChannelType(request.temporaryChannelId, request.channelFlags, request.channelType_opt, request.localFeatures, request.remoteFeatures) match { case Right(_: ChannelTypes.Standard) => - context.log.warn("rejecting new obsolete incoming channels") + context.log.warn("rejecting incoming channel: anchor outputs must be used for new channels") sendFailure("rejecting incoming channel: anchor outputs must be used for new channels", request) waitForRequest() case Right(_: ChannelTypes.StaticRemoteKey) if !nodeParams.channelConf.acceptIncomingStaticRemoteKeyChannels => - context.log.warn("rejecting new static_remote_key incoming channels") - sendFailure("rejecting new static_remote_key incoming channels", request) + context.log.warn("rejecting static_remote_key incoming static_remote_key channels") + sendFailure("rejecting incoming static_remote_key channel: anchor outputs must be used for new channels", request) waitForRequest() case Right(channelType) => val dualFunded = Features.canUseFeature(request.localFeatures, request.remoteFeatures, Features.DualFunding) diff --git a/eclair-core/src/test/scala/fr/acinq/eclair/io/OpenChannelInterceptorSpec.scala b/eclair-core/src/test/scala/fr/acinq/eclair/io/OpenChannelInterceptorSpec.scala index d2caea2f3f..3231ce2ad2 100644 --- a/eclair-core/src/test/scala/fr/acinq/eclair/io/OpenChannelInterceptorSpec.scala +++ b/eclair-core/src/test/scala/fr/acinq/eclair/io/OpenChannelInterceptorSpec.scala @@ -171,7 +171,7 @@ class OpenChannelInterceptorSpec extends ScalaTestWithActorTestKit(ConfigFactory val openChannelNonInitiator = OpenChannelNonInitiator(remoteNodeId, Left(openChannel), staticRemoteKeyFeatures, staticRemoteKeyFeatures, peerConnection.ref, remoteAddress) openChannelInterceptor ! openChannelNonInitiator - assert(peer.expectMessageType[OutgoingMessage].msg.asInstanceOf[Error].toAscii.contains("rejecting new static_remote_key incoming channels")) + assert(peer.expectMessageType[OutgoingMessage].msg.asInstanceOf[Error].toAscii.contains("rejecting incoming static_remote_key channel: anchor outputs must be used for new channels")) eventListener.expectMessageType[ChannelAborted] }