From 82f68f212a40898585c6ca555a1af0b26a1ec544 Mon Sep 17 00:00:00 2001
From: Mike Hearn <mike@r3cev.com>
Date: Fri, 30 Jun 2017 11:34:00 +0100
Subject: [PATCH] Minor: add another emoji, import a couple of changes for
 Enterprise

---
 core/src/main/kotlin/net/corda/core/utilities/Emoji.kt        | 2 ++
 .../src/main/groovy/net/corda/plugins/Node.groovy             | 2 +-
 node/src/main/kotlin/net/corda/node/internal/NodeStartup.kt   | 4 ++--
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/core/src/main/kotlin/net/corda/core/utilities/Emoji.kt b/core/src/main/kotlin/net/corda/core/utilities/Emoji.kt
index bc7fd86a14..f2a6a6b566 100644
--- a/core/src/main/kotlin/net/corda/core/utilities/Emoji.kt
+++ b/core/src/main/kotlin/net/corda/core/utilities/Emoji.kt
@@ -28,6 +28,7 @@ object Emoji {
     @JvmStatic val CODE_SKULL_AND_CROSSBONES: String = codePointsString(0x2620)
     @JvmStatic val CODE_BOOKS: String = codePointsString(0x1F4DA)
     @JvmStatic val CODE_SLEEPING_FACE: String = codePointsString(0x1F634)
+    @JvmStatic val CODE_LIGHTBULB: String = codePointsString(0x1F4A1)
 
     /**
      * When non-null, toString() methods are allowed to use emoji in the output as we're going to render them to a
@@ -44,6 +45,7 @@ object Emoji {
     val coolGuy: String get() = if (emojiMode.get() != null) "$CODE_COOL_GUY  " else ""
     val books: String get() = if (emojiMode.get() != null) "$CODE_BOOKS  " else ""
     val sleepingFace: String get() = if (emojiMode.get() != null) "$CODE_SLEEPING_FACE  " else ""
+    val lightBulb: String get() = if (emojiMode.get() != null) "$CODE_LIGHTBULB  " else ""
 
     // These have old/non-emoji symbols with better platform support.
     val greenTick: String get() = if (emojiMode.get() != null) "$CODE_GREEN_TICK  " else "✓"
diff --git a/gradle-plugins/cordformation/src/main/groovy/net/corda/plugins/Node.groovy b/gradle-plugins/cordformation/src/main/groovy/net/corda/plugins/Node.groovy
index 3f3a53c8f2..32038740cd 100644
--- a/gradle-plugins/cordformation/src/main/groovy/net/corda/plugins/Node.groovy
+++ b/gradle-plugins/cordformation/src/main/groovy/net/corda/plugins/Node.groovy
@@ -218,7 +218,7 @@ class Node extends CordformNode {
      */
     private File verifyAndGetCordaJar() {
         def maybeCordaJAR = project.configurations.runtime.filter {
-            it.toString().contains("corda-${project.corda_release_version}.jar")
+            it.toString().contains("corda-${project.corda_release_version}.jar") || it.toString().contains("corda-enterprise-${project.corda_release_version}.jar")
         }
         if (maybeCordaJAR.size() == 0) {
             throw new RuntimeException("No Corda Capsule JAR found. Have you deployed the Corda project to Maven? Looked for \"corda-${project.corda_release_version}.jar\"")
diff --git a/node/src/main/kotlin/net/corda/node/internal/NodeStartup.kt b/node/src/main/kotlin/net/corda/node/internal/NodeStartup.kt
index 937e61d18e..2251244e0b 100644
--- a/node/src/main/kotlin/net/corda/node/internal/NodeStartup.kt
+++ b/node/src/main/kotlin/net/corda/node/internal/NodeStartup.kt
@@ -72,7 +72,7 @@ open class NodeStartup(val args: Array<String>) {
         Node.printBasicNodeInfo(LOGS_CAN_BE_FOUND_IN_STRING, System.getProperty("log-path"))
         val conf = loadConfigFile(cmdlineOptions)
         banJavaSerialisation(conf)
-        preNetworkRegistration()
+        preNetworkRegistration(conf)
         maybeRegisterWithNetworkAndExit(cmdlineOptions, conf)
         logStartupInfo(versionInfo, cmdlineOptions, conf)
 
@@ -91,7 +91,7 @@ open class NodeStartup(val args: Array<String>) {
         exitProcess(0)
     }
 
-    open protected fun preNetworkRegistration() = Unit
+    open protected fun preNetworkRegistration(conf: FullNodeConfiguration) = Unit
 
     open protected fun createNode(conf: FullNodeConfiguration, versionInfo: VersionInfo, services: Set<ServiceInfo>): Node {
         return Node(conf, services, versionInfo, if (conf.useTestClock) TestClock() else NodeClock())