Merge pull request #664 from corda/rnicoll-move-parties

Move party classes into identity package

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

@@ -10,6 +10,8 @@ import com.fasterxml.jackson.module.kotlin.KotlinModule
 import net.corda.core.contracts.Amount
 import net.corda.core.contracts.BusinessCalendar
 import net.corda.core.crypto.*
+import net.corda.core.identity.AnonymousParty
+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

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

@@ -1,7 +1,7 @@
 package net.corda.client.mock
 
 import net.corda.core.contracts.Amount
-import net.corda.core.crypto.Party
+import net.corda.core.identity.Party
 import net.corda.core.serialization.OpaqueBytes
 import net.corda.flows.CashFlowCommand
 import java.util.*

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

@@ -2,7 +2,7 @@
 
 package net.corda.core.contracts
 
-import net.corda.core.crypto.Party
+import net.corda.core.identity.Party
 import java.security.PublicKey
 import java.math.BigDecimal
 import java.util.*

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

@@ -1,7 +1,7 @@
 package net.corda.core.contracts
 
-import net.corda.core.crypto.Party
 import net.corda.core.crypto.SecureHash
+import net.corda.core.identity.Party
 import net.corda.core.transactions.TransactionBuilder
 import java.security.PublicKey
 

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

@@ -1,6 +1,6 @@
 package net.corda.core.contracts
 
-import net.corda.core.crypto.Party
+import net.corda.core.identity.Party
 import net.corda.core.flows.FlowException
 import net.corda.core.transactions.TransactionBuilder
 import net.corda.core.utilities.loggerFor

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

@@ -1,11 +1,11 @@
 package net.corda.core.contracts
 
 import net.corda.core.contracts.clauses.Clause
-import net.corda.core.crypto.AnonymousParty
-import net.corda.core.crypto.Party
 import net.corda.core.crypto.SecureHash
 import net.corda.core.flows.FlowLogicRef
 import net.corda.core.flows.FlowLogicRefFactory
+import net.corda.core.identity.AnonymousParty
+import net.corda.core.identity.Party
 import net.corda.core.node.services.ServiceType
 import net.corda.core.serialization.*
 import net.corda.core.transactions.TransactionBuilder

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

@@ -1,6 +1,6 @@
 package net.corda.core.contracts
 
-import net.corda.core.crypto.Party
+import net.corda.core.identity.Party
 import net.corda.core.serialization.CordaSerializable
 import net.corda.core.transactions.LedgerTransaction
 import net.corda.core.transactions.TransactionBuilder

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

@@ -1,6 +1,6 @@
 package net.corda.core.contracts
 
-import net.corda.core.crypto.Party
+import net.corda.core.identity.Party
 import net.corda.core.crypto.SecureHash
 import net.corda.core.flows.FlowException
 import net.corda.core.serialization.CordaSerializable

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

@@ -2,6 +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.i2p.crypto.eddsa.EdDSAPublicKey

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

@@ -1,5 +1,6 @@
 package net.corda.core.crypto
 
+import net.corda.core.identity.Party
 import net.corda.core.serialization.CordaSerializable
 import net.corda.core.serialization.OpaqueBytes
 import java.security.InvalidKeyException

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

@@ -1,33 +1,7 @@
 package net.corda.core.crypto
 
-import net.corda.core.contracts.PartyAndReference
-import net.corda.core.serialization.OpaqueBytes
 import org.bouncycastle.asn1.x500.X500Name
 import java.security.PublicKey
 
-/**
- * The [Party] class represents an entity on the network, which is typically identified by a legal [name] and public key
- * that it can sign transactions under. As parties may use multiple keys for signing and, for example, have offline backup
- * keys, the "public key" of a party can be represented by a composite construct – a [CompositeKey], which combines multiple
- * cryptographic public key primitives into a tree structure.
- *
- * For example: Alice has two key pairs (pub1/priv1 and pub2/priv2), and wants to be able to sign transactions with either of them.
- * Her advertised [Party] then has a legal X.500 [name] "CN=Alice Corp,O=Alice Corp,L=London,C=UK" and an [owningKey]
- * "pub1 or pub2".
- *
- * [Party] is also used for service identities. E.g. Alice may also be running an interest rate oracle on her Corda node,
- * which requires a separate signing key (and an identifying name). Services can also be distributed – run by a coordinated
- * cluster of Corda nodes. A [Party] representing a distributed service will use a composite key containing all
- * individual cluster nodes' public keys. Each of the nodes in the cluster will advertise the same group [Party].
- *
- * Note that equality is based solely on the owning key.
- *
- * @see CompositeKey
- */
-class Party(val name: X500Name, owningKey: PublicKey) : AbstractParty(owningKey) {
-    override fun toAnonymous(): AnonymousParty = AnonymousParty(owningKey)
-    override fun toString() = "${owningKey.toBase58String()} ($name)"
-    override fun nameOrNull(): X500Name? = name
-
-    override fun ref(bytes: OpaqueBytes): PartyAndReference = PartyAndReference(this.toAnonymous(), bytes)
-}
+@Deprecated("Party has moved to identity package", ReplaceWith("net.corda.core.identity.Party"))
+class Party(name: X500Name, owningKey: PublicKey) : net.corda.core.identity.Party(name, owningKey)

core/src/main/kotlin/net/corda/core/flows/FlowLogic.kt

@@ -1,8 +1,8 @@
 package net.corda.core.flows
 
 import co.paralleluniverse.fibers.Suspendable
-import net.corda.core.crypto.Party
 import net.corda.core.crypto.SecureHash
+import net.corda.core.identity.Party
 import net.corda.core.node.ServiceHub
 import net.corda.core.transactions.SignedTransaction
 import net.corda.core.utilities.ProgressTracker

core/src/main/kotlin/net/corda/core/flows/FlowStateMachine.kt

@@ -3,8 +3,8 @@ package net.corda.core.flows
 import co.paralleluniverse.fibers.Suspendable
 import com.google.common.util.concurrent.ListenableFuture
 import net.corda.core.contracts.ScheduledStateRef
-import net.corda.core.crypto.Party
 import net.corda.core.crypto.SecureHash
+import net.corda.core.identity.Party
 import net.corda.core.node.ServiceHub
 import net.corda.core.serialization.CordaSerializable
 import net.corda.core.transactions.SignedTransaction

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

