Moved ByteArrays.kt to core.utilities

client/jackson/src/main/kotlin/net/corda/jackson/JacksonSupport.kt

@@ -16,7 +16,7 @@ import net.corda.core.identity.Party
 import net.corda.core.messaging.CordaRPCOps
 import net.corda.core.node.NodeInfo
 import net.corda.core.node.services.IdentityService
-import net.corda.core.serialization.OpaqueBytes
+import net.corda.core.utilities.OpaqueBytes
 import net.corda.core.serialization.deserialize
 import net.corda.core.serialization.serialize
 import net.i2p.crypto.eddsa.EdDSAPublicKey

client/jfx/src/integration-test/kotlin/net/corda/client/jfx/NodeMonitorModelTest.kt

@@ -19,7 +19,7 @@ import net.corda.core.node.NodeInfo
 import net.corda.core.node.services.NetworkMapCache
 import net.corda.core.node.services.ServiceInfo
 import net.corda.core.node.services.Vault
-import net.corda.core.serialization.OpaqueBytes
+import net.corda.core.utilities.OpaqueBytes
 import net.corda.core.transactions.SignedTransaction
 import net.corda.testing.ALICE
 import net.corda.testing.BOB

client/mock/src/main/kotlin/net/corda/client/mock/EventGenerator.kt

@@ -4,7 +4,7 @@ import net.corda.core.contracts.Amount
 import net.corda.core.contracts.GBP
 import net.corda.core.contracts.USD
 import net.corda.core.identity.Party
-import net.corda.core.serialization.OpaqueBytes
+import net.corda.core.utilities.OpaqueBytes
 import net.corda.flows.CashFlowCommand
 import java.util.*
 

client/mock/src/main/kotlin/net/corda/client/mock/Generators.kt

@@ -1,7 +1,7 @@
 package net.corda.client.mock
 
 import net.corda.core.contracts.Amount
