From b2f41d82f9a04c53b12c2c2bbe85b259337d2ece Mon Sep 17 00:00:00 2001
From: Shams Asari <shams.asari@r3.com>
Date: Mon, 21 May 2018 11:25:13 +0100
Subject: [PATCH] Merge fixes

---
 .idea/compiler.xml                            | 64 +++++++++++++++++++
 bridge/build.gradle                           |  4 ++
 .../internal/AMQPBridgeSerializationScheme.kt |  8 +--
 .../corda/bridge/internal/BridgeInstance.kt   |  5 +-
 .../net/corda/client/rpc/CordaRPCClient.kt    |  2 -
 .../AMQPNetworkServicesSerializationScheme.kt |  9 ++-
 .../corda/networkmanage/common/utils/Utils.kt |  4 +-
 .../amqp/custom/StringBufferSerializer.kt     |  2 +-
 .../persistence/DBTransactionStorage.kt       |  2 +-
 .../MultiThreadedStateMachineManager.kt       |  4 +-
 .../transactions/MySQLUniquenessProvider.kt   |  3 +-
 .../serialization/internal/SharedContexts.kt  |  2 +-
 .../corda/serialization/internal/kryo/Kryo.kt |  3 -
 .../behave/service/proxy/RPCProxyServer.kt    |  6 +-
 .../txverify/EnclaveletSerializationScheme.kt | 16 ++---
 15 files changed, 97 insertions(+), 37 deletions(-)

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 0b85895113..4fac2e3b5f 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -10,6 +10,8 @@
       <module name="bank-of-corda-demo_integrationTest" target="1.8" />
       <module name="bank-of-corda-demo_main" target="1.8" />
       <module name="bank-of-corda-demo_test" target="1.8" />
+      <module name="behave-tools_main" target="1.8" />
+      <module name="behave-tools_test" target="1.8" />
       <module name="behave_behave" target="1.8" />
       <module name="behave_main" target="1.8" />
       <module name="behave_scenario" target="1.8" />
@@ -18,10 +20,25 @@
       <module name="blobinspector_test" target="1.8" />
       <module name="bootstrapper_main" target="1.8" />
       <module name="bootstrapper_test" target="1.8" />
+      <module name="bridge_integrationTest" target="1.8" />
+      <module name="bridge_main" target="1.8" />
+      <module name="bridge_test" target="1.8" />
+      <module name="bridgecapsule_main" target="1.6" />
+      <module name="bridgecapsule_smokeTest" target="1.6" />
+      <module name="bridgecapsule_test" target="1.6" />
       <module name="buildSrc_main" target="1.8" />
       <module name="buildSrc_test" target="1.8" />
+      <module name="business-network-demo_integrationTest" target="1.8" />
+      <module name="business-network-demo_main" target="1.8" />
+      <module name="business-network-demo_test" target="1.8" />
       <module name="canonicalizer_main" target="1.8" />
       <module name="canonicalizer_test" target="1.8" />
+      <module name="capsule-crr-submission_main" target="1.8" />
+      <module name="capsule-crr-submission_test" target="1.8" />
+      <module name="capsule-hsm-cert-generator_main" target="1.8" />
+      <module name="capsule-hsm-cert-generator_test" target="1.8" />
+      <module name="capsule-hsm_main" target="1.8" />
+      <module name="capsule-hsm_test" target="1.8" />
       <module name="client_main" target="1.8" />
       <module name="client_test" target="1.8" />
       <module name="confidential-identities_main" target="1.8" />
@@ -32,14 +49,21 @@
       <module name="corda-core_integrationTest" target="1.8" />
       <module name="corda-core_smokeTest" target="1.8" />
       <module name="corda-finance_integrationTest" target="1.8" />
+      <module name="corda-project-tools_main" target="1.8" />
+      <module name="corda-project-tools_test" target="1.8" />
       <module name="corda-project_main" target="1.8" />
       <module name="corda-project_test" target="1.8" />
