fixup! Explicit channel type in channel open

Author: t-bast

eclair-core/src/main/scala/fr/acinq/eclair/channel/ChannelFeatures.scala

@@ -71,20 +71,6 @@ object ChannelFeatures {
     ChannelFeatures(allFeatures: _*)
   }
 
-  /** Pick the channel features that should be used based on local and remote feature bits. */
-  def pickChannelFeatures(localFeatures: Features, remoteFeatures: Features): ChannelFeatures = {
-    // NB: we don't include features that can be safely activated/deactivated without impacting the channel's operation,
-    // such as option_dataloss_protect or option_shutdown_anysegwit.
-    val availableFeatures = Set[Feature](
-      StaticRemoteKey,
-      Wumbo,
-      AnchorOutputs,
-      OptionUpfrontShutdownScript
-    ).filter(f => Features.canUseFeature(localFeatures, remoteFeatures, f))
-
-    ChannelFeatures(availableFeatures)
-  }
-
 }
 
 /** A channel type is a specific set of even feature bits that represent persistent channel features as defined in Bolt 2. */

eclair-core/src/test/scala/fr/acinq/eclair/channel/ChannelTypesSpec.scala

@@ -54,29 +54,6 @@ class ChannelTypesSpec extends TestKitBaseClass with AnyFunSuiteLike with Channe
     assert(!anchorOutputsChannel.paysDirectlyToWallet)
   }
 
-  test("pick channel features based on local and remote features") {
-    case class TestCase(localFeatures: Features, remoteFeatures: Features, expectedChannelFeatures: ChannelFeatures)
-    val testCases = Seq(
-      TestCase(Features.empty, Features.empty, ChannelFeatures()),
-      TestCase(Features(StaticRemoteKey -> Optional), Features.empty, ChannelFeatures()),
-      TestCase(Features.empty, Features(StaticRemoteKey -> Optional), ChannelFeatures()),
-      TestCase(Features.empty, Features(StaticRemoteKey -> Mandatory), ChannelFeatures()),
-      TestCase(Features(StaticRemoteKey -> Optional, Wumbo -> Mandatory), Features(Wumbo -> Mandatory), ChannelFeatures(Wumbo)),
-      TestCase(Features(StaticRemoteKey -> Optional), Features(StaticRemoteKey -> Optional), ChannelFeatures(StaticRemoteKey)),
-      TestCase(Features(StaticRemoteKey -> Optional), Features(StaticRemoteKey -> Mandatory), ChannelFeatures(StaticRemoteKey)),
-      TestCase(Features(StaticRemoteKey -> Optional, Wumbo -> Optional), Features(StaticRemoteKey -> Mandatory, Wumbo -> Mandatory), ChannelFeatures(StaticRemoteKey, Wumbo)),
-      TestCase(Features(StaticRemoteKey -> Optional, AnchorOutputs -> Optional), Features(StaticRemoteKey -> Optional), ChannelFeatures(StaticRemoteKey)),
-      TestCase(Features(StaticRemoteKey -> Mandatory, AnchorOutputs -> Optional), Features(StaticRemoteKey -> Optional, AnchorOutputs -> Optional), ChannelFeatures(StaticRemoteKey, AnchorOutputs)),
-      TestCase(Features(OptionUpfrontShutdownScript -> Optional), Features.empty, ChannelFeatures()),
-      TestCase(Features(OptionUpfrontShutdownScript -> Optional), Features(OptionUpfrontShutdownScript -> Optional), ChannelFeatures(OptionUpfrontShutdownScript)),
-      TestCase(Features(StaticRemoteKey -> Optional, AnchorOutputs -> Optional, OptionUpfrontShutdownScript -> Optional), Features(StaticRemoteKey -> Optional, AnchorOutputs -> Optional, OptionUpfrontShutdownScript -> Optional), ChannelFeatures(StaticRemoteKey, AnchorOutputs, OptionUpfrontShutdownScript)),
-    )
-
-    for (testCase <- testCases) {
-      assert(ChannelFeatures.pickChannelFeatures(testCase.localFeatures, testCase.remoteFeatures) === testCase.expectedChannelFeatures)
-    }
-  }
-
   test("pick channel type based on local and remote features") {
     case class TestCase(localFeatures: Features, remoteFeatures: Features, expectedChannelType: ChannelType)
     val testCases = Seq(