From 254592dc5488475ca6aa96afd456d829de25edb5 Mon Sep 17 00:00:00 2001
From: Ross Nicoll <ross.nicoll@r3cev.com>
Date: Tue, 12 Jul 2016 18:42:00 +0100
Subject: [PATCH] Move protocols into correct package

---
 .../protocols/AbstractStateReplacementProtocol.kt         | 2 +-
 .../{ => com/r3corda}/protocols/NotaryChangeProtocol.kt   | 4 ++--
 .../com/r3corda/node/services/NotaryChangeService.kt      | 4 ++--
 .../kotlin/com/r3corda/node/services/NotaryChangeTests.kt | 8 ++++----
 4 files changed, 9 insertions(+), 9 deletions(-)
 rename core/src/main/kotlin/{ => com/r3corda}/protocols/AbstractStateReplacementProtocol.kt (99%)
 rename core/src/main/kotlin/{ => com/r3corda}/protocols/NotaryChangeProtocol.kt (97%)

diff --git a/core/src/main/kotlin/protocols/AbstractStateReplacementProtocol.kt b/core/src/main/kotlin/com/r3corda/protocols/AbstractStateReplacementProtocol.kt
similarity index 99%
rename from core/src/main/kotlin/protocols/AbstractStateReplacementProtocol.kt
rename to core/src/main/kotlin/com/r3corda/protocols/AbstractStateReplacementProtocol.kt
index 02b9f9ae4d..ff38cb4ea6 100644
--- a/core/src/main/kotlin/protocols/AbstractStateReplacementProtocol.kt
+++ b/core/src/main/kotlin/com/r3corda/protocols/AbstractStateReplacementProtocol.kt
@@ -1,4 +1,4 @@
-package protocols
+package com.r3corda.protocols
 
 import co.paralleluniverse.fibers.Suspendable
 import com.r3corda.core.contracts.*
diff --git a/core/src/main/kotlin/protocols/NotaryChangeProtocol.kt b/core/src/main/kotlin/com/r3corda/protocols/NotaryChangeProtocol.kt
similarity index 97%
rename from core/src/main/kotlin/protocols/NotaryChangeProtocol.kt
rename to core/src/main/kotlin/com/r3corda/protocols/NotaryChangeProtocol.kt
index 7ec371acc4..31937b9391 100644
--- a/core/src/main/kotlin/protocols/NotaryChangeProtocol.kt
+++ b/core/src/main/kotlin/com/r3corda/protocols/NotaryChangeProtocol.kt
@@ -1,4 +1,4 @@
-package protocols
+package com.r3corda.protocols
 
 import co.paralleluniverse.fibers.Suspendable
 import com.r3corda.core.contracts.*
@@ -31,7 +31,7 @@ object NotaryChangeProtocol: AbstractStateReplacementProtocol<Party>() {
         override val topic: String get() = TOPIC
 
         override fun assembleProposal(stateRef: StateRef, modification: Party, stx: SignedTransaction): AbstractStateReplacementProtocol.Proposal<Party>
-            = NotaryChangeProtocol.Proposal(stateRef, modification, stx)
+            = Proposal(stateRef, modification, stx)
 
         override fun assembleTx(): Pair<SignedTransaction, List<PublicKey>> {
             val state = originalState.state
diff --git a/node/src/main/kotlin/com/r3corda/node/services/NotaryChangeService.kt b/node/src/main/kotlin/com/r3corda/node/services/NotaryChangeService.kt
index 8931ceedeb..57e97582d6 100644
--- a/node/src/main/kotlin/com/r3corda/node/services/NotaryChangeService.kt
+++ b/node/src/main/kotlin/com/r3corda/node/services/NotaryChangeService.kt
@@ -5,8 +5,8 @@ import com.r3corda.core.messaging.MessagingService
 import com.r3corda.core.node.services.NetworkMapCache
 import com.r3corda.node.services.api.AbstractNodeService
 import com.r3corda.node.services.statemachine.StateMachineManager
-import protocols.AbstractStateReplacementProtocol
-import protocols.NotaryChangeProtocol
+import com.r3corda.protocols.AbstractStateReplacementProtocol
+import com.r3corda.protocols.NotaryChangeProtocol
 
 /**
  * A service that monitors the network for requests for changing the notary of a state,
diff --git a/node/src/test/kotlin/com/r3corda/node/services/NotaryChangeTests.kt b/node/src/test/kotlin/com/r3corda/node/services/NotaryChangeTests.kt
index 1533564ea8..04fecd4814 100644
--- a/node/src/test/kotlin/com/r3corda/node/services/NotaryChangeTests.kt
+++ b/node/src/test/kotlin/com/r3corda/node/services/NotaryChangeTests.kt
@@ -10,12 +10,12 @@ import com.r3corda.node.internal.AbstractNode
 import com.r3corda.node.internal.testing.MockNetwork
 import com.r3corda.node.services.network.NetworkMapService
 import com.r3corda.node.services.transactions.SimpleNotaryService
+import com.r3corda.protocols.NotaryChangeProtocol
+import com.r3corda.protocols.NotaryChangeProtocol.Instigator
+import com.r3corda.protocols.StateReplacementException
+import com.r3corda.protocols.StateReplacementRefused
 import org.junit.Before
 import org.junit.Test
-import protocols.NotaryChangeProtocol
-import protocols.NotaryChangeProtocol.Instigator
-import protocols.StateReplacementException
-import protocols.StateReplacementRefused
 import java.time.Instant
 import java.util.*
 import java.util.concurrent.ExecutionException