+      <module name="corda-utils_integrationTest" target="1.8" />
+      <module name="corda-utils_main" target="1.8" />
+      <module name="corda-utils_test" target="1.8" />
       <module name="corda-webserver_integrationTest" target="1.8" />
       <module name="corda-webserver_main" target="1.8" />
       <module name="corda-webserver_test" target="1.8" />
       <module name="cordapp-configuration_main" target="1.8" />
       <module name="cordapp-configuration_test" target="1.8" />
       <module name="cordapp_integrationTest" target="1.8" />
+      <module name="cordapp_main" target="1.8" />
+      <module name="cordapp_test" target="1.8" />
       <module name="cordform-common_main" target="1.8" />
       <module name="cordform-common_test" target="1.8" />
       <module name="cordformation_main" target="1.8" />
@@ -50,6 +74,8 @@
       <module name="core_main" target="1.8" />
       <module name="core_smokeTest" target="1.8" />
       <module name="core_test" target="1.8" />
+      <module name="dbmigration_main" target="1.8" />
+      <module name="dbmigration_test" target="1.8" />
       <module name="demobench_main" target="1.8" />
       <module name="demobench_test" target="1.8" />
       <module name="dist_binFiles" target="1.8" />
@@ -66,6 +92,10 @@
       <module name="example-code_integrationTest" target="1.8" />
       <module name="example-code_main" target="1.8" />
       <module name="example-code_test" target="1.8" />
+      <module name="experimental-behave_behave" target="1.8" />
+      <module name="experimental-behave_main" target="1.8" />
+      <module name="experimental-behave_smokeTest" target="1.8" />
+      <module name="experimental-behave_test" target="1.8" />
       <module name="experimental-kryo-hook_main" target="1.8" />
       <module name="experimental-kryo-hook_test" target="1.8" />
       <module name="experimental_main" target="1.8" />
@@ -77,6 +107,8 @@
       <module name="finance_integrationTest" target="1.8" />
       <module name="finance_main" target="1.8" />
       <module name="finance_test" target="1.8" />
+      <module name="flow-hook_main" target="1.8" />
+      <module name="flow-hook_test" target="1.8" />
       <module name="flows_integrationTest" target="1.8" />
       <module name="flows_main" target="1.8" />
       <module name="flows_test" target="1.8" />
@@ -86,6 +118,8 @@
       <module name="graphs_test" target="1.8" />
       <module name="ha-testing_main" target="1.8" />
       <module name="ha-testing_test" target="1.8" />
+      <module name="intellij-plugin_main" target="1.8" />
+      <module name="intellij-plugin_test" target="1.8" />
       <module name="irs-demo-cordapp_integrationTest" target="1.8" />
       <module name="irs-demo-cordapp_main" target="1.8" />
       <module name="irs-demo-cordapp_main~1" target="1.8" />
@@ -104,6 +138,8 @@
       <module name="jfx_integrationTest" target="1.8" />
       <module name="jfx_main" target="1.8" />
       <module name="jfx_test" target="1.8" />
+      <module name="jmeter_main" target="1.8" />
+      <module name="jmeter_test" target="1.8" />
       <module name="kryo-hook_main" target="1.8" />
       <module name="kryo-hook_test" target="1.8" />
       <module name="launcher_main" target="1.8" />
@@ -112,6 +148,11 @@
       <module name="loadtest_test" target="1.8" />
       <module name="mock_main" target="1.8" />
       <module name="mock_test" target="1.8" />
+      <module name="network-management-capsule_main" target="1.8" />
+      <module name="network-management-capsule_test" target="1.8" />
+      <module name="network-management_integrationTest" target="1.8" />
+      <module name="network-management_main" target="1.8" />
+      <module name="network-management_test" target="1.8" />
       <module name="network-visualiser_main" target="1.8" />
       <module name="network-visualiser_test" target="1.8" />
       <module name="node-api_main" target="1.8" />
@@ -127,12 +168,27 @@
       <module name="node_test" target="1.8" />
       <module name="notary-demo_main" target="1.8" />
       <module name="notary-demo_test" target="1.8" />
+      <module name="notarytest_main" target="1.8" />
+      <module name="notarytest_test" target="1.8" />
+      <module name="perftestcordapp_integrationTest" target="1.8" />
+      <module name="perftestcordapp_main" target="1.8" />
+      <module name="perftestcordapp_test" target="1.8" />
       <module name="publish-utils_main" target="1.8" />
       <module name="publish-utils_test" target="1.8" />
