From 6b78ee8c14e3f406f7a5e164696fccdcf75f115d Mon Sep 17 00:00:00 2001
From: josecoll <jose.coll@r3cev.com>
Date: Fri, 27 Apr 2018 11:52:51 +0100
Subject: [PATCH] Fix incorrect imports. (#3022)

---
 .../kotlin/net/corda/behave/scenarios/ScenarioState.kt        | 3 ---
 .../kotlin/net/corda/behave/scenarios/helpers/Database.kt     | 2 +-
 .../kotlin/net/corda/behave/scenarios/helpers/Startup.kt      | 2 +-
 .../kotlin/net/corda/behave/scenarios/helpers/Substeps.kt     | 4 ++--
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/experimental/behave/src/scenario/kotlin/net/corda/behave/scenarios/ScenarioState.kt b/experimental/behave/src/scenario/kotlin/net/corda/behave/scenarios/ScenarioState.kt
index d39e4c543a..af016f5ad7 100644
--- a/experimental/behave/src/scenario/kotlin/net/corda/behave/scenarios/ScenarioState.kt
+++ b/experimental/behave/src/scenario/kotlin/net/corda/behave/scenarios/ScenarioState.kt
@@ -1,7 +1,6 @@
 package net.corda.behave.scenarios
 
 import cucumber.api.java.After
-import net.corda.behave.logging.getLogger
 import net.corda.behave.network.Network
 import net.corda.behave.node.Node
 import net.corda.core.messaging.CordaRPCOps
@@ -10,8 +9,6 @@ import java.time.Duration
 
 class ScenarioState {
 
-    private val log = getLogger<ScenarioState>()
-
     private val nodes = mutableListOf<Node.Builder>()
 
     private var network: Network? = null
diff --git a/experimental/behave/src/scenario/kotlin/net/corda/behave/scenarios/helpers/Database.kt b/experimental/behave/src/scenario/kotlin/net/corda/behave/scenarios/helpers/Database.kt
index 2406aff675..49e77d67d2 100644
--- a/experimental/behave/src/scenario/kotlin/net/corda/behave/scenarios/helpers/Database.kt
+++ b/experimental/behave/src/scenario/kotlin/net/corda/behave/scenarios/helpers/Database.kt
@@ -2,7 +2,7 @@ package net.corda.behave.scenarios.helpers
 
 import net.corda.behave.await
 import net.corda.behave.scenarios.ScenarioState
-import net.corda.behave.seconds
+import net.corda.core.utilities.seconds
 import org.assertj.core.api.Assertions.assertThat
 import java.util.concurrent.CountDownLatch
 
diff --git a/experimental/behave/src/scenario/kotlin/net/corda/behave/scenarios/helpers/Startup.kt b/experimental/behave/src/scenario/kotlin/net/corda/behave/scenarios/helpers/Startup.kt
index 4c081df17d..1d07392b63 100644
--- a/experimental/behave/src/scenario/kotlin/net/corda/behave/scenarios/helpers/Startup.kt
+++ b/experimental/behave/src/scenario/kotlin/net/corda/behave/scenarios/helpers/Startup.kt
@@ -1,9 +1,9 @@
 package net.corda.behave.scenarios.helpers
 
-import net.corda.behave.minutes
 import net.corda.behave.process.JarCommand
 import net.corda.behave.scenarios.ScenarioState
 import net.corda.core.internal.div
+import net.corda.core.utilities.minutes
 
 class Startup(state: ScenarioState) : Substeps(state) {
 
diff --git a/experimental/behave/src/scenario/kotlin/net/corda/behave/scenarios/helpers/Substeps.kt b/experimental/behave/src/scenario/kotlin/net/corda/behave/scenarios/helpers/Substeps.kt
index c2fbb45a1c..71f3dca79b 100644
--- a/experimental/behave/src/scenario/kotlin/net/corda/behave/scenarios/helpers/Substeps.kt
+++ b/experimental/behave/src/scenario/kotlin/net/corda/behave/scenarios/helpers/Substeps.kt
@@ -1,12 +1,12 @@
 package net.corda.behave.scenarios.helpers
 
-import net.corda.behave.logging.getLogger
 import net.corda.behave.scenarios.ScenarioState
 import net.corda.core.messaging.CordaRPCOps
+import net.corda.core.utilities.contextLogger
 
 abstract class Substeps(protected val state: ScenarioState) {
 
-    protected val log = getLogger<Substeps>()
+    protected val log = contextLogger()
 
     protected fun withNetwork(action: ScenarioState.() -> Unit) =
             state.withNetwork(action)