@@ -1,4 +1,4 @@
-package net.corda.core.crypto
+package net.corda.core.identity
 
 import net.corda.core.contracts.PartyAndReference
 import net.corda.core.serialization.CordaSerializable

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

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

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

@@ -0,0 +1,35 @@
+package net.corda.core.identity
+
+import net.corda.core.contracts.PartyAndReference
+import net.corda.core.crypto.toBase58String
+import net.corda.core.serialization.OpaqueBytes
+import org.bouncycastle.asn1.x500.X500Name
+import java.security.PublicKey
+
+/**
+ * The [Party] class represents an entity on the network, which is typically identified by a legal [name] and public key
+ * that it can sign transactions under. As parties may use multiple keys for signing and, for example, have offline backup
+ * keys, the "public key" of a party can be represented by a composite construct – a [CompositeKey], which combines multiple
+ * cryptographic public key primitives into a tree structure.
+ *
+ * For example: Alice has two key pairs (pub1/priv1 and pub2/priv2), and wants to be able to sign transactions with either of them.
+ * Her advertised [Party] then has a legal X.500 [name] "CN=Alice Corp,O=Alice Corp,L=London,C=UK" and an [owningKey]
+ * "pub1 or pub2".
+ *
+ * [Party] is also used for service identities. E.g. Alice may also be running an interest rate oracle on her Corda node,
+ * which requires a separate signing key (and an identifying name). Services can also be distributed – run by a coordinated
+ * cluster of Corda nodes. A [Party] representing a distributed service will use a composite key containing all
+ * individual cluster nodes' public keys. Each of the nodes in the cluster will advertise the same group [Party].
+ *
+ * Note that equality is based solely on the owning key.
+ *
+ * @see CompositeKey
+ */
+// TODO: Remove "open" from [Party] once deprecated crypto.Party class is removed
+open class Party(val name: X500Name, owningKey: PublicKey) : AbstractParty(owningKey) {
+    override fun toAnonymous(): AnonymousParty = AnonymousParty(owningKey)
+    override fun toString() = "${owningKey.toBase58String()} ($name)"
+    override fun nameOrNull(): X500Name? = name
+
+    override fun ref(bytes: OpaqueBytes): PartyAndReference = PartyAndReference(this.toAnonymous(), bytes)
+}

core/src/main/kotlin/net/corda/core/messaging/CordaRPCOps.kt

@@ -6,11 +6,11 @@ import net.corda.core.contracts.Amount
 import net.corda.core.contracts.ContractState
 import net.corda.core.contracts.StateAndRef
 import net.corda.core.contracts.UpgradedContract
-import net.corda.core.crypto.Party
 import net.corda.core.crypto.SecureHash
 import net.corda.core.flows.FlowInitiator
 import net.corda.core.flows.FlowLogic
 import net.corda.core.flows.StateMachineRunId
+import net.corda.core.identity.Party
 import net.corda.core.node.NodeInfo
 import net.corda.core.node.services.NetworkMapCache
 import net.corda.core.node.services.StateMachineTransactionMapping

core/src/main/kotlin/net/corda/core/node/NodeInfo.kt

@@ -1,6 +1,6 @@
 package net.corda.core.node
 
-import net.corda.core.crypto.Party
+import net.corda.core.identity.Party
 import net.corda.core.messaging.SingleMessageRecipient
 import net.corda.core.node.services.ServiceInfo
 import net.corda.core.node.services.ServiceType

core/src/main/kotlin/net/corda/core/node/PluginServiceHub.kt

@@ -1,7 +1,7 @@
 package net.corda.core.node
 
-import net.corda.core.crypto.Party
 import net.corda.core.flows.FlowLogic