+      <module name="qa-behave_main" target="1.8" />
+      <module name="qa-behave_test" target="1.8" />
+      <module name="qa_main" target="1.8" />
+      <module name="qa_test" target="1.8" />
       <module name="quasar-hook_main" target="1.8" />
       <module name="quasar-hook_test" target="1.8" />
       <module name="quasar-utils_main" target="1.8" />
       <module name="quasar-utils_test" target="1.8" />
+      <module name="registration-tool_main" target="1.8" />
+      <module name="registration-tool_test" target="1.8" />
+      <module name="rpc-proxy_main" target="1.8" />
+      <module name="rpc-proxy_rpcProxy" target="1.8" />
+      <module name="rpc-proxy_smokeTest" target="1.8" />
+      <module name="rpc-proxy_test" target="1.8" />
       <module name="rpc_integrationTest" target="1.8" />
       <module name="rpc_main" target="1.8" />
       <module name="rpc_smokeTest" target="1.8" />
@@ -143,11 +199,14 @@
       <module name="sandbox_test" target="1.8" />
       <module name="serialization_main" target="1.8" />
       <module name="serialization_test" target="1.8" />
+      <module name="sgx-hsm-tool_main" target="1.8" />
+      <module name="sgx-hsm-tool_test" target="1.8" />
       <module name="shell_integrationTest" target="1.8" />
       <module name="shell_main" target="1.8" />
       <module name="shell_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_scenarioTest" target="1.8" />
       <module name="simm-valuation-demo_test" target="1.8" />
       <module name="smoke-test-utils_main" target="1.8" />
       <module name="smoke-test-utils_test" target="1.8" />
@@ -168,6 +227,8 @@
       <module name="testing-test-common_test" target="1.8" />
       <module name="testing-test-utils_main" target="1.8" />
       <module name="testing-test-utils_test" target="1.8" />
+      <module name="testing_main" target="1.8" />
+      <module name="testing_test" target="1.8" />
       <module name="tools_main" target="1.8" />
       <module name="tools_test" target="1.8" />
       <module name="trader-demo_integrationTest" target="1.8" />
@@ -176,6 +237,9 @@
       <module name="verifier_integrationTest" target="1.8" />
       <module name="verifier_main" target="1.8" />
       <module name="verifier_test" target="1.8" />
+      <module name="verify-enclave_integrationTest" target="1.8" />
+      <module name="verify-enclave_main" target="1.8" />
+      <module name="verify-enclave_test" target="1.8" />
       <module name="web_main" target="1.8" />
       <module name="web_test" target="1.8" />
       <module name="webcapsule_main" target="1.6" />
diff --git a/bridge/build.gradle b/bridge/build.gradle
index 545afed651..1ee5bdd7a5 100644
--- a/bridge/build.gradle
+++ b/bridge/build.gradle
@@ -47,6 +47,10 @@ dependencies {
         transitive = false// we control dependencies directly as the bridge is likely to be audited
     }
 
+    compile(project(':serialization')) {
+        transitive = false// we control dependencies directly as the bridge is likely to be audited
+    }
+
     // Here we pull in dependencies that would normally be pulled in transitively from :core and :node-api, but we need more fine grained control
     // For AMQP serialisation.
     compile "org.apache.qpid:proton-j:${protonj_version}"
diff --git a/bridge/src/main/kotlin/net/corda/bridge/internal/AMQPBridgeSerializationScheme.kt b/bridge/src/main/kotlin/net/corda/bridge/internal/AMQPBridgeSerializationScheme.kt
index 604ad3d8a3..1a709bdaf8 100644
--- a/bridge/src/main/kotlin/net/corda/bridge/internal/AMQPBridgeSerializationScheme.kt
+++ b/bridge/src/main/kotlin/net/corda/bridge/internal/AMQPBridgeSerializationScheme.kt
@@ -4,10 +4,10 @@ import net.corda.core.cordapp.Cordapp
 import net.corda.core.serialization.ClassWhitelist
 import net.corda.core.serialization.SerializationContext
 import net.corda.core.serialization.SerializationCustomSerializer
