[ETCM-355] Remove capabilities from EtcHandshakerConfiguration

input-output-hk · Jun 30, 2021 · 4aef984 · 4aef984
1 parent c627fe8
commit 4aef984
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 10 deletions.
diff --git a/src/it/scala/io/iohk/ethereum/sync/util/CommonFakePeer.scala b/src/it/scala/io/iohk/ethereum/sync/util/CommonFakePeer.scala
@@ -173,7 +173,6 @@ abstract class CommonFakePeer(peerName: String, fakePeerCustomConfig: FakePeerCu
       override val blockchainReader: BlockchainReader = CommonFakePeer.this.blockchainReader
       override val appStateStorage: AppStateStorage = storagesInstance.storages.appStateStorage
       override val blockchainConfig: BlockchainConfig = Config.blockchains.blockchainConfig
-      override val capabilities: List[Capability] = blockchainConfig.capabilities
     }
 
   lazy val handshaker: Handshaker[PeerInfo] = EtcHandshaker(handshakerConfiguration)

diff --git a/src/it/scala/io/iohk/ethereum/txExecTest/util/DumpChainApp.scala b/src/it/scala/io/iohk/ethereum/txExecTest/util/DumpChainApp.scala
@@ -100,7 +100,6 @@ object DumpChainApp
       override val blockchainReader: BlockchainReader = DumpChainApp.blockchainReader
       override val appStateStorage: AppStateStorage = storagesInstance.storages.appStateStorage
       override val blockchainConfig: BlockchainConfig = Config.blockchains.blockchainConfig
-      override val capabilities: List[Capability] = blockchainConfig.capabilities
     }
 
   lazy val handshaker: Handshaker[PeerInfo] = EtcHandshaker(handshakerConfiguration)

diff --git a/src/main/scala/io/iohk/ethereum/network/handshaker/EtcHandshaker.scala b/src/main/scala/io/iohk/ethereum/network/handshaker/EtcHandshaker.scala
@@ -37,6 +37,5 @@ trait EtcHandshakerConfiguration {
   val appStateStorage: AppStateStorage
   val peerConfiguration: PeerConfiguration
   val forkResolverOpt: Option[ForkResolver]
-  val capabilities: List[Capability]
   val blockchainConfig: BlockchainConfig
 }
diff --git a/src/main/scala/io/iohk/ethereum/network/handshaker/EtcHelloExchangeState.scala b/src/main/scala/io/iohk/ethereum/network/handshaker/EtcHelloExchangeState.scala
@@ -27,7 +27,7 @@ case class EtcHelloExchangeState(handshakerConfiguration: EtcHandshakerConfigura
   override def applyResponseMessage: PartialFunction[Message, HandshakerState[PeerInfo]] = { case hello: Hello =>
     log.debug("Protocol handshake finished with peer ({})", hello)
     // FIXME in principle this should be already negotiated
-    Capability.negotiate(hello.capabilities.toList, handshakerConfiguration.capabilities) match {
+    Capability.negotiate(hello.capabilities.toList, handshakerConfiguration.blockchainConfig.capabilities) match {
       case Some(ProtocolVersions.ETC64) => EtcNodeStatus64ExchangeState(handshakerConfiguration)
       case Some(ProtocolVersions.ETH63) => EtcNodeStatus63ExchangeState(handshakerConfiguration)
       case Some(ProtocolVersions.ETH64) => EthNodeStatus64ExchangeState(handshakerConfiguration)
@@ -56,7 +56,7 @@ case class EtcHelloExchangeState(handshakerConfiguration: EtcHandshakerConfigura
     Hello(
       p2pVersion = EtcHelloExchangeState.P2pVersion,
       clientId = Config.clientId,
-      capabilities = handshakerConfiguration.capabilities,
+      capabilities = handshakerConfiguration.blockchainConfig.capabilities,
       listenPort = listenPort,
       nodeId = ByteString(nodeStatus.nodeId)
     )

diff --git a/src/main/scala/io/iohk/ethereum/nodebuilder/NodeBuilder.scala b/src/main/scala/io/iohk/ethereum/nodebuilder/NodeBuilder.scala
@@ -219,7 +219,6 @@ trait HandshakerBuilder {
       override val blockchain: Blockchain = self.blockchain
       override val blockchainReader: BlockchainReader = self.blockchainReader
       override val appStateStorage: AppStateStorage = self.storagesInstance.storages.appStateStorage
-      override val capabilities: List[Capability] = self.blockchainConfig.capabilities
       override val blockchainConfig: BlockchainConfig = self.blockchainConfig
     }
 

diff --git a/src/test/scala/io/iohk/ethereum/network/handshaker/EtcHandshakerSpec.scala b/src/test/scala/io/iohk/ethereum/network/handshaker/EtcHandshakerSpec.scala
@@ -312,9 +312,8 @@ class EtcHandshakerSpec extends AnyFlatSpec with Matchers {
       override val peerConfiguration: PeerConfiguration = Config.Network.peer
       override val blockchain: Blockchain = TestSetup.this.blockchain
       override val appStateStorage: AppStateStorage = TestSetup.this.storagesInstance.storages.appStateStorage
-      override val capabilities: List[Capability] = pv
       override val blockchainReader: BlockchainReader = TestSetup.this.blockchainReader
-      override val blockchainConfig: BlockchainConfig = TestSetup.this.blockchainConfig
+      override val blockchainConfig: BlockchainConfig = TestSetup.this.blockchainConfig.copy(capabilities = pv)
     }
 
     val etcHandshakerConfigurationWithResolver = new MockEtcHandshakerConfiguration {

diff --git a/src/test/scala/io/iohk/ethereum/network/p2p/PeerActorSpec.scala b/src/test/scala/io/iohk/ethereum/network/p2p/PeerActorSpec.scala
@@ -565,8 +565,7 @@ class PeerActorSpec
       override val blockchain: Blockchain = self.blockchain
       override val blockchainReader: BlockchainReader = self.blockchainReader
       override val appStateStorage: AppStateStorage = self.storagesInstance.storages.appStateStorage
-      override val capabilities: List[Capability] = List(protocol)
-      override val blockchainConfig: BlockchainConfig = self.blockchainConfig
+      override val blockchainConfig: BlockchainConfig = self.blockchainConfig.copy(capabilities = List(protocol))
     }
 
     val handshaker = EtcHandshaker(handshakerConfiguration)