From c4369844622ba4df3c85aa7494aa445388ccc521 Mon Sep 17 00:00:00 2001
From: szymonsztuka <szymon.sztuka@yahoo.com>
Date: Mon, 16 Oct 2017 19:08:51 +0100
Subject: [PATCH] Merge from Corda master - fix compilation errors

---
 .idea/compiler.xml                                          | 3 +++
 README.md                                                   | 2 +-
 .../kotlin/net/corda/nodeapi/internal/serialization/Kryo.kt | 1 +
 .../main/kotlin/net/corda/node/internal/EnterpriseNode.kt   | 6 +++---
 .../net/corda/explorer/formatters/FlowInitiatorFormatter.kt | 3 ++-
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 4ecdc4bfee..bfeff657cb 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -108,6 +108,9 @@
       <module name="sgx-jvm_test" target="1.8" />
       <module name="sgx-signtool_main" target="1.8" />
       <module name="sgx-signtool_test" target="1.8" />
+      <module name="signing-server_integrationTest" target="1.8" />
+      <module name="signing-server_main" target="1.8" />
+      <module name="signing-server_test" target="1.8" />
       <module name="simm-valuation-demo_integrationTest" target="1.8" />
       <module name="simm-valuation-demo_main" target="1.8" />
       <module name="simm-valuation-demo_test" target="1.8" />
diff --git a/README.md b/README.md
index 3408574289..46b03d5320 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 ![Corda](https://www.corda.net/wp-content/uploads/2016/11/fg005_corda_b.png)
 
-<a href="https://ci-master.corda.r3cev.com/viewType.html?buildTypeId=CordaEnterprise_CordaBuild&tab=buildTypeStatusDiv"><img src="https://ci.corda.r3cev.com/app/rest/builds/buildType:Corda_CordaBuild/statusIcon"/></a>
+<a href="https://ci-master.corda.r3cev.com/viewType.html?buildTypeId=CordaEnterprise_Build&tab=buildTypeStatusDiv"><img src="https://ci.corda.r3cev.com/app/rest/builds/buildType:Corda_CordaBuild/statusIcon"/></a>
 
 # Corda Enterprise
 
diff --git a/node-api/src/main/kotlin/net/corda/nodeapi/internal/serialization/Kryo.kt b/node-api/src/main/kotlin/net/corda/nodeapi/internal/serialization/Kryo.kt
index 9e3192859f..4a82fe8d85 100644
--- a/node-api/src/main/kotlin/net/corda/nodeapi/internal/serialization/Kryo.kt
+++ b/node-api/src/main/kotlin/net/corda/nodeapi/internal/serialization/Kryo.kt
@@ -25,6 +25,7 @@ import net.corda.core.transactions.CoreTransaction
 import net.corda.core.transactions.NotaryChangeWireTransaction
 import net.corda.core.transactions.SignedTransaction
 import net.corda.core.transactions.WireTransaction
+import net.corda.core.utilities.SgxSupport
 import org.bouncycastle.asn1.ASN1InputStream
 import org.bouncycastle.asn1.x500.X500Name
 import org.bouncycastle.cert.X509CertificateHolder
diff --git a/node/src/main/kotlin/net/corda/node/internal/EnterpriseNode.kt b/node/src/main/kotlin/net/corda/node/internal/EnterpriseNode.kt
index f883c21f9c..8b28ed9667 100644
--- a/node/src/main/kotlin/net/corda/node/internal/EnterpriseNode.kt
+++ b/node/src/main/kotlin/net/corda/node/internal/EnterpriseNode.kt
@@ -12,8 +12,8 @@ import org.fusesource.jansi.Ansi
 import org.fusesource.jansi.AnsiConsole
 import java.io.IOException
 
-class EnterpriseNode(configuration: FullNodeConfiguration, advertisedServices: Set<ServiceInfo>,
-                     versionInfo: VersionInfo) : Node(configuration, advertisedServices, versionInfo) {
+class EnterpriseNode(configuration: FullNodeConfiguration,
+                     versionInfo: VersionInfo) : Node(configuration, versionInfo) {
     companion object {
         private val logger by lazy { loggerFor<EnterpriseNode>() }
     }
@@ -66,7 +66,7 @@ D""".trimStart()
             return tips[(Math.random() * tips.size).toInt()]
         }
 
-        override fun createNode(conf: FullNodeConfiguration, versionInfo: VersionInfo, services: Set<ServiceInfo>) = EnterpriseNode(conf, services, versionInfo)
+        override fun createNode(conf: FullNodeConfiguration, versionInfo: VersionInfo) = EnterpriseNode(conf, versionInfo)
 
         private fun connectToRelay(config: RelayConfiguration, localBrokerPort: Int) {
             with(config) {
diff --git a/tools/explorer/src/main/kotlin/net/corda/explorer/formatters/FlowInitiatorFormatter.kt b/tools/explorer/src/main/kotlin/net/corda/explorer/formatters/FlowInitiatorFormatter.kt
index b42c7ae72a..31639d9291 100644
--- a/tools/explorer/src/main/kotlin/net/corda/explorer/formatters/FlowInitiatorFormatter.kt
+++ b/tools/explorer/src/main/kotlin/net/corda/explorer/formatters/FlowInitiatorFormatter.kt
@@ -10,6 +10,7 @@ object FlowInitiatorFormatter : Formatter<FlowInitiator> {
             is FlowInitiator.Shell -> "Shell" // TODO We don't have much information about that user.
             is FlowInitiator.Peer -> PartyNameFormatter.short.format(value.party.name)
             is FlowInitiator.RPC -> value.username
+            is FlowInitiator.Service -> value.name
         }
     }
 
@@ -20,7 +21,7 @@ object FlowInitiatorFormatter : Formatter<FlowInitiator> {
             is FlowInitiator.Shell -> Pair(FontAwesomeIcon.TERMINAL, text)
             is FlowInitiator.Peer -> Pair(FontAwesomeIcon.GROUP, text)
             is FlowInitiator.RPC -> Pair(FontAwesomeIcon.SHARE, text)
-
+            is FlowInitiator.Service -> Pair(FontAwesomeIcon.SERVER, text)
         }
     }
 }