-import net.corda.nodeapi.internal.serialization.CordaSerializationMagic
-import net.corda.nodeapi.internal.serialization.amqp.AbstractAMQPSerializationScheme
-import net.corda.nodeapi.internal.serialization.amqp.SerializerFactory
-import net.corda.nodeapi.internal.serialization.amqp.amqpMagic
+import net.corda.serialization.internal.CordaSerializationMagic
+import net.corda.serialization.internal.amqp.AbstractAMQPSerializationScheme
+import net.corda.serialization.internal.amqp.SerializerFactory
+import net.corda.serialization.internal.amqp.amqpMagic
 import java.util.concurrent.ConcurrentHashMap
 
 class AMQPBridgeSerializationScheme(
diff --git a/bridge/src/main/kotlin/net/corda/bridge/internal/BridgeInstance.kt b/bridge/src/main/kotlin/net/corda/bridge/internal/BridgeInstance.kt
index 568fcc5481..0738f7845b 100644
--- a/bridge/src/main/kotlin/net/corda/bridge/internal/BridgeInstance.kt
+++ b/bridge/src/main/kotlin/net/corda/bridge/internal/BridgeInstance.kt
@@ -31,9 +31,8 @@ import net.corda.nodeapi.internal.ShutdownHook
 import net.corda.nodeapi.internal.addShutdownHook
 import net.corda.nodeapi.internal.network.NETWORK_PARAMS_FILE_NAME
 import net.corda.nodeapi.internal.network.SignedNetworkParameters
-import net.corda.nodeapi.internal.serialization.AMQP_P2P_CONTEXT
-import net.corda.nodeapi.internal.serialization.AMQP_STORAGE_CONTEXT
-import net.corda.nodeapi.internal.serialization.SerializationFactoryImpl
+import net.corda.serialization.internal.AMQP_P2P_CONTEXT
+import net.corda.serialization.internal.SerializationFactoryImpl
 import rx.Subscription
 import java.util.concurrent.atomic.AtomicBoolean
 
diff --git a/client/rpc/src/main/kotlin/net/corda/client/rpc/CordaRPCClient.kt b/client/rpc/src/main/kotlin/net/corda/client/rpc/CordaRPCClient.kt
index 45a026b59f..7dbd56c50b 100644
--- a/client/rpc/src/main/kotlin/net/corda/client/rpc/CordaRPCClient.kt
+++ b/client/rpc/src/main/kotlin/net/corda/client/rpc/CordaRPCClient.kt
@@ -10,8 +10,6 @@
 
 package net.corda.client.rpc
 
-import net.corda.client.rpc.internal.serialization.amqp.AMQPClientSerializationScheme
-import net.corda.client.rpc.internal.RPCClient
 import net.corda.client.rpc.internal.CordaRPCClientConfigurationImpl
 import net.corda.client.rpc.internal.RPCClient
 import net.corda.client.rpc.internal.serialization.amqp.AMQPClientSerializationScheme
diff --git a/network-management/src/main/kotlin/com/r3/corda/networkmanage/common/utils/AMQPNetworkServicesSerializationScheme.kt b/network-management/src/main/kotlin/com/r3/corda/networkmanage/common/utils/AMQPNetworkServicesSerializationScheme.kt
index abd779d290..eb22a2725d 100644
--- a/network-management/src/main/kotlin/com/r3/corda/networkmanage/common/utils/AMQPNetworkServicesSerializationScheme.kt
+++ b/network-management/src/main/kotlin/com/r3/corda/networkmanage/common/utils/AMQPNetworkServicesSerializationScheme.kt
@@ -1,13 +1,12 @@
 package com.r3.corda.networkmanage.common.utils
 
-import net.corda.core.cordapp.Cordapp
 import net.corda.core.serialization.ClassWhitelist
 import net.corda.core.serialization.SerializationContext
 import net.corda.core.serialization.SerializationCustomSerializer
-import net.corda.nodeapi.internal.serialization.CordaSerializationMagic
-import net.corda.nodeapi.internal.serialization.amqp.AbstractAMQPSerializationScheme
-import net.corda.nodeapi.internal.serialization.amqp.SerializerFactory
-import net.corda.nodeapi.internal.serialization.amqp.amqpMagic
+import net.corda.serialization.internal.CordaSerializationMagic
+import net.corda.serialization.internal.amqp.AbstractAMQPSerializationScheme
+import net.corda.serialization.internal.amqp.SerializerFactory
+import net.corda.serialization.internal.amqp.amqpMagic
 import java.util.concurrent.ConcurrentHashMap
 
 class AMQPNetworkServicesSerializationScheme (
diff --git a/network-management/src/main/kotlin/com/r3/corda/networkmanage/common/utils/Utils.kt b/network-management/src/main/kotlin/com/r3/corda/networkmanage/common/utils/Utils.kt
index 16079a27b5..5a41d980fd 100644
--- a/network-management/src/main/kotlin/com/r3/corda/networkmanage/common/utils/Utils.kt
+++ b/network-management/src/main/kotlin/com/r3/corda/networkmanage/common/utils/Utils.kt
@@ -21,8 +21,8 @@ import net.corda.nodeapi.internal.config.UnknownConfigKeysPolicy
 import net.corda.nodeapi.internal.config.parseAs
 import net.corda.nodeapi.internal.crypto.X509CertificateFactory
 import net.corda.nodeapi.internal.crypto.X509KeyStore
-import net.corda.nodeapi.internal.serialization.AMQP_P2P_CONTEXT
-import net.corda.nodeapi.internal.serialization.SerializationFactoryImpl
+import net.corda.serialization.internal.AMQP_P2P_CONTEXT
+import net.corda.serialization.internal.SerializationFactoryImpl
 import org.bouncycastle.asn1.ASN1Encodable
 import org.bouncycastle.asn1.ASN1ObjectIdentifier
 import org.bouncycastle.asn1.x500.style.BCStyle
diff --git a/node-api/src/main/kotlin/net/corda/nodeapi/internal/serialization/amqp/custom/StringBufferSerializer.kt b/node-api/src/main/kotlin/net/corda/nodeapi/internal/serialization/amqp/custom/StringBufferSerializer.kt
index 026d4b9d11..2022eec337 100644
--- a/node-api/src/main/kotlin/net/corda/nodeapi/internal/serialization/amqp/custom/StringBufferSerializer.kt
+++ b/node-api/src/main/kotlin/net/corda/nodeapi/internal/serialization/amqp/custom/StringBufferSerializer.kt
@@ -10,7 +10,7 @@
 
 package net.corda.nodeapi.internal.serialization.amqp.custom
 
-import net.corda.nodeapi.internal.serialization.amqp.CustomSerializer
+import net.corda.serialization.internal.amqp.CustomSerializer
 
 /**
  * A serializer for [StringBuffer].
diff --git a/node/src/main/kotlin/net/corda/node/services/persistence/DBTransactionStorage.kt b/node/src/main/kotlin/net/corda/node/services/persistence/DBTransactionStorage.kt
index b39948f5b1..5ace12aa4e 100644
--- a/node/src/main/kotlin/net/corda/node/services/persistence/DBTransactionStorage.kt
+++ b/node/src/main/kotlin/net/corda/node/services/persistence/DBTransactionStorage.kt
@@ -28,7 +28,7 @@ import net.corda.node.utilities.WeightBasedAppendOnlyPersistentMap
 import net.corda.nodeapi.internal.persistence.NODE_DATABASE_PREFIX
 import net.corda.nodeapi.internal.persistence.bufferUntilDatabaseCommit
 import net.corda.nodeapi.internal.persistence.wrapWithDatabaseTransaction
-import net.corda.nodeapi.internal.serialization.CordaSerializationEncoding.SNAPPY
+import net.corda.serialization.internal.CordaSerializationEncoding.SNAPPY
 import org.apache.commons.lang.ArrayUtils.EMPTY_BYTE_ARRAY
 import rx.Observable
 import rx.subjects.PublishSubject
diff --git a/node/src/main/kotlin/net/corda/node/services/statemachine/MultiThreadedStateMachineManager.kt b/node/src/main/kotlin/net/corda/node/services/statemachine/MultiThreadedStateMachineManager.kt
index 4bc667b8a3..5392273f03 100644
--- a/node/src/main/kotlin/net/corda/node/services/statemachine/MultiThreadedStateMachineManager.kt
+++ b/node/src/main/kotlin/net/corda/node/services/statemachine/MultiThreadedStateMachineManager.kt
@@ -43,8 +43,8 @@ import net.corda.node.services.statemachine.interceptors.*
 import net.corda.node.services.statemachine.transitions.StateMachine
 import net.corda.node.utilities.AffinityExecutor
 import net.corda.nodeapi.internal.persistence.CordaPersistence
-import net.corda.nodeapi.internal.serialization.SerializeAsTokenContextImpl
-import net.corda.nodeapi.internal.serialization.withTokenContext
+import net.corda.serialization.internal.SerializeAsTokenContextImpl
+import net.corda.serialization.internal.withTokenContext
 import org.apache.activemq.artemis.utils.ReusableLatch
 import rx.Observable
 import rx.subjects.PublishSubject
diff --git a/node/src/main/kotlin/net/corda/node/services/transactions/MySQLUniquenessProvider.kt b/node/src/main/kotlin/net/corda/node/services/transactions/MySQLUniquenessProvider.kt
index b5b9445f9e..f91b0fe201 100644
--- a/node/src/main/kotlin/net/corda/node/services/transactions/MySQLUniquenessProvider.kt
+++ b/node/src/main/kotlin/net/corda/node/services/transactions/MySQLUniquenessProvider.kt
@@ -41,7 +41,7 @@ import net.corda.core.utilities.debug
 import net.corda.core.utilities.loggerFor
 import net.corda.core.utilities.trace
 import net.corda.node.services.config.MySQLConfiguration
-import net.corda.nodeapi.internal.serialization.CordaSerializationEncoding.SNAPPY
+import net.corda.serialization.internal.CordaSerializationEncoding.SNAPPY
 import java.sql.*
 import java.time.Clock
 import java.util.*
@@ -50,7 +50,6 @@ import java.util.concurrent.LinkedBlockingQueue
 import java.util.concurrent.TimeUnit
 import kotlin.concurrent.thread
 
-
 /**
  * Uniqueness provider backed by a MySQL database. It is intended to be used with a multi-master synchronously replicated
  * variant of MySQL, such as Percona XtraDB Cluster, or MariaDB Galera Cluster.
diff --git a/serialization/src/main/kotlin/net/corda/serialization/internal/SharedContexts.kt b/serialization/src/main/kotlin/net/corda/serialization/internal/SharedContexts.kt
index ea38f51873..75b0f05261 100644
--- a/serialization/src/main/kotlin/net/corda/serialization/internal/SharedContexts.kt
+++ b/serialization/src/main/kotlin/net/corda/serialization/internal/SharedContexts.kt
@@ -13,7 +13,7 @@
 package net.corda.serialization.internal
 
 import net.corda.core.serialization.*
-import net.corda.nodeapi.internal.serialization.CordaSerializationEncoding.SNAPPY
+import net.corda.serialization.internal.CordaSerializationEncoding.SNAPPY
 import net.corda.serialization.internal.amqp.amqpMagic
 import net.corda.serialization.internal.kryo.BuiltInExceptionsWhitelist
 import net.corda.serialization.internal.kryo.GlobalTransientClassWhiteList
diff --git a/serialization/src/main/kotlin/net/corda/serialization/internal/kryo/Kryo.kt b/serialization/src/main/kotlin/net/corda/serialization/internal/kryo/Kryo.kt
index bbe61e65b9..e9f8df23ad 100644
--- a/serialization/src/main/kotlin/net/corda/serialization/internal/kryo/Kryo.kt
+++ b/serialization/src/main/kotlin/net/corda/serialization/internal/kryo/Kryo.kt
@@ -29,10 +29,7 @@ import net.corda.core.serialization.SerializeAsTokenContext
 import net.corda.core.serialization.SerializedBytes
 import net.corda.core.transactions.*
 import net.corda.core.utilities.OpaqueBytes
-import net.corda.nodeapi.internal.crypto.X509CertificateFactory
 import net.corda.core.utilities.SgxSupport
-import net.corda.nodeapi.internal.serialization.CordaClassResolver
-import net.corda.nodeapi.internal.serialization.serializationContextKey
 import net.corda.serialization.internal.serializationContextKey
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
diff --git a/testing/qa/behave/tools/rpc-proxy/src/main/kotlin/net/corda/behave/service/proxy/RPCProxyServer.kt b/testing/qa/behave/tools/rpc-proxy/src/main/kotlin/net/corda/behave/service/proxy/RPCProxyServer.kt
index d0101967cd..dc458a6bed 100644
--- a/testing/qa/behave/tools/rpc-proxy/src/main/kotlin/net/corda/behave/service/proxy/RPCProxyServer.kt
+++ b/testing/qa/behave/tools/rpc-proxy/src/main/kotlin/net/corda/behave/service/proxy/RPCProxyServer.kt
@@ -7,9 +7,9 @@ import net.corda.core.serialization.internal.SerializationEnvironmentImpl
 import net.corda.core.serialization.internal.nodeSerializationEnv
 import net.corda.core.utilities.NetworkHostAndPort
 import net.corda.core.utilities.contextLogger
-import net.corda.nodeapi.internal.serialization.AMQP_P2P_CONTEXT
-import net.corda.nodeapi.internal.serialization.AMQP_RPC_CLIENT_CONTEXT
-import net.corda.nodeapi.internal.serialization.SerializationFactoryImpl
+import net.corda.serialization.internal.AMQP_P2P_CONTEXT
+import net.corda.serialization.internal.AMQP_RPC_CLIENT_CONTEXT
+import net.corda.serialization.internal.SerializationFactoryImpl
 import org.eclipse.jetty.server.Server
 import org.eclipse.jetty.server.ServerConnector
 import org.eclipse.jetty.server.handler.HandlerCollection
diff --git a/verify-enclave/src/main/kotlin/com/r3/enclaves/txverify/EnclaveletSerializationScheme.kt b/verify-enclave/src/main/kotlin/com/r3/enclaves/txverify/EnclaveletSerializationScheme.kt
index 391bd28c1e..bc41d742ee 100644
--- a/verify-enclave/src/main/kotlin/com/r3/enclaves/txverify/EnclaveletSerializationScheme.kt
+++ b/verify-enclave/src/main/kotlin/com/r3/enclaves/txverify/EnclaveletSerializationScheme.kt
@@ -15,14 +15,14 @@ import net.corda.core.serialization.SerializationContext
 import net.corda.core.serialization.internal.SerializationEnvironmentImpl
 import net.corda.core.serialization.internal.nodeSerializationEnv
 import net.corda.core.utilities.toHexString
-import net.corda.nodeapi.internal.serialization.CordaSerializationMagic
-import net.corda.nodeapi.internal.serialization.AMQP_P2P_CONTEXT
-import net.corda.nodeapi.internal.serialization.SerializationFactoryImpl
-import net.corda.nodeapi.internal.serialization.amqp.AbstractAMQPSerializationScheme
-import net.corda.nodeapi.internal.serialization.amqp.SerializerFactory
-import net.corda.nodeapi.internal.serialization.amqp.amqpMagic
-import net.corda.nodeapi.internal.serialization.kryo.AbstractKryoSerializationScheme
-import net.corda.nodeapi.internal.serialization.kryo.kryoMagic
+import net.corda.serialization.internal.AMQP_P2P_CONTEXT
+import net.corda.serialization.internal.CordaSerializationMagic
+import net.corda.serialization.internal.SerializationFactoryImpl
+import net.corda.serialization.internal.amqp.AbstractAMQPSerializationScheme
+import net.corda.serialization.internal.amqp.SerializerFactory
+import net.corda.serialization.internal.amqp.amqpMagic
+import net.corda.serialization.internal.kryo.AbstractKryoSerializationScheme
+import net.corda.serialization.internal.kryo.kryoMagic
 
 @Suppress("UNUSED")
 private class EnclaveletSerializationScheme {