Fix config features test

ACINQ · Jun 2, 2020 · 2c070f9 · 2c070f9
1 parent 4065eae
commit 2c070f9
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/eclair-core/src/test/scala/fr/acinq/eclair/StartupSpec.scala b/eclair-core/src/test/scala/fr/acinq/eclair/StartupSpec.scala
@@ -22,10 +22,10 @@ import com.typesafe.config.{Config, ConfigFactory}
 import fr.acinq.bitcoin.Block
 import fr.acinq.bitcoin.Crypto.PublicKey
 import fr.acinq.eclair.FeatureSupport.Mandatory
-import fr.acinq.eclair.Features.{BasicMultiPartPayment, ChannelRangeQueries, ChannelRangeQueriesExtended, InitialRoutingSync, OptionDataLossProtect, PaymentSecret, VariableLengthOnion}
+import fr.acinq.eclair.Features._
 import fr.acinq.eclair.crypto.LocalKeyManager
-import scodec.bits.ByteVector
 import org.scalatest.funsuite.AnyFunSuite
+import scodec.bits.ByteVector
 
 import scala.jdk.CollectionConverters._
 import scala.util.Try
@@ -83,6 +83,10 @@ class StartupSpec extends AnyFunSuite {
   }
 
   test("NodeParams should fail if features are inconsistent") {
+    // Because of https://github.com/ACINQ/eclair/issues/1434, we need to remove the default features when falling back
+    // to the default configuration.
+    def finalizeConf(testCfg: Config): Config = testCfg.withFallback(defaultConf.withoutPath("features"))
+
     val legalFeaturesConf = ConfigFactory.parseMap(Map(
       s"features.${OptionDataLossProtect.rfcName}" -> "optional",
       s"features.${InitialRoutingSync.rfcName}" -> "optional",
@@ -104,9 +108,9 @@ class StartupSpec extends AnyFunSuite {
       s"features.${BasicMultiPartPayment.rfcName}" -> "optional"
     ).asJava)
 
-    assert(Try(makeNodeParamsWithDefaults(legalFeaturesConf.withFallback(defaultConf))).isSuccess)
-    assert(Try(makeNodeParamsWithDefaults(illegalButAllowedFeaturesConf.withFallback(defaultConf))).isSuccess)
-    assert(Try(makeNodeParamsWithDefaults(illegalFeaturesConf.withFallback(defaultConf))).isFailure)
+    assert(Try(makeNodeParamsWithDefaults(finalizeConf(legalFeaturesConf))).isSuccess)
+    assert(Try(makeNodeParamsWithDefaults(finalizeConf(illegalButAllowedFeaturesConf))).isSuccess)
+    assert(Try(makeNodeParamsWithDefaults(finalizeConf(illegalFeaturesConf))).isFailure)
   }
 
   test("parse human readable override features") {