[ETCM-260] Fix merge conflicts

Author: KonradStaniec

src/it/scala/io/iohk/ethereum/sync/util/CommonFakePeer.scala

@@ -18,7 +18,7 @@ import io.iohk.ethereum.ledger.InMemoryWorldStateProxy
 import io.iohk.ethereum.mpt.MerklePatriciaTrie
 import io.iohk.ethereum.network.EtcPeerManagerActor.PeerInfo
 import io.iohk.ethereum.network.PeerManagerActor.{FastSyncHostConfiguration, PeerConfiguration}
-import io.iohk.ethereum.network.discovery.Node
+import io.iohk.ethereum.network.discovery.{DiscoveryConfig, Node}
 import io.iohk.ethereum.network.discovery.PeerDiscoveryManager.{DiscoveredNodesInfo, DiscoveryNodeInfo}
 import io.iohk.ethereum.network.handshaker.{EtcHandshaker, EtcHandshakerConfiguration, Handshaker}
 import io.iohk.ethereum.network.p2p.EthereumMessageDecoder
@@ -94,6 +94,7 @@ abstract class CommonFakePeer(peerName: String, fakePeerCustomConfig: FakePeerCu
       RocksDbDataSource(getRockDbTestConfig(tempDir.toAbsolutePath.toString), Namespaces.nsSeq)
   }
   lazy val blockchainConfig = Config.blockchains.blockchainConfig
+  lazy val discoveryConfig = DiscoveryConfig(Config.config, blockchainConfig.bootstrapNodes)
 
   /**
     * Default persist interval is 20s, which is too long for tests. As in all tests we treat peer as connected when
@@ -171,7 +172,8 @@ abstract class CommonFakePeer(peerName: String, fakePeerCustomConfig: FakePeerCu
       knownNodesManager,
       handshaker,
       authHandshaker,
-      EthereumMessageDecoder
+      EthereumMessageDecoder,
+      discoveryConfig
     ),
     "peer-manager"
   )

src/it/scala/io/iohk/ethereum/txExecTest/util/DumpChainApp.scala

@@ -27,6 +27,7 @@ import org.bouncycastle.util.encoders.Hex
 
 import scala.concurrent.duration._
 import io.iohk.ethereum.domain.BlockHeader.HeaderExtraFields.HefEmpty
+import io.iohk.ethereum.network.discovery.DiscoveryConfig
 
 object DumpChainApp extends App with NodeKeyBuilder with SecureRandomBuilder with AuthHandshakerBuilder {
   val conf = ConfigFactory.load("txExecTest/chainDump.conf")
@@ -37,6 +38,7 @@ object DumpChainApp extends App with NodeKeyBuilder with SecureRandomBuilder wit
   val maxBlocks = conf.getInt("maxBlocks")
 
   val blockchainConfig = Config.blockchains.blockchainConfig
+  val discoveryConfig = DiscoveryConfig(Config.config, blockchainConfig.bootstrapNodes)
 
   val peerConfig = new PeerConfiguration {
     override val rlpxConfiguration: RLPxConfiguration = Config.Network.peer.rlpxConfiguration
@@ -94,7 +96,8 @@ object DumpChainApp extends App with NodeKeyBuilder with SecureRandomBuilder wit
       knownNodesManager = actorSystem.deadLetters, // TODO: fixme
       handshaker = handshaker,
       authHandshaker = authHandshaker,
-      messageDecoder = EthereumMessageDecoder
+      messageDecoder = EthereumMessageDecoder,
+      discoveryConfig
     ),
     "peer-manager"
   )