Send proper config based on vm type

Author: Łukasz Gąsior

src/main/scala/io/iohk/ethereum/extvm/ExtVMInterface.scala

@@ -7,13 +7,13 @@ import akka.stream.{ActorMaterializer, OverflowStrategy}
 import akka.stream.scaladsl.{Framing, Keep, Sink, SinkQueueWithCancel, Source, SourceQueueWithComplete, Tcp}
 import akka.util.ByteString
 import io.iohk.ethereum.ledger.{InMemoryWorldStateProxy, InMemoryWorldStateProxyStorage}
-import io.iohk.ethereum.utils.BlockchainConfig
+import io.iohk.ethereum.utils.{BlockchainConfig, VmConfig}
 import io.iohk.ethereum.vm._
 
 import scala.annotation.tailrec
 import scala.util.{Failure, Success, Try}
 
-class ExtVMInterface(host: String, port: Int, blockchainConfig: BlockchainConfig, testMode: Boolean)(implicit system: ActorSystem)
+class ExtVMInterface(externaVmConfig: VmConfig.ExternalConfig, blockchainConfig: BlockchainConfig, testMode: Boolean)(implicit system: ActorSystem)
   extends VM[InMemoryWorldStateProxy, InMemoryWorldStateProxyStorage]{
 
   private implicit val materializer = ActorMaterializer()
@@ -29,7 +29,7 @@ class ExtVMInterface(host: String, port: Int, blockchainConfig: BlockchainConfig
   private def initConnection(): Unit = {
     close()
 
-    val connection = Tcp().outgoingConnection(host, port)
+    val connection = Tcp().outgoingConnection(externaVmConfig.host, externaVmConfig.port)
 
     val (connOut, connIn) = Source.queue[ByteString](QueueBufferSize, OverflowStrategy.dropTail)
       .via(connection)
@@ -41,7 +41,7 @@ class ExtVMInterface(host: String, port: Int, blockchainConfig: BlockchainConfig
     out = Some(connOut)
     in = Some(connIn)
 
-    val client = new VMClient(new MessageHandler(connIn, connOut), testMode)
+    val client = new VMClient(externaVmConfig, new MessageHandler(connIn, connOut), testMode)
     client.sendHello(ApiVersionProvider.version, blockchainConfig)
     //TODO: await hello response, check version
 

src/main/scala/io/iohk/ethereum/extvm/VMClient.scala

@@ -5,7 +5,7 @@ import io.iohk.ethereum.vm.{WorldStateProxy, _}
 import Implicits._
 import akka.util.ByteString
 import io.iohk.ethereum.domain._
-import io.iohk.ethereum.utils.{BlockchainConfig, Logger}
+import io.iohk.ethereum.utils.{BlockchainConfig, Logger, VmConfig}
 
 import scala.annotation.tailrec
 
@@ -14,13 +14,17 @@ import scala.annotation.tailrec
   *                 This is useful to override configuration for each test, rather than to recreate the VM.
   */
 class VMClient(
+    externalVmConfig: VmConfig.ExternalConfig,
     messageHandler: MessageHandler,
     testMode: Boolean)
   extends Logger {
 
   def sendHello(version: String, blockchainConfig: BlockchainConfig): Unit = {
     val config = BlockchainConfigForEvm(blockchainConfig)
-    val configMsg = msg.Hello.Config.EthereumConfig(buildEthereumConfigMsg(BlockchainConfigForEvm(blockchainConfig)))
+    val configMsg = externalVmConfig.vmType match {
+      case VmConfig.ExternalConfig.VmTypeIele => msg.Hello.Config.IeleConfig(buildIeleConfigMsg())
+      case _ => msg.Hello.Config.EthereumConfig(buildEthereumConfigMsg(config))
+    }
     val helloMsg = msg.Hello(version, configMsg)
     messageHandler.sendMessage(helloMsg)
   }
@@ -154,6 +158,9 @@ class VMClient(
       accountStartNonce = blockchainConfig.accountStartNonce
     )
 
+  private def buildIeleConfigMsg(): msg.IeleConfig =
+    msg.IeleConfig()
+
   private def buildBlockHeaderMsg(header: BlockHeader): msg.BlockHeader =
     msg.BlockHeader(
       beneficiary = header.beneficiary,

src/main/scala/io/iohk/ethereum/nodebuilder/VmSetup.scala

@@ -19,7 +19,7 @@ object VmSetup {
 
       case (External, Some(extConf)) =>
         startExternalVm(extConf)
-        new ExtVMInterface(extConf.host, extConf.port, blockchainConfig, testMode)
+        new ExtVMInterface(extConf, blockchainConfig, testMode)
 
       case _ =>
         throw new RuntimeException("Missing vm.external config for external VM")

src/main/scala/io/iohk/ethereum/utils/Config.scala

@@ -369,12 +369,22 @@ object VmConfig {
     case object External extends VmMode
   }
 
+  object ExternalConfig {
+    val VmTypeIele = "iele"
+    val VmTypeKevm = "kevm"
+    val VmTypeMantis = "mantis"
+    val VmTypeNone = "none"
+
+    val supportedVmTypes = Set(VmTypeIele, VmTypeKevm, VmTypeMantis, VmTypeNone)
+  }
+
   case class ExternalConfig(vmType: String, executablePath: Option[String], host: String, port: Int)
 
   def apply(mpConfig: TypesafeConfig): VmConfig = {
     def parseExternalConfig(): ExternalConfig = {
+      import ExternalConfig._
+
       val extConf = mpConfig.getConfig("vm.external")
-      val supportedVmTypes = Set("iele", "kevm", "mantis", "none")
       val vmType = extConf.getString("vm-type").toLowerCase
       require(supportedVmTypes.contains(vmType), "vm.external.vm-type must be one of: " + supportedVmTypes.mkString(", "))
 

src/test/scala/io/iohk/ethereum/extvm/VMClientSpec.scala

@@ -4,7 +4,7 @@ import akka.util.ByteString
 import com.trueaccord.scalapb.GeneratedMessageCompanion
 import io.iohk.ethereum.domain.{Account, Address, UInt256}
 import io.iohk.ethereum.extvm.msg.CallContext.Config
-import io.iohk.ethereum.utils.BlockchainConfig
+import io.iohk.ethereum.utils.{BlockchainConfig, VmConfig}
 import io.iohk.ethereum.vm.utils.MockVmInput
 import io.iohk.ethereum.vm._
 import org.scalamock.scalatest.MockFactory
@@ -188,7 +188,9 @@ class VMClientSpec extends FlatSpec with Matchers with MockFactory {
     val resultQueryMsg = msg.VMQuery(query = msg.VMQuery.Query.CallResult(callResultMsg))
 
     val messageHandler = mock[MessageHandler]
-    val vmClient = new VMClient(messageHandler, testMode = false)
+
+    val externalVmConfig = VmConfig.ExternalConfig("mantis", None, "127.0.0.1", 0)
+    val vmClient = new VMClient(externalVmConfig, messageHandler, testMode = false)
   }
 
 }