+import net.corda.core.identity.Party
 
 /**
  * A service hub to be used by the [CordaPluginRegistry]

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

@@ -1,8 +1,8 @@
 package net.corda.core.node.services
 
 import net.corda.core.contracts.PartyAndReference
-import net.corda.core.crypto.AnonymousParty
-import net.corda.core.crypto.Party
+import net.corda.core.identity.AnonymousParty
+import net.corda.core.identity.Party
 import org.bouncycastle.asn1.x500.X500Name
 import java.security.PublicKey
 

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

@@ -2,7 +2,7 @@ package net.corda.core.node.services
 
 import com.google.common.util.concurrent.ListenableFuture
 import net.corda.core.contracts.Contract
-import net.corda.core.crypto.Party
+import net.corda.core.identity.Party
 import net.corda.core.node.NodeInfo
 import net.corda.core.randomOrNull
 import net.corda.core.serialization.CordaSerializable

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

@@ -1,6 +1,6 @@
 package net.corda.core.node.services
 
-import net.corda.core.crypto.Party
+import net.corda.core.identity.Party
 import net.corda.core.node.NodeInfo
 import net.corda.core.node.ServiceEntry
 

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

@@ -5,6 +5,8 @@ import com.google.common.util.concurrent.ListenableFuture
 import net.corda.core.contracts.*
 import net.corda.core.crypto.*
 import net.corda.core.flows.FlowException
+import net.corda.core.identity.AbstractParty
+import net.corda.core.identity.Party
 import net.corda.core.node.services.vault.PageSpecification
 import net.corda.core.node.services.vault.QueryCriteria
 import net.corda.core.node.services.vault.Sort

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

@@ -1,8 +1,8 @@
 package net.corda.core.node.services
 
 import net.corda.core.contracts.StateRef
-import net.corda.core.crypto.Party
 import net.corda.core.crypto.SecureHash
+import net.corda.core.identity.Party
 import net.corda.core.serialization.CordaSerializable
 
 /**

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

@@ -9,6 +9,7 @@ import com.esotericsoftware.kryo.util.MapReferenceResolver
 import com.google.common.annotations.VisibleForTesting
 import net.corda.core.contracts.*
 import net.corda.core.crypto.*
+import net.corda.core.identity.Party
 import net.corda.core.node.AttachmentsClassLoader
 import net.corda.core.transactions.WireTransaction
 import net.corda.core.utilities.LazyPool

core/src/main/kotlin/net/corda/core/transactions/BaseTransaction.kt

@@ -1,7 +1,7 @@
 package net.corda.core.transactions
 
 import net.corda.core.contracts.*
-import net.corda.core.crypto.Party
+import net.corda.core.identity.Party
 import java.security.PublicKey
 import java.util.*
 

core/src/main/kotlin/net/corda/core/transactions/LedgerTransaction.kt

@@ -1,8 +1,8 @@
 package net.corda.core.transactions
 
 import net.corda.core.contracts.*
-import net.corda.core.crypto.Party
 import net.corda.core.crypto.SecureHash
+import net.corda.core.identity.Party
 import net.corda.core.serialization.CordaSerializable
 import java.security.PublicKey
 

core/src/main/kotlin/net/corda/core/transactions/MerkleTransaction.kt

@@ -2,6 +2,7 @@ package net.corda.core.transactions
 
 import net.corda.core.contracts.*
 import net.corda.core.crypto.*
+import net.corda.core.identity.Party
 import net.corda.core.serialization.CordaSerializable
 import net.corda.core.serialization.p2PKryo
 import net.corda.core.serialization.serialize

core/src/main/kotlin/net/corda/core/transactions/TransactionBuilder.kt

@@ -4,6 +4,7 @@ import co.paralleluniverse.strands.Strand
 import net.corda.core.contracts.*
 import net.corda.core.crypto.*
 import net.corda.core.flows.FlowStateMachine
+import net.corda.core.identity.Party
 import net.corda.core.serialization.serialize
 import java.security.KeyPair
 import java.security.PublicKey

core/src/main/kotlin/net/corda/core/transactions/WireTransaction.kt

@@ -3,8 +3,8 @@ package net.corda.core.transactions
 import com.esotericsoftware.kryo.pool.KryoPool
 import net.corda.core.contracts.*
 import net.corda.core.crypto.MerkleTree
-import net.corda.core.crypto.Party
 import net.corda.core.crypto.SecureHash
+import net.corda.core.identity.Party
 import net.corda.core.indexOfOrThrow
 import net.corda.core.node.ServicesForResolution
 import net.corda.core.serialization.SerializedBytes

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

@@ -3,6 +3,7 @@
 package net.corda.core.utilities
 
 import net.corda.core.crypto.*
+import net.corda.core.identity.Party
 import org.bouncycastle.asn1.x500.X500Name
 import java.math.BigInteger
 import java.security.KeyPair

core/src/main/kotlin/net/corda/flows/AbstractStateReplacementFlow.kt

@@ -7,6 +7,7 @@ import net.corda.core.contracts.StateRef
 import net.corda.core.crypto.*
 import net.corda.core.flows.FlowException
 import net.corda.core.flows.FlowLogic
+import net.corda.core.identity.Party
 import net.corda.core.serialization.CordaSerializable
 import net.corda.core.transactions.SignedTransaction
 import net.corda.core.transactions.WireTransaction

core/src/main/kotlin/net/corda/flows/BroadcastTransactionFlow.kt

@@ -1,9 +1,9 @@
 package net.corda.flows
 
 import co.paralleluniverse.fibers.Suspendable
-import net.corda.core.crypto.Party
 import net.corda.core.flows.FlowLogic
 import net.corda.core.flows.InitiatingFlow
+import net.corda.core.identity.Party
 import net.corda.core.serialization.CordaSerializable
 import net.corda.core.transactions.SignedTransaction
 

core/src/main/kotlin/net/corda/flows/FetchAttachmentsFlow.kt

@@ -2,10 +2,10 @@ package net.corda.flows
 
 import net.corda.core.contracts.AbstractAttachment
 import net.corda.core.contracts.Attachment
-import net.corda.core.crypto.Party
 import net.corda.core.crypto.SecureHash
 import net.corda.core.crypto.sha256
 import net.corda.core.flows.InitiatingFlow
+import net.corda.core.identity.Party
 import net.corda.core.serialization.SerializationToken
 import net.corda.core.serialization.SerializeAsToken
 import net.corda.core.serialization.SerializeAsTokenContext

core/src/main/kotlin/net/corda/flows/FetchDataFlow.kt

@@ -2,10 +2,10 @@ package net.corda.flows
 
 import co.paralleluniverse.fibers.Suspendable
 import net.corda.core.contracts.NamedByHash
-import net.corda.core.crypto.Party
 import net.corda.core.crypto.SecureHash
 import net.corda.core.flows.FlowException
 import net.corda.core.flows.FlowLogic
+import net.corda.core.identity.Party
 import net.corda.core.serialization.CordaSerializable
 import net.corda.core.utilities.UntrustworthyData
 import net.corda.core.utilities.unwrap

core/src/main/kotlin/net/corda/flows/FetchTransactionsFlow.kt

@@ -1,8 +1,8 @@
 package net.corda.flows
 
-import net.corda.core.crypto.Party
 import net.corda.core.crypto.SecureHash
 import net.corda.core.flows.InitiatingFlow
+import net.corda.core.identity.Party
 import net.corda.core.transactions.SignedTransaction
 
 /**

core/src/main/kotlin/net/corda/flows/FinalityFlow.kt

@@ -4,9 +4,9 @@ import co.paralleluniverse.fibers.Suspendable
 import net.corda.core.contracts.ContractState
 import net.corda.core.contracts.StateRef
 import net.corda.core.contracts.TransactionState
-import net.corda.core.crypto.Party
 import net.corda.core.crypto.isFulfilledBy
 import net.corda.core.flows.FlowLogic
+import net.corda.core.identity.Party
 import net.corda.core.node.ServiceHub
 import net.corda.core.transactions.LedgerTransaction
 import net.corda.core.transactions.SignedTransaction

core/src/main/kotlin/net/corda/flows/NotaryChangeFlow.kt

@@ -1,8 +1,8 @@
 package net.corda.flows
 
 import net.corda.core.contracts.*
-import net.corda.core.crypto.Party
 import net.corda.core.flows.InitiatingFlow
+import net.corda.core.identity.Party
 import net.corda.core.transactions.SignedTransaction
 import net.corda.core.transactions.TransactionBuilder
 import net.corda.core.utilities.ProgressTracker

core/src/main/kotlin/net/corda/flows/NotaryFlow.kt

@@ -7,6 +7,7 @@ import net.corda.core.crypto.*
 import net.corda.core.flows.FlowException
 import net.corda.core.flows.FlowLogic
 import net.corda.core.flows.InitiatingFlow
+import net.corda.core.identity.Party
 import net.corda.core.node.services.TimestampChecker
 import net.corda.core.node.services.UniquenessException
 import net.corda.core.node.services.UniquenessProvider

core/src/main/kotlin/net/corda/flows/ResolveTransactionsFlow.kt

@@ -2,10 +2,10 @@ package net.corda.flows
 
 import co.paralleluniverse.fibers.Suspendable
 import net.corda.core.checkedAdd
-import net.corda.core.crypto.Party
 import net.corda.core.crypto.SecureHash
 import net.corda.core.flows.FlowLogic
 import net.corda.core.getOrThrow
+import net.corda.core.identity.Party
 import net.corda.core.serialization.CordaSerializable
 import net.corda.core.transactions.LedgerTransaction
 import net.corda.core.transactions.SignedTransaction

core/src/main/kotlin/net/corda/flows/TwoPartyDealFlow.kt

@@ -4,6 +4,8 @@ import co.paralleluniverse.fibers.Suspendable
 import net.corda.core.contracts.DealState
 import net.corda.core.crypto.*
 import net.corda.core.flows.FlowLogic
+import net.corda.core.identity.AbstractParty
+import net.corda.core.identity.Party
 import net.corda.core.node.NodeInfo
 import net.corda.core.seconds
 import net.corda.core.serialization.CordaSerializable

core/src/main/kotlin/net/corda/flows/TxKeyFlowUtilities.kt

@@ -1,8 +1,8 @@
 package net.corda.flows
 
 import co.paralleluniverse.fibers.Suspendable
-import net.corda.core.crypto.Party
 import net.corda.core.flows.FlowLogic
+import net.corda.core.identity.Party
 import net.corda.core.serialization.CordaSerializable
 import net.corda.core.utilities.unwrap
 import java.security.PublicKey

core/src/test/java/net/corda/core/flows/FlowsInJavaTest.java

@@ -1,7 +1,7 @@
 package net.corda.core.flows;
 
 import co.paralleluniverse.fibers.*;
-import net.corda.core.crypto.*;
+import net.corda.core.identity.Party;
 import net.corda.testing.node.*;
 import org.junit.*;
 

core/src/test/kotlin/net/corda/core/contracts/TransactionTests.kt

@@ -2,20 +2,15 @@ package net.corda.core.contracts
 
 import net.corda.contracts.asset.DUMMY_CASH_ISSUER_KEY
 import net.corda.core.crypto.CompositeKey
-import net.corda.core.crypto.Party
 import net.corda.core.crypto.SecureHash
 import net.corda.core.crypto.generateKeyPair
 import net.corda.core.crypto.sign
+import net.corda.core.identity.Party
 import net.corda.core.serialization.SerializedBytes
 import net.corda.core.transactions.LedgerTransaction
 import net.corda.core.transactions.SignedTransaction
 import net.corda.core.transactions.WireTransaction
-import net.corda.core.utilities.ALICE
-import net.corda.core.utilities.BOB
-import net.corda.core.utilities.DUMMY_KEY_1
-import net.corda.core.utilities.DUMMY_KEY_2
-import net.corda.core.utilities.DUMMY_NOTARY
-import net.corda.core.utilities.DUMMY_NOTARY_KEY
+import net.corda.core.utilities.*
 import net.corda.testing.ALICE_PUBKEY
 import org.junit.Test
 import java.security.KeyPair

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

@@ -5,6 +5,7 @@ import com.esotericsoftware.kryo.KryoException
 import net.corda.contracts.asset.Cash
 import net.corda.core.contracts.*
 import net.corda.core.crypto.SecureHash.Companion.zeroHash
+import net.corda.core.identity.Party
 import net.corda.core.serialization.p2PKryo
 import net.corda.core.serialization.serialize
 import net.corda.core.transactions.WireTransaction

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

@@ -2,9 +2,9 @@ package net.corda.core.flows
 
 import net.corda.contracts.asset.Cash
 import net.corda.core.contracts.*
-import net.corda.core.crypto.Party
 import net.corda.core.crypto.SecureHash
 import net.corda.core.getOrThrow
+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

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

@@ -2,9 +2,9 @@ package net.corda.core.flows
 
 import net.corda.core.contracts.DummyContract
 import net.corda.core.crypto.NullSignature
-import net.corda.core.crypto.Party
 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.transactions.SignedTransaction
 import net.corda.core.utilities.DUMMY_NOTARY_KEY

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

@@ -1,7 +1,7 @@
 package net.corda.core.flows
 
 import co.paralleluniverse.fibers.Suspendable
-import net.corda.core.crypto.Party
+import net.corda.core.identity.Party
 import net.corda.core.utilities.ProgressTracker
 import net.corda.flows.TxKeyFlowUtilities
 import java.security.PublicKey

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

@@ -1,6 +1,6 @@
 package net.corda.core.flows
 
-import net.corda.core.crypto.Party
+import net.corda.core.identity.Party
 import net.corda.core.utilities.ALICE
 import net.corda.core.utilities.BOB
 import net.corda.core.utilities.DUMMY_NOTARY

core/src/test/kotlin/net/corda/core/identity/PartyTest.kt

@@ -1,5 +1,6 @@
-package net.corda.core.crypto
+package net.corda.core.identity
 
+import net.corda.core.crypto.entropyToKeyPair
 import net.corda.core.utilities.ALICE
 import org.junit.Test
 import java.math.BigInteger

core/src/test/kotlin/net/corda/core/node/AttachmentClassLoaderTests.kt

@@ -4,8 +4,8 @@ import com.esotericsoftware.kryo.Kryo
 import com.nhaarman.mockito_kotlin.mock
 import com.nhaarman.mockito_kotlin.whenever
 import net.corda.core.contracts.*
-import net.corda.core.crypto.Party
 import net.corda.core.crypto.SecureHash
+import net.corda.core.identity.Party
 import net.corda.core.node.services.AttachmentStorage
 import net.corda.core.node.services.StorageService
 import net.corda.core.serialization.*
@@ -24,7 +24,10 @@ import java.net.URLClassLoader
 import java.security.PublicKey
 import java.util.jar.JarOutputStream
 import java.util.zip.ZipEntry
-import kotlin.test.*
+import kotlin.test.assertEquals
+import kotlin.test.assertFailsWith
+import kotlin.test.assertNotNull
+import kotlin.test.assertTrue
 
 interface DummyContractBackdoor {
     fun generateInitial(owner: PartyAndReference, magicNumber: Int, notary: Party): TransactionBuilder

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

@@ -2,11 +2,11 @@ package net.corda.core.serialization
 
 import co.paralleluniverse.fibers.Suspendable
 import net.corda.core.contracts.Attachment
-import net.corda.core.crypto.Party
 import net.corda.core.crypto.SecureHash
 import net.corda.core.flows.FlowLogic
 import net.corda.core.flows.InitiatingFlow
 import net.corda.core.getOrThrow
+import net.corda.core.identity.Party
 import net.corda.core.messaging.RPCOps
 import net.corda.core.messaging.SingleMessageRecipient
 import net.corda.core.node.services.ServiceInfo

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

@@ -6,6 +6,8 @@ import com.pholser.junit.quickcheck.generator.java.util.ArrayListGenerator
 import com.pholser.junit.quickcheck.random.SourceOfRandomness
 import net.corda.core.contracts.*
 import net.corda.core.crypto.*
+import net.corda.core.identity.AnonymousParty
+import net.corda.core.identity.Party
 import net.corda.core.serialization.OpaqueBytes
 import net.corda.testing.getTestX509Name
 import org.bouncycastle.asn1.x500.X500Name

docs/source/changelog.rst

@@ -29,6 +29,19 @@ UNRELEASED
     * ``FlowLogic.getCounterpartyMarker`` is no longer used and been deprecated for removal. If you were using this to
       manage multiple independent message streams with the same party in the same flow then use sub-flows instead.
 
+
+    * There are major changes to the ``Party`` class as part of confidential identities:
+
+         * ``Party`` has moved to the ``net.corda.core.identity`` package; there is a deprecated class in its place for
+           backwards compatibility, but it will be removed in a future release and developers should move to the new class as soon
+           as possible.
+         * There is a new ``AbstractParty`` superclass to ``Party``, which contains just the public key. A new class
+           ``AnonymousParty`` has been added, which is intended to be used in place of ``Party`` or ``PublicKey`` in contract
+           state objects. The exception to this is where the party in a contract state is intended to be well known, such as
+           issuer of a ``Cash`` state.
+         * Names of parties are now stored as a ``X500Name`` rather than a ``String``, to correctly enforce basic structure of the
+           name. As a result all node legal names must now be structured as X.500 distinguished names.
+
 * The ``InitiatingFlow`` annotation also has an integer ``version`` property which assigns the initiating flow a version
   number, defaulting to 1 if it's specified. The flow version is included in the flow session request and the counterparty
   will only respond and start their own flow if the version number matches to the one they've registered with. At some

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

@@ -7,11 +7,11 @@ import net.corda.core.contracts.Issued
 import net.corda.core.contracts.StateAndRef
 import net.corda.core.contracts.TransactionType
 import net.corda.core.crypto.DigitalSignature
-import net.corda.core.crypto.Party
 import net.corda.core.crypto.SecureHash
 import net.corda.core.crypto.sign
 import net.corda.core.flows.FlowLogic
 import net.corda.core.flows.InitiatingFlow
+import net.corda.core.identity.Party
 import net.corda.core.node.PluginServiceHub
 import net.corda.core.node.ServiceHub
 import net.corda.core.node.services.unconsumedStates

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

@@ -5,6 +5,7 @@ import net.corda.core.contracts.*
 import net.corda.core.crypto.*
 import net.corda.core.flows.FlowLogic
 import net.corda.core.flows.InitiatingFlow
+import net.corda.core.identity.Party
 import net.corda.core.node.PluginServiceHub
 import net.corda.core.node.ServiceHub
 import net.corda.core.node.services.linearHeadsOfType

docs/source/release-notes.rst

@@ -10,6 +10,9 @@ We've added the ability for flows to be versioned by their CorDapp developers. T
 version of a flow and allows it to reject flow communication with a node which isn't using the same fact. In a future
 release we allow a node to have multiple versions of the same flow running to enable backwards compatibility.
 
+There are major changes to the ``Party`` class as part of confidential identities. See :doc:`changelog` for full details.
+
+
 Milestone 11
 ------------
 

experimental/src/main/kotlin/net/corda/contracts/universal/Arrangement.kt

@@ -1,7 +1,7 @@
 package net.corda.contracts.universal
 
 import net.corda.core.contracts.Frequency
-import net.corda.core.crypto.Party
+import net.corda.core.identity.Party
 import net.corda.core.serialization.CordaSerializable
 import java.math.BigDecimal
 import java.time.LocalDate

experimental/src/main/kotlin/net/corda/contracts/universal/ContractFunctions.kt

@@ -1,6 +1,6 @@
 package net.corda.contracts.universal
 
-import net.corda.core.crypto.Party
+import net.corda.core.identity.Party
 import java.math.BigDecimal
 import java.util.*
 

experimental/src/main/kotlin/net/corda/contracts/universal/Literal.kt

@@ -2,7 +2,7 @@ package net.corda.contracts.universal
 
 import net.corda.core.contracts.BusinessCalendar
 import net.corda.core.contracts.Frequency
-import net.corda.core.crypto.Party
+import net.corda.core.identity.Party
 import java.math.BigDecimal
 import java.time.LocalDate
 import java.util.*

experimental/src/main/kotlin/net/corda/contracts/universal/Perceivable.kt

@@ -2,7 +2,7 @@ package net.corda.contracts.universal
 
 import net.corda.core.contracts.BusinessCalendar
 import net.corda.core.contracts.Tenor
-import net.corda.core.crypto.Party
+import net.corda.core.identity.Party
 import net.corda.core.serialization.CordaSerializable
 import java.lang.reflect.Type
 import java.math.BigDecimal

experimental/src/main/kotlin/net/corda/contracts/universal/PrettyPrint.kt

@@ -1,8 +1,8 @@
 package net.corda.contracts.universal
 
-import net.corda.core.crypto.Party
 import net.corda.core.crypto.commonName
 import net.corda.core.crypto.toStringShort
+import net.corda.core.identity.Party
 import java.math.BigDecimal
 import java.security.PublicKey
 import java.time.Instant

experimental/src/main/kotlin/net/corda/contracts/universal/UniversalContract.kt

@@ -1,8 +1,8 @@
 package net.corda.contracts.universal
 
 import net.corda.core.contracts.*
-import net.corda.core.crypto.Party
 import net.corda.core.crypto.SecureHash
+import net.corda.core.identity.Party
 import net.corda.core.transactions.TransactionBuilder
 import java.math.BigDecimal
 import java.security.PublicKey

experimental/src/main/kotlin/net/corda/contracts/universal/Util.kt

@@ -3,7 +3,7 @@ package net.corda.contracts.universal
 import com.google.common.collect.ImmutableSet
 import com.google.common.collect.Sets
 import net.corda.core.contracts.Frequency
-import net.corda.core.crypto.Party
+import net.corda.core.identity.Party
 import java.security.PublicKey
 import java.time.Instant
 import java.time.LocalDate

experimental/src/test/kotlin/net/corda/contracts/universal/ContractDefinition.kt

@@ -1,13 +1,14 @@
 package net.corda.contracts.universal
 
-import net.corda.core.crypto.Party
 import net.corda.core.crypto.generateKeyPair
+import net.corda.core.identity.Party
 import net.corda.core.utilities.ALICE
 import net.corda.testing.MEGA_CORP
 import net.corda.testing.MINI_CORP
 import org.junit.Test
 import java.util.*
-import kotlin.test.*
+import kotlin.test.assertEquals
+import kotlin.test.assertTrue
 
 // Test parties
 val acmeCorp = Party(ALICE.name, generateKeyPair().public)

finance/isolated/src/main/kotlin/net/corda/contracts/AnotherDummyContract.kt

@@ -1,7 +1,7 @@
 package net.corda.contracts.isolated
 
 import net.corda.core.contracts.*
-import net.corda.core.crypto.Party
+import net.corda.core.identity.Party
 import net.corda.core.crypto.SecureHash
 import net.corda.core.transactions.TransactionBuilder
 import java.security.PublicKey

finance/isolated/src/main/kotlin/net/corda/core/node/DummyContractBackdoor.kt

@@ -2,7 +2,7 @@ package net.corda.core.node
 
 import net.corda.core.contracts.ContractState
 import net.corda.core.contracts.PartyAndReference
-import net.corda.core.crypto.Party
+import net.corda.core.identity.Party
 import net.corda.core.transactions.TransactionBuilder
 
 interface DummyContractBackdoor {

finance/src/main/java/net/corda/contracts/JavaCommercialPaper.java

@@ -9,6 +9,7 @@ import net.corda.core.contracts.Contract;
 import net.corda.core.contracts.TransactionForContract.*;
 import net.corda.core.contracts.clauses.*;
 import net.corda.core.crypto.*;
+import net.corda.core.identity.Party;
 import net.corda.core.node.services.*;
 import net.corda.core.transactions.*;
 import org.jetbrains.annotations.*;

finance/src/main/kotlin/net/corda/contracts/CommercialPaper.kt

@@ -8,9 +8,9 @@ import net.corda.core.contracts.clauses.AnyOf
 import net.corda.core.contracts.clauses.Clause
 import net.corda.core.contracts.clauses.GroupClauseVerifier
 import net.corda.core.contracts.clauses.verifyClause
-import net.corda.core.crypto.Party
 import net.corda.core.crypto.SecureHash
 import net.corda.core.crypto.toBase58String
+import net.corda.core.identity.Party
 import net.corda.core.node.services.VaultService
 import net.corda.core.random63BitValue
 import net.corda.core.schemas.MappedSchema

finance/src/main/kotlin/net/corda/contracts/CommercialPaperLegacy.kt

@@ -4,8 +4,8 @@ import co.paralleluniverse.fibers.Suspendable
 import net.corda.contracts.asset.sumCashBy
 import net.corda.core.contracts.*
 import net.corda.core.crypto.NullPublicKey
-import net.corda.core.crypto.Party
 import net.corda.core.crypto.SecureHash
+import net.corda.core.identity.Party
 import net.corda.core.node.services.VaultService
 import net.corda.core.transactions.TransactionBuilder
 import net.corda.core.utilities.Emoji

finance/src/main/kotlin/net/corda/contracts/asset/Cash.kt

@@ -9,6 +9,8 @@ import net.corda.core.contracts.clauses.FirstOf
 import net.corda.core.contracts.clauses.GroupClauseVerifier
 import net.corda.core.contracts.clauses.verifyClause
 import net.corda.core.crypto.*
+import net.corda.core.identity.AbstractParty
+import net.corda.core.identity.Party
 import net.corda.core.schemas.MappedSchema
 import net.corda.core.schemas.PersistentState
 import net.corda.core.schemas.QueryableState

finance/src/main/kotlin/net/corda/contracts/asset/CommodityContract.kt

@@ -7,9 +7,9 @@ import net.corda.core.contracts.*
 import net.corda.core.contracts.clauses.AnyOf
 import net.corda.core.contracts.clauses.GroupClauseVerifier
 import net.corda.core.contracts.clauses.verifyClause
-import net.corda.core.crypto.Party
 import net.corda.core.crypto.SecureHash
 import net.corda.core.crypto.newSecureRandom
+import net.corda.core.identity.Party
 import net.corda.core.serialization.CordaSerializable
 import net.corda.core.transactions.TransactionBuilder
 import java.security.PublicKey

finance/src/main/kotlin/net/corda/contracts/asset/Obligation.kt

@@ -6,6 +6,9 @@ import net.corda.contracts.clause.*
 import net.corda.core.contracts.*
 import net.corda.core.contracts.clauses.*
 import net.corda.core.crypto.*
+import net.corda.core.identity.AbstractParty
+import net.corda.core.identity.AnonymousParty
+import net.corda.core.identity.Party
 import net.corda.core.random63BitValue
 import net.corda.core.serialization.CordaSerializable
 import net.corda.core.transactions.TransactionBuilder

finance/src/main/kotlin/net/corda/contracts/testing/DummyDealContract.kt

@@ -5,6 +5,8 @@ import net.corda.core.contracts.DealState
 import net.corda.core.contracts.TransactionForContract
 import net.corda.core.contracts.UniqueIdentifier
 import net.corda.core.crypto.*
+import net.corda.core.identity.AnonymousParty
+import net.corda.core.identity.Party
 import net.corda.core.transactions.TransactionBuilder
 import java.security.PublicKey
 

finance/src/main/kotlin/net/corda/contracts/testing/VaultFiller.kt

@@ -7,7 +7,7 @@ import net.corda.contracts.asset.DUMMY_CASH_ISSUER
 import net.corda.contracts.asset.DUMMY_CASH_ISSUER_KEY
 import net.corda.core.contracts.*
 import net.corda.core.crypto.CompositeKey
-import net.corda.core.crypto.Party
+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

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

@@ -1,9 +1,9 @@
 package net.corda.flows
 
 import co.paralleluniverse.fibers.Suspendable
-import net.corda.core.crypto.Party
 import net.corda.core.flows.FlowException
 import net.corda.core.flows.FlowLogic
+import net.corda.core.identity.Party
 import net.corda.core.transactions.SignedTransaction
 import net.corda.core.utilities.ProgressTracker
 

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

@@ -6,7 +6,7 @@ import net.corda.core.contracts.Amount
 import net.corda.core.contracts.InsufficientBalanceException
 import net.corda.core.contracts.TransactionType
 import net.corda.core.contracts.issuedBy
-import net.corda.core.crypto.Party
+import net.corda.core.identity.Party
 import net.corda.core.serialization.OpaqueBytes
 import net.corda.core.transactions.SignedTransaction
 import net.corda.core.transactions.TransactionBuilder

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

@@ -1,7 +1,7 @@
 package net.corda.flows
 
 import net.corda.core.contracts.Amount
-import net.corda.core.crypto.Party
+import net.corda.core.identity.Party
 import net.corda.core.messaging.CordaRPCOps
 import net.corda.core.messaging.FlowHandle
 import net.corda.core.messaging.startFlow

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

@@ -5,7 +5,7 @@ import net.corda.contracts.asset.Cash
 import net.corda.core.contracts.Amount
 import net.corda.core.contracts.TransactionType
 import net.corda.core.contracts.issuedBy
-import net.corda.core.crypto.Party
+import net.corda.core.identity.Party
 import net.corda.core.serialization.OpaqueBytes
 import net.corda.core.transactions.SignedTransaction
 import net.corda.core.transactions.TransactionBuilder

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

@@ -4,9 +4,9 @@ import co.paralleluniverse.fibers.Suspendable
 import net.corda.core.contracts.Amount
 import net.corda.core.contracts.InsufficientBalanceException
 import net.corda.core.contracts.TransactionType
-import net.corda.core.crypto.Party
 import net.corda.core.crypto.expandedCompositeKeys
 import net.corda.core.crypto.toStringShort
+import net.corda.core.identity.Party
 import net.corda.core.transactions.SignedTransaction
 import net.corda.core.transactions.TransactionBuilder
 import net.corda.core.utilities.ProgressTracker

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

@@ -2,10 +2,10 @@ package net.corda.flows
 
 import co.paralleluniverse.fibers.Suspendable
 import net.corda.core.contracts.*
-import net.corda.core.crypto.Party
 import net.corda.core.flows.FlowException
 import net.corda.core.flows.FlowLogic
 import net.corda.core.flows.InitiatingFlow
+import net.corda.core.identity.Party
 import net.corda.core.node.PluginServiceHub
 import net.corda.core.serialization.CordaSerializable
 import net.corda.core.serialization.OpaqueBytes

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

@@ -6,6 +6,7 @@ import net.corda.core.contracts.*
 import net.corda.core.crypto.*
 import net.corda.core.flows.FlowException
 import net.corda.core.flows.FlowLogic
+import net.corda.core.identity.Party
 import net.corda.core.node.NodeInfo
 import net.corda.core.seconds
 import net.corda.core.serialization.CordaSerializable

finance/src/test/java/net/corda/flows/AbstractStateReplacementFlowTest.java

@@ -1,6 +1,6 @@
 package net.corda.flows;
 
-import net.corda.core.crypto.*;
+import net.corda.core.identity.Party;
 import net.corda.core.utilities.*;
 import org.jetbrains.annotations.*;
 

finance/src/test/kotlin/net/corda/contracts/CommercialPaperTests.kt

@@ -3,9 +3,8 @@ package net.corda.contracts
 import net.corda.contracts.asset.*
 import net.corda.contracts.testing.fillWithSomeTestCash
 import net.corda.core.contracts.*
-import net.corda.core.crypto.Party
-import net.corda.core.crypto.SecureHash
 import net.corda.core.days
+import net.corda.core.identity.Party
 import net.corda.core.node.services.Vault
 import net.corda.core.node.services.VaultService
 import net.corda.core.seconds

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

@@ -3,6 +3,8 @@ package net.corda.contracts.asset
 import net.corda.contracts.testing.fillWithSomeTestCash
 import net.corda.core.contracts.*
 import net.corda.core.crypto.*
+import net.corda.core.identity.AbstractParty
+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

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

@@ -3,7 +3,7 @@ package net.corda.flows
 import net.corda.contracts.asset.Cash
 import net.corda.core.contracts.DOLLARS
 import net.corda.core.contracts.`issued by`
-import net.corda.core.crypto.Party
+import net.corda.core.identity.Party
 import net.corda.core.getOrThrow
 import net.corda.core.serialization.OpaqueBytes
 import net.corda.testing.node.InMemoryMessagingNetwork.ServicePeerAllocationStrategy.RoundRobin

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

@@ -3,7 +3,7 @@ package net.corda.flows
 import net.corda.contracts.asset.Cash
 import net.corda.core.contracts.DOLLARS
 import net.corda.core.contracts.`issued by`
-import net.corda.core.crypto.Party
+import net.corda.core.identity.Party
 import net.corda.core.getOrThrow
 import net.corda.core.serialization.OpaqueBytes
 import net.corda.testing.node.InMemoryMessagingNetwork.ServicePeerAllocationStrategy.RoundRobin

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

@@ -3,7 +3,7 @@ package net.corda.flows
 import net.corda.contracts.asset.Cash
 import net.corda.core.contracts.DOLLARS
 import net.corda.core.contracts.`issued by`
-import net.corda.core.crypto.Party
+import net.corda.core.identity.Party
 import net.corda.core.getOrThrow
 import net.corda.core.serialization.OpaqueBytes
 import net.corda.testing.node.InMemoryMessagingNetwork.ServicePeerAllocationStrategy.RoundRobin

node-schemas/src/test/kotlin/net/corda/node/services/vault/schemas/VaultSchemaTest.kt

@@ -12,6 +12,7 @@ import io.requery.sql.*
 import io.requery.sql.platform.Generic
 import net.corda.core.contracts.*
 import net.corda.core.crypto.*
+import net.corda.core.identity.Party
 import net.corda.core.node.services.Vault
 import net.corda.core.schemas.requery.converters.InstantConverter
 import net.corda.core.schemas.requery.converters.VaultStateStatusConverter

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

@@ -4,11 +4,11 @@ import net.corda.core.contracts.DummyContract
 import net.corda.core.contracts.StateAndRef
 import net.corda.core.contracts.StateRef
 import net.corda.core.contracts.TransactionType
-import net.corda.core.crypto.Party
 import net.corda.core.crypto.appendToCommonName
 import net.corda.core.crypto.commonName
 import net.corda.core.div
 import net.corda.core.getOrThrow
+import net.corda.core.identity.Party
 import net.corda.core.node.services.ServiceInfo
 import net.corda.core.node.services.ServiceType
 import net.corda.core.utilities.ALICE

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

@@ -3,7 +3,7 @@ package net.corda.node.services
 import net.corda.core.bufferUntilSubscribed
 import net.corda.core.contracts.Amount
 import net.corda.core.contracts.POUNDS
-import net.corda.core.crypto.Party
+import net.corda.core.identity.Party
 import net.corda.core.getOrThrow
 import net.corda.core.messaging.CordaRPCOps
 import net.corda.core.messaging.StateMachineUpdate

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

@@ -5,7 +5,7 @@ import net.corda.core.contracts.DummyContract
 import net.corda.core.contracts.StateAndRef
 import net.corda.core.contracts.StateRef
 import net.corda.core.contracts.TransactionType
-import net.corda.core.crypto.Party
+import net.corda.core.identity.Party
 import net.corda.core.getOrThrow
 import net.corda.core.map
 import net.corda.core.utilities.DUMMY_BANK_A

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

@@ -2,10 +2,10 @@ package net.corda.node.services.statemachine
 
 import co.paralleluniverse.fibers.Suspendable
 import com.google.common.util.concurrent.Futures
-import net.corda.core.crypto.Party
 import net.corda.core.flows.FlowLogic
 import net.corda.core.flows.InitiatingFlow
 import net.corda.core.getOrThrow
+import net.corda.core.identity.Party
 import net.corda.core.utilities.ALICE
 import net.corda.core.utilities.BOB
 import net.corda.core.utilities.unwrap

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

@@ -3,12 +3,12 @@ package net.corda.services.messaging
 import co.paralleluniverse.fibers.Suspendable
 import com.google.common.net.HostAndPort
 import net.corda.client.rpc.CordaRPCClient
-import net.corda.core.crypto.Party
 import net.corda.core.crypto.generateKeyPair
 import net.corda.core.crypto.toBase58String
 import net.corda.core.flows.FlowLogic
 import net.corda.core.flows.InitiatingFlow
 import net.corda.core.getOrThrow
+import net.corda.core.identity.Party
 import net.corda.core.messaging.CordaRPCOps
 import net.corda.core.random63BitValue
 import net.corda.core.utilities.ALICE

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

@@ -1,11 +1,11 @@
 package net.corda.services.messaging
 
 import com.google.common.util.concurrent.ListenableFuture
-import net.corda.core.crypto.Party
 import net.corda.core.crypto.X509Utilities
 import net.corda.core.crypto.commonName
 import net.corda.core.div
 import net.corda.core.getOrThrow
+import net.corda.core.identity.Party
 import net.corda.core.node.NodeInfo
 import net.corda.core.random63BitValue
 import net.corda.core.seconds

node/src/main/kotlin/net/corda/node/driver/Driver.kt

@@ -8,10 +8,10 @@ import com.typesafe.config.Config
 import com.typesafe.config.ConfigRenderOptions
 import net.corda.client.rpc.CordaRPCClient
 import net.corda.core.*
-import net.corda.core.crypto.Party
 import net.corda.core.crypto.X509Utilities
 import net.corda.core.crypto.appendToCommonName
 import net.corda.core.crypto.commonName
+import net.corda.core.identity.Party
 import net.corda.core.messaging.CordaRPCOps
 import net.corda.core.node.NodeInfo
 import net.corda.core.node.services.ServiceInfo

node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt

@@ -9,12 +9,12 @@ import net.corda.core.*
 import net.corda.core.contracts.Amount
 import net.corda.core.contracts.PartyAndReference
 import net.corda.core.crypto.KeyStoreUtilities
-import net.corda.core.crypto.Party
 import net.corda.core.crypto.X509Utilities
 import net.corda.core.crypto.replaceCommonName
 import net.corda.core.flows.FlowInitiator
 import net.corda.core.flows.FlowLogic
 import net.corda.core.flows.InitiatingFlow
+import net.corda.core.identity.Party
 import net.corda.core.messaging.CordaRPCOps
 import net.corda.core.messaging.RPCOps
 import net.corda.core.messaging.SingleMessageRecipient

node/src/main/kotlin/net/corda/node/services/CoreFlowHandlers.kt

@@ -5,7 +5,7 @@ import net.corda.core.contracts.ContractState
 import net.corda.core.contracts.TransactionType
 import net.corda.core.contracts.UpgradedContract
 import net.corda.core.contracts.requireThat
-import net.corda.core.crypto.Party
+import net.corda.core.identity.Party
 import net.corda.core.crypto.SecureHash
 import net.corda.core.flows.FlowException
 import net.corda.core.flows.FlowLogic

node/src/main/kotlin/net/corda/node/services/identity/InMemoryIdentityService.kt

@@ -1,8 +1,8 @@
 package net.corda.node.services.identity
 
 import net.corda.core.contracts.PartyAndReference
-import net.corda.core.crypto.AnonymousParty
-import net.corda.core.crypto.Party
+import net.corda.core.identity.AnonymousParty
+import net.corda.core.identity.Party
 import net.corda.core.node.services.IdentityService
 import net.corda.core.serialization.SingletonSerializeAsToken
 import net.corda.core.utilities.loggerFor