-import net.corda.core.serialization.OpaqueBytes
+import net.corda.core.utilities.OpaqueBytes
 import java.util.*
 
 fun generateCurrency(): Generator<Currency> {

client/rpc/src/integration-test/kotlin/net/corda/client/rpc/CordaRPCClientTest.kt

@@ -6,7 +6,7 @@ import net.corda.core.getOrThrow
 import net.corda.core.messaging.*
 import net.corda.core.node.services.ServiceInfo
 import net.corda.core.random63BitValue
-import net.corda.core.serialization.OpaqueBytes
+import net.corda.core.utilities.OpaqueBytes
 import net.corda.testing.ALICE
 import net.corda.flows.CashException
 import net.corda.flows.CashIssueFlow

client/rpc/src/smoke-test/kotlin/net/corda/kotlin/rpc/StandaloneCordaRPClientTest.kt

@@ -18,7 +18,7 @@ import net.corda.core.node.services.vault.QueryCriteria
 import net.corda.core.node.services.vault.Sort
 import net.corda.core.node.services.vault.SortAttribute
 import net.corda.core.seconds
-import net.corda.core.serialization.OpaqueBytes
+import net.corda.core.utilities.OpaqueBytes
 import net.corda.core.sizedInputStreamAndHash
 import net.corda.core.utilities.loggerFor
 import net.corda.flows.CashIssueFlow

core/src/main/kotlin/net/corda/core/contracts/Structures.kt

@@ -7,6 +7,7 @@ import net.corda.core.flows.FlowLogicRefFactory
 import net.corda.core.identity.AbstractParty
 import net.corda.core.identity.Party
 import net.corda.core.serialization.*
+import net.corda.core.utilities.OpaqueBytes
 import java.io.FileNotFoundException
 import java.io.IOException
 import java.io.InputStream

core/src/main/kotlin/net/corda/core/crypto/CryptoUtils.kt

@@ -3,7 +3,7 @@
 package net.corda.core.crypto
 
 import net.corda.core.identity.Party
-import net.corda.core.serialization.OpaqueBytes
+import net.corda.core.utilities.OpaqueBytes
 import java.math.BigInteger
 import java.security.*
 

core/src/main/kotlin/net/corda/core/crypto/DigitalSignature.kt

@@ -2,7 +2,7 @@ package net.corda.core.crypto
 
 import net.corda.core.identity.Party
 import net.corda.core.serialization.CordaSerializable
-import net.corda.core.serialization.OpaqueBytes
+import net.corda.core.utilities.OpaqueBytes
 import java.security.InvalidKeyException
 import java.security.PublicKey
 import java.security.SignatureException

core/src/main/kotlin/net/corda/core/crypto/MetaData.kt

@@ -1,7 +1,7 @@
 package net.corda.core.crypto
 
 import net.corda.core.serialization.CordaSerializable
-import net.corda.core.serialization.opaque
+import net.corda.core.utilities.opaque
 import net.corda.core.serialization.serialize
 import java.security.PublicKey
 import java.time.Instant

core/src/main/kotlin/net/corda/core/crypto/SecureHash.kt

@@ -2,7 +2,7 @@ package net.corda.core.crypto
 
 import com.google.common.io.BaseEncoding
 import net.corda.core.serialization.CordaSerializable
-import net.corda.core.serialization.OpaqueBytes
+import net.corda.core.utilities.OpaqueBytes
 import java.security.MessageDigest
 
 /**

core/src/main/kotlin/net/corda/core/identity/AbstractParty.kt

@@ -2,7 +2,7 @@ package net.corda.core.identity
 
 import net.corda.core.contracts.PartyAndReference
 import net.corda.core.serialization.CordaSerializable
-import net.corda.core.serialization.OpaqueBytes
+import net.corda.core.utilities.OpaqueBytes
 import org.bouncycastle.asn1.x500.X500Name
 import java.security.PublicKey
 

core/src/main/kotlin/net/corda/core/identity/AnonymousParty.kt

@@ -2,7 +2,7 @@ package net.corda.core.identity
 
 import net.corda.core.contracts.PartyAndReference
 import net.corda.core.crypto.toBase58String
-import net.corda.core.serialization.OpaqueBytes
+import net.corda.core.utilities.OpaqueBytes
 import org.bouncycastle.asn1.x500.X500Name
 import java.security.PublicKey
 

core/src/main/kotlin/net/corda/core/identity/Party.kt

@@ -2,9 +2,7 @@ package net.corda.core.identity
 
 import net.corda.core.contracts.PartyAndReference
 import net.corda.core.crypto.CertificateAndKeyPair
-import net.corda.core.crypto.toBase58String
+import net.corda.core.utilities.OpaqueBytes
-import net.corda.core.serialization.CordaSerializable
-import net.corda.core.serialization.OpaqueBytes
 import org.bouncycastle.asn1.x500.X500Name
 import java.security.PublicKey
 

core/src/main/kotlin/net/corda/core/node/services/Services.kt

@@ -16,7 +16,7 @@ import net.corda.core.node.services.vault.PageSpecification
 import net.corda.core.node.services.vault.QueryCriteria
 import net.corda.core.node.services.vault.Sort
 import net.corda.core.serialization.CordaSerializable
-import net.corda.core.serialization.OpaqueBytes
+import net.corda.core.utilities.OpaqueBytes
 import net.corda.core.toFuture
 import net.corda.core.transactions.LedgerTransaction
 import net.corda.core.transactions.TransactionBuilder

core/src/main/kotlin/net/corda/core/node/services/vault/QueryCriteria.kt

@@ -9,7 +9,7 @@ import net.corda.core.identity.AbstractParty
 import net.corda.core.node.services.Vault
 import net.corda.core.schemas.PersistentState
 import net.corda.core.serialization.CordaSerializable
-import net.corda.core.serialization.OpaqueBytes
+import net.corda.core.utilities.OpaqueBytes
 import org.bouncycastle.asn1.x500.X500Name
 import java.time.Instant
 import java.util.*

core/src/main/kotlin/net/corda/core/schemas/PersistentTypes.kt

@@ -3,7 +3,7 @@ package net.corda.core.schemas
 import io.requery.Persistable
 import net.corda.core.contracts.ContractState
 import net.corda.core.contracts.StateRef
-import net.corda.core.serialization.toHexString
+import net.corda.core.utilities.toHexString
 import java.io.Serializable
 import javax.persistence.Column
 import javax.persistence.Embeddable

core/src/main/kotlin/net/corda/core/serialization/Kryo.kt

@@ -13,6 +13,7 @@ import net.corda.core.identity.Party
 import net.corda.core.node.AttachmentsClassLoader
 import net.corda.core.transactions.WireTransaction
 import net.corda.core.utilities.LazyPool
+import net.corda.core.utilities.OpaqueBytes
 import net.i2p.crypto.eddsa.EdDSAPrivateKey
 import net.i2p.crypto.eddsa.EdDSAPublicKey
 import net.i2p.crypto.eddsa.spec.EdDSANamedCurveSpec

core/src/main/kotlin/net/corda/core/serialization/amqp/Schema.kt

@@ -3,7 +3,7 @@ package net.corda.core.serialization.amqp
 import com.google.common.hash.Hasher
 import com.google.common.hash.Hashing
 import net.corda.core.crypto.toBase64
-import net.corda.core.serialization.OpaqueBytes
+import net.corda.core.utilities.OpaqueBytes
 import org.apache.qpid.proton.amqp.DescribedType
 import org.apache.qpid.proton.amqp.UnsignedLong
 import org.apache.qpid.proton.codec.Data

core/src/main/kotlin/net/corda/core/utilities/ByteArrays.kt

@@ -1,6 +1,9 @@
-package net.corda.core.serialization
+@file:JvmName("ByteArrays")
+
+package net.corda.core.utilities
 
 import com.google.common.io.BaseEncoding
+import net.corda.core.serialization.CordaSerializable
 import java.io.ByteArrayInputStream
 import java.util.*
 
@@ -11,12 +14,13 @@ import java.util.*
  */
 @CordaSerializable
 open class OpaqueBytes(val bytes: ByteArray) {
-    init {
+    companion object {
-        check(bytes.isNotEmpty())
+        @JvmStatic
+        fun of(vararg b: Byte) = OpaqueBytes(byteArrayOf(*b))
     }
 
-    companion object {
+    init {
-        fun of(vararg b: Byte) = OpaqueBytes(byteArrayOf(*b))
+        check(bytes.isNotEmpty())
     }
 
     override fun equals(other: Any?): Boolean {

core/src/test/kotlin/net/corda/core/crypto/CompositeKeyTests.kt

@@ -1,6 +1,6 @@
 package net.corda.core.crypto
 
-import net.corda.core.serialization.OpaqueBytes
+import net.corda.core.utilities.OpaqueBytes
 import net.corda.core.serialization.serialize
 import org.junit.Test
 import kotlin.test.assertEquals

core/src/test/kotlin/net/corda/core/flows/ContractUpgradeFlowTest.kt

@@ -12,7 +12,7 @@ import net.corda.core.identity.Party
 import net.corda.core.messaging.CordaRPCOps
 import net.corda.core.messaging.startFlow
 import net.corda.core.node.services.unconsumedStates
-import net.corda.core.serialization.OpaqueBytes
+import net.corda.core.utilities.OpaqueBytes
 import net.corda.core.transactions.SignedTransaction
 import net.corda.core.utilities.Emoji
 import net.corda.flows.CashIssueFlow

core/src/test/kotlin/net/corda/core/flows/ResolveTransactionsFlowTest.kt

@@ -4,7 +4,7 @@ import net.corda.core.contracts.testing.DummyContract
 import net.corda.core.crypto.SecureHash
 import net.corda.core.getOrThrow
 import net.corda.core.identity.Party
-import net.corda.core.serialization.opaque
+import net.corda.core.utilities.opaque
 import net.corda.core.transactions.SignedTransaction
 import net.corda.testing.DUMMY_NOTARY_KEY
 import net.corda.flows.ResolveTransactionsFlow

core/src/test/kotlin/net/corda/core/serialization/KryoTests.kt

@@ -3,6 +3,7 @@ package net.corda.core.serialization
 import com.esotericsoftware.kryo.Kryo
 import com.google.common.primitives.Ints
 import net.corda.core.crypto.*
+import net.corda.core.utilities.opaque
 import net.corda.node.services.persistence.NodeAttachmentService
 import net.corda.testing.ALICE
 import net.corda.testing.BOB

core/src/test/kotlin/net/corda/core/serialization/SerializationTokenTest.kt

@@ -5,6 +5,7 @@ import com.esotericsoftware.kryo.KryoException
 import com.esotericsoftware.kryo.io.Output
 import com.nhaarman.mockito_kotlin.mock
 import net.corda.core.node.ServiceHub
+import net.corda.core.utilities.OpaqueBytes
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.After
 import org.junit.Before

core/src/test/kotlin/net/corda/core/testing/Generators.kt

@@ -9,7 +9,7 @@ import net.corda.core.crypto.SecureHash
 import net.corda.core.crypto.entropyToKeyPair
 import net.corda.core.identity.AnonymousParty
 import net.corda.core.identity.Party
-import net.corda.core.serialization.OpaqueBytes
+import net.corda.core.utilities.OpaqueBytes
 import net.corda.testing.getTestX509Name
 import org.bouncycastle.asn1.x500.X500Name
 import java.nio.ByteBuffer

docs/source/example-code/src/integration-test/kotlin/net/corda/docs/IntegrationTestingTutorial.kt

@@ -8,7 +8,7 @@ import net.corda.core.getOrThrow
 import net.corda.core.messaging.startFlow
 import net.corda.core.node.services.ServiceInfo
 import net.corda.core.node.services.Vault
-import net.corda.core.serialization.OpaqueBytes
+import net.corda.core.utilities.OpaqueBytes
 import net.corda.testing.ALICE
 import net.corda.testing.BOB
 import net.corda.testing.DUMMY_NOTARY

docs/source/example-code/src/main/kotlin/net/corda/docs/ClientRpcTutorial.kt

@@ -9,7 +9,7 @@ import net.corda.core.messaging.startFlow
 import net.corda.core.node.CordaPluginRegistry
 import net.corda.core.node.services.ServiceInfo
 import net.corda.core.serialization.CordaSerializable
-import net.corda.core.serialization.OpaqueBytes
+import net.corda.core.utilities.OpaqueBytes
 import net.corda.core.serialization.SerializationCustomization
 import net.corda.core.transactions.SignedTransaction
 import net.corda.testing.ALICE

docs/source/example-code/src/test/kotlin/net/corda/docs/FxTransactionBuildTutorialTest.kt

@@ -3,7 +3,7 @@ package net.corda.docs
 import net.corda.core.contracts.*
 import net.corda.core.getOrThrow
 import net.corda.core.node.services.ServiceInfo
-import net.corda.core.serialization.OpaqueBytes
+import net.corda.core.utilities.OpaqueBytes
 import net.corda.core.toFuture
 import net.corda.testing.DUMMY_NOTARY
 import net.corda.testing.DUMMY_NOTARY_KEY

finance/src/main/kotlin/net/corda/flows/CashExitFlow.kt

@@ -8,7 +8,7 @@ import net.corda.core.contracts.TransactionType
 import net.corda.core.contracts.issuedBy
 import net.corda.core.flows.StartableByRPC
 import net.corda.core.identity.Party
-import net.corda.core.serialization.OpaqueBytes
+import net.corda.core.utilities.OpaqueBytes
 import net.corda.core.transactions.TransactionBuilder
 import net.corda.core.utilities.ProgressTracker
 import java.util.*

finance/src/main/kotlin/net/corda/flows/CashFlowCommand.kt

@@ -5,7 +5,7 @@ import net.corda.core.identity.Party
 import net.corda.core.messaging.CordaRPCOps
 import net.corda.core.messaging.FlowHandle
 import net.corda.core.messaging.startFlow
-import net.corda.core.serialization.OpaqueBytes
+import net.corda.core.utilities.OpaqueBytes
 import java.util.*
 
 /**

finance/src/main/kotlin/net/corda/flows/CashIssueFlow.kt

@@ -7,7 +7,7 @@ import net.corda.core.contracts.TransactionType
 import net.corda.core.contracts.issuedBy
 import net.corda.core.flows.StartableByRPC
 import net.corda.core.identity.Party
-import net.corda.core.serialization.OpaqueBytes
+import net.corda.core.utilities.OpaqueBytes
 import net.corda.core.transactions.TransactionBuilder
 import net.corda.core.utilities.ProgressTracker
 import java.util.*

finance/src/main/kotlin/net/corda/flows/IssuerFlow.kt

@@ -6,7 +6,7 @@ import net.corda.core.contracts.*
 import net.corda.core.flows.*
 import net.corda.core.identity.Party
 import net.corda.core.serialization.CordaSerializable
-import net.corda.core.serialization.OpaqueBytes
+import net.corda.core.utilities.OpaqueBytes
 import net.corda.core.transactions.SignedTransaction
 import net.corda.core.utilities.ProgressTracker
 import net.corda.core.utilities.unwrap

finance/src/test/java/net/corda/contracts/asset/CashTestsJava.java

@@ -3,7 +3,7 @@ package net.corda.contracts.asset;
 import kotlin.Unit;
 import net.corda.core.contracts.PartyAndReference;
 import net.corda.core.identity.AnonymousParty;
-import net.corda.core.serialization.OpaqueBytes;
+import net.corda.core.utilities.OpaqueBytes;
 import org.junit.Test;
 
 import static net.corda.core.contracts.ContractsDSL.DOLLARS;

finance/src/test/kotlin/net/corda/contracts/asset/CashTests.kt

@@ -10,7 +10,7 @@ import net.corda.core.identity.AnonymousParty
 import net.corda.core.identity.Party
 import net.corda.core.node.services.VaultService
 import net.corda.core.node.services.unconsumedStates
-import net.corda.core.serialization.OpaqueBytes
+import net.corda.core.utilities.OpaqueBytes
 import net.corda.core.transactions.SignedTransaction
 import net.corda.core.transactions.WireTransaction
 import net.corda.core.utilities.*

finance/src/test/kotlin/net/corda/contracts/asset/ObligationTests.kt

@@ -10,7 +10,7 @@ import net.corda.core.hours
 import net.corda.core.crypto.testing.NULL_PARTY
 import net.corda.core.identity.AbstractParty
 import net.corda.core.identity.AnonymousParty
-import net.corda.core.serialization.OpaqueBytes
+import net.corda.core.utilities.OpaqueBytes
 import net.corda.core.utilities.*
 import net.corda.testing.*
 import net.corda.testing.node.MockServices

finance/src/test/kotlin/net/corda/flows/CashExitFlowTests.kt

@@ -5,7 +5,7 @@ import net.corda.core.contracts.DOLLARS
 import net.corda.core.contracts.`issued by`
 import net.corda.core.getOrThrow
 import net.corda.core.identity.Party
-import net.corda.core.serialization.OpaqueBytes
+import net.corda.core.utilities.OpaqueBytes
 import net.corda.testing.node.InMemoryMessagingNetwork.ServicePeerAllocationStrategy.RoundRobin
 import net.corda.testing.node.MockNetwork
 import net.corda.testing.node.MockNetwork.MockNode

finance/src/test/kotlin/net/corda/flows/CashIssueFlowTests.kt

@@ -5,7 +5,7 @@ import net.corda.core.contracts.DOLLARS
 import net.corda.core.contracts.`issued by`
 import net.corda.core.getOrThrow
 import net.corda.core.identity.Party
-import net.corda.core.serialization.OpaqueBytes
+import net.corda.core.utilities.OpaqueBytes
 import net.corda.testing.node.InMemoryMessagingNetwork.ServicePeerAllocationStrategy.RoundRobin
 import net.corda.testing.node.MockNetwork
 import net.corda.testing.node.MockNetwork.MockNode

finance/src/test/kotlin/net/corda/flows/CashPaymentFlowTests.kt

@@ -5,7 +5,7 @@ import net.corda.core.contracts.DOLLARS
 import net.corda.core.contracts.`issued by`
 import net.corda.core.getOrThrow
 import net.corda.core.identity.Party
-import net.corda.core.serialization.OpaqueBytes
+import net.corda.core.utilities.OpaqueBytes
 import net.corda.testing.node.InMemoryMessagingNetwork.ServicePeerAllocationStrategy.RoundRobin
 import net.corda.testing.node.MockNetwork
 import net.corda.testing.node.MockNetwork.MockNode

finance/src/test/kotlin/net/corda/flows/IssuerFlowTest.kt

@@ -10,7 +10,7 @@ import net.corda.core.internal.FlowStateMachine
 import net.corda.core.getOrThrow
 import net.corda.core.identity.Party
 import net.corda.core.map
-import net.corda.core.serialization.OpaqueBytes
+import net.corda.core.utilities.OpaqueBytes
 import net.corda.core.toFuture
 import net.corda.core.transactions.SignedTransaction
 import net.corda.testing.DUMMY_NOTARY

node/src/integration-test/kotlin/net/corda/node/NodePerformanceTests.kt

@@ -9,7 +9,7 @@ import net.corda.core.flows.StartableByRPC
 import net.corda.core.messaging.startFlow
 import net.corda.core.minutes
 import net.corda.core.node.services.ServiceInfo
-import net.corda.core.serialization.OpaqueBytes
+import net.corda.core.utilities.OpaqueBytes
 import net.corda.core.utilities.div
 import net.corda.flows.CashIssueFlow
 import net.corda.flows.CashPaymentFlow

node/src/integration-test/kotlin/net/corda/node/services/DistributedServiceTests.kt

@@ -9,7 +9,7 @@ import net.corda.core.messaging.CordaRPCOps
 import net.corda.core.messaging.StateMachineUpdate
 import net.corda.core.messaging.startFlow
 import net.corda.core.node.NodeInfo
-import net.corda.core.serialization.OpaqueBytes
+import net.corda.core.utilities.OpaqueBytes
 import net.corda.testing.ALICE
 import net.corda.testing.DUMMY_NOTARY
 import net.corda.flows.CashIssueFlow

node/src/main/kotlin/net/corda/node/services/messaging/NodeMessagingClient.kt

@@ -9,7 +9,7 @@ import net.corda.core.messaging.RPCOps
 import net.corda.core.messaging.SingleMessageRecipient
 import net.corda.core.node.services.PartyInfo
 import net.corda.core.node.services.TransactionVerifierService
-import net.corda.core.serialization.opaque
+import net.corda.core.utilities.opaque
 import net.corda.core.transactions.LedgerTransaction
 import net.corda.core.utilities.loggerFor
 import net.corda.core.utilities.trace

node/src/main/kotlin/net/corda/node/services/vault/HibernateQueryCriteriaParser.kt

@@ -10,8 +10,8 @@ import net.corda.core.node.services.vault.*
 import net.corda.core.node.services.vault.QueryCriteria.CommonQueryCriteria
 import net.corda.core.schemas.PersistentState
 import net.corda.core.schemas.PersistentStateRef
-import net.corda.core.serialization.OpaqueBytes
+import net.corda.core.utilities.OpaqueBytes
-import net.corda.core.serialization.toHexString
+import net.corda.core.utilities.toHexString
 import net.corda.core.utilities.loggerFor
 import net.corda.core.utilities.trace
 import net.corda.node.services.vault.schemas.jpa.CommonSchemaV1

node/src/main/kotlin/net/corda/node/services/vault/NodeVaultService.kt

@@ -26,7 +26,9 @@ import net.corda.core.serialization.*
 import net.corda.core.tee
 import net.corda.core.transactions.TransactionBuilder
 import net.corda.core.transactions.WireTransaction
+import net.corda.core.utilities.OpaqueBytes
 import net.corda.core.utilities.loggerFor
+import net.corda.core.utilities.toHexString
 import net.corda.core.utilities.trace
 import net.corda.node.services.database.RequeryConfiguration
 import net.corda.node.services.statemachine.FlowStateMachineImpl

node/src/main/kotlin/net/corda/node/services/vault/VaultSchema.kt

@@ -2,12 +2,10 @@ package net.corda.node.services.vault.schemas.jpa
 
 import net.corda.core.contracts.UniqueIdentifier
 import net.corda.core.identity.AbstractParty
-import net.corda.core.identity.AnonymousParty
 import net.corda.core.node.services.Vault
 import net.corda.core.schemas.MappedSchema
 import net.corda.core.schemas.PersistentState
-import net.corda.core.serialization.OpaqueBytes
+import net.corda.core.utilities.OpaqueBytes
-import java.security.PublicKey
 import java.time.Instant
 import java.util.*
 import javax.persistence.*

node/src/test/java/net/corda/node/services/vault/VaultQueryJavaTests.java

@@ -19,7 +19,7 @@ import net.corda.core.node.services.vault.QueryCriteria.VaultCustomQueryCriteria
 import net.corda.core.node.services.vault.QueryCriteria.VaultQueryCriteria;
 import net.corda.core.schemas.MappedSchema;
 import net.corda.core.schemas.testing.DummyLinearStateSchemaV1;
-import net.corda.core.serialization.OpaqueBytes;
+import net.corda.core.utilities.OpaqueBytes;
 import net.corda.core.transactions.SignedTransaction;
 import net.corda.core.transactions.WireTransaction;
 import net.corda.node.services.database.HibernateConfiguration;

node/src/test/kotlin/net/corda/node/CordaRPCOpsImplTest.kt

@@ -12,7 +12,7 @@ import net.corda.core.messaging.*
 import net.corda.core.node.services.ServiceInfo
 import net.corda.core.node.services.Vault
 import net.corda.core.node.services.unconsumedStates
-import net.corda.core.serialization.OpaqueBytes
+import net.corda.core.utilities.OpaqueBytes
 import net.corda.core.transactions.SignedTransaction
 import net.corda.flows.CashIssueFlow
 import net.corda.flows.CashPaymentFlow

node/src/test/kotlin/net/corda/node/services/statemachine/FlowFrameworkTests.kt

@@ -21,7 +21,7 @@ import net.corda.core.node.services.PartyInfo
 import net.corda.core.node.services.ServiceInfo
 import net.corda.core.node.services.queryBy
 import net.corda.core.node.services.unconsumedStates
-import net.corda.core.serialization.OpaqueBytes
+import net.corda.core.utilities.OpaqueBytes
 import net.corda.core.serialization.deserialize
 import net.corda.core.transactions.SignedTransaction
 import net.corda.core.transactions.TransactionBuilder

node/src/test/kotlin/net/corda/node/services/vault/NodeVaultServiceTest.kt

@@ -8,7 +8,7 @@ import net.corda.core.identity.AnonymousParty
 import net.corda.core.node.services.StatesNotAvailableException
 import net.corda.core.node.services.VaultService
 import net.corda.core.node.services.unconsumedStates
-import net.corda.core.serialization.OpaqueBytes
+import net.corda.core.utilities.OpaqueBytes
 import net.corda.core.transactions.SignedTransaction
 import net.corda.testing.DUMMY_NOTARY
 import net.corda.core.utilities.LogHelper

node/src/test/kotlin/net/corda/node/services/vault/VaultQueryTests.kt

@@ -16,7 +16,7 @@ import net.corda.core.node.services.vault.*
 import net.corda.core.node.services.vault.QueryCriteria.*
 import net.corda.core.schemas.testing.DummyLinearStateSchemaV1
 import net.corda.core.seconds
-import net.corda.core.serialization.OpaqueBytes
+import net.corda.core.utilities.OpaqueBytes
 import net.corda.core.transactions.SignedTransaction
 import net.corda.node.services.database.HibernateConfiguration
 import net.corda.node.services.schema.NodeSchemaService

samples/bank-of-corda-demo/src/main/kotlin/net/corda/bank/api/BankOfCordaClientApi.kt

@@ -7,7 +7,7 @@ import net.corda.core.contracts.Amount
 import net.corda.core.contracts.currency
 import net.corda.core.getOrThrow
 import net.corda.core.messaging.startFlow
-import net.corda.core.serialization.OpaqueBytes
+import net.corda.core.utilities.OpaqueBytes
 import net.corda.core.transactions.SignedTransaction
 import net.corda.flows.IssuerFlow.IssuanceRequester
 import net.corda.testing.http.HttpApi

samples/bank-of-corda-demo/src/main/kotlin/net/corda/bank/api/BankOfCordaWebApi.kt

@@ -6,7 +6,7 @@ import net.corda.core.flows.FlowException
 import net.corda.core.getOrThrow
 import net.corda.core.messaging.CordaRPCOps
 import net.corda.core.messaging.startFlow
-import net.corda.core.serialization.OpaqueBytes
+import net.corda.core.utilities.OpaqueBytes
 import net.corda.core.utilities.loggerFor
 import net.corda.flows.IssuerFlow.IssuanceRequester
 import org.bouncycastle.asn1.x500.X500Name

samples/trader-demo/src/main/kotlin/net/corda/traderdemo/TraderDemoClientApi.kt

@@ -12,7 +12,7 @@ import net.corda.core.contracts.filterStatesOfType
 import net.corda.core.getOrThrow
 import net.corda.core.messaging.CordaRPCOps
 import net.corda.core.messaging.startFlow
-import net.corda.core.serialization.OpaqueBytes
+import net.corda.core.utilities.OpaqueBytes
 import net.corda.core.utilities.Emoji
 import net.corda.core.utilities.loggerFor
 import net.corda.flows.IssuerFlow.IssuanceRequester

test-utils/src/main/kotlin/net/corda/testing/CoreTestUtils.kt

@@ -12,7 +12,7 @@ import net.corda.core.identity.Party
 import net.corda.core.identity.PartyAndCertificate
 import net.corda.core.node.ServiceHub
 import net.corda.core.node.services.IdentityService
-import net.corda.core.serialization.OpaqueBytes
+import net.corda.core.utilities.OpaqueBytes
 import net.corda.core.transactions.TransactionBuilder
 import net.corda.node.services.config.NodeConfiguration
 import net.corda.node.services.config.VerifierType

test-utils/src/main/kotlin/net/corda/testing/contracts/VaultFiller.kt

@@ -13,7 +13,7 @@ import net.corda.core.identity.AnonymousParty
 import net.corda.core.identity.Party
 import net.corda.core.node.ServiceHub
 import net.corda.core.node.services.Vault
-import net.corda.core.serialization.OpaqueBytes
+import net.corda.core.utilities.OpaqueBytes
 import net.corda.core.transactions.SignedTransaction
 import net.corda.testing.CHARLIE
 import net.corda.testing.DUMMY_NOTARY

tools/explorer/src/main/kotlin/net/corda/explorer/ExplorerSimulation.kt

@@ -16,7 +16,7 @@ import net.corda.core.messaging.CordaRPCOps
 import net.corda.core.messaging.FlowHandle
 import net.corda.core.node.services.ServiceInfo
 import net.corda.core.node.services.ServiceType
-import net.corda.core.serialization.OpaqueBytes
+import net.corda.core.utilities.OpaqueBytes
 import net.corda.core.success
 import net.corda.flows.*
 import net.corda.node.services.startFlowPermission

tools/explorer/src/main/kotlin/net/corda/explorer/views/cordapps/cash/NewTransaction.kt

@@ -27,7 +27,7 @@ import net.corda.core.identity.Party
 import net.corda.core.messaging.FlowHandle
 import net.corda.core.messaging.startFlow
 import net.corda.core.node.NodeInfo
-import net.corda.core.serialization.OpaqueBytes
+import net.corda.core.utilities.OpaqueBytes
 import net.corda.core.then
 import net.corda.core.transactions.SignedTransaction
 import net.corda.explorer.formatters.PartyNameFormatter

tools/loadtest/src/main/kotlin/net/corda/loadtest/tests/CrossCashTest.kt

@@ -9,7 +9,7 @@ import net.corda.core.contracts.PartyAndReference
 import net.corda.core.contracts.USD
 import net.corda.core.failure
 import net.corda.core.identity.AbstractParty
-import net.corda.core.serialization.OpaqueBytes
+import net.corda.core.utilities.OpaqueBytes
 import net.corda.core.success
 import net.corda.flows.CashFlowCommand
 import net.corda.loadtest.LoadTest

tools/loadtest/src/main/kotlin/net/corda/loadtest/tests/GenerateHelpers.kt

@@ -7,7 +7,7 @@ import net.corda.core.contracts.Issued
 import net.corda.core.contracts.PartyAndReference
 import net.corda.core.contracts.withoutIssuer
 import net.corda.core.identity.Party
-import net.corda.core.serialization.OpaqueBytes
+import net.corda.core.utilities.OpaqueBytes
 import net.corda.flows.CashFlowCommand
 import java.util.*
 

tools/loadtest/src/main/kotlin/net/corda/loadtest/tests/StabilityTest.kt

@@ -6,7 +6,7 @@ import net.corda.core.contracts.USD
 import net.corda.core.failure
 import net.corda.core.flows.FlowException
 import net.corda.core.getOrThrow
-import net.corda.core.serialization.OpaqueBytes
+import net.corda.core.utilities.OpaqueBytes
 import net.corda.core.success
 import net.corda.core.utilities.loggerFor
 import net.corda.flows.CashFlowCommand

verifier/src/integration-test/kotlin/net/corda/verifier/VerifierTests.kt

@@ -6,7 +6,7 @@ import net.corda.core.contracts.DOLLARS
 import net.corda.core.map
 import net.corda.core.messaging.startFlow
 import net.corda.core.node.services.ServiceInfo
-import net.corda.core.serialization.OpaqueBytes
+import net.corda.core.utilities.OpaqueBytes
 import net.corda.core.transactions.LedgerTransaction
 import net.corda.core.transactions.WireTransaction
 import net.corda.testing.ALICE