Reorganise the file hierarchy a bit.

contracts/src/main/java/contracts/JavaCommercialPaper.java

@@ -12,6 +12,7 @@ import core.*;
 import core.TransactionForVerification.InOutGroup;
 import core.crypto.NullPublicKey;
 import core.crypto.SecureHash;
+import core.node.services.*;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 

contracts/src/main/kotlin/contracts/CrowdFund.kt

@@ -10,6 +10,7 @@ package contracts
 
 import core.*
 import core.crypto.SecureHash
+import core.node.services.DummyTimestampingAuthority
 import java.security.PublicKey
 import java.time.Instant
 import java.util.*

core/src/main/kotlin/core/Transactions.kt

@@ -14,6 +14,7 @@ import core.crypto.SecureHash
 import core.crypto.signWithECDSA
 import core.crypto.toStringShort
 import core.node.TimestampingError
+import core.node.services.TimestamperService
 import core.serialization.SerializedBytes
 import core.serialization.deserialize
 import core.serialization.serialize

core/src/main/kotlin/core/node/services/TimestamperService.kt

@@ -1,6 +1,16 @@
-package core
+/*
+ * Copyright 2015 Distributed Ledger Group LLC.  Distributed as Licensed Company IP to DLG Group Members
+ * pursuant to the August 7, 2015 Advisory Services Agreement and subject to the Company IP License terms
+ * set forth therein.
+ *
+ * All other rights reserved.
+ */
+
+package core.node.services
 
 import co.paralleluniverse.fibers.Suspendable
+import core.Party
+import core.WireTransaction
 import core.crypto.DigitalSignature
 import core.crypto.generateKeyPair
 import core.serialization.SerializedBytes

src/main/kotlin/core/TransactionTools.kt

@@ -8,6 +8,7 @@
 
 package core
 
+import core.node.services.AttachmentStorage
 import java.io.FileNotFoundException
 
 /**

src/main/kotlin/core/messaging/StateMachineManager.kt

@@ -15,7 +15,7 @@ import com.esotericsoftware.kryo.io.Input
 import com.google.common.base.Throwables
 import com.google.common.util.concurrent.ListenableFuture
 import com.google.common.util.concurrent.MoreExecutors
-import core.ServiceHub
+import core.node.services.ServiceHub
 import core.crypto.SecureHash
 import core.crypto.sha256
 import core.protocols.ProtocolLogic

src/main/kotlin/core/node/AbstractNode.kt

@@ -21,6 +21,7 @@ import core.*
 import core.crypto.SecureHash
 import core.crypto.generateKeyPair
 import core.messaging.*
+import core.node.services.*
 import core.serialization.deserialize
 import core.serialization.serialize
 import org.slf4j.Logger

src/main/kotlin/core/node/Node.kt

@@ -11,6 +11,7 @@ package core.node
 import com.google.common.net.HostAndPort
 import core.messaging.LegallyIdentifiableNode
 import core.messaging.MessagingService
+import core.node.services.ArtemisMessagingService
 import core.node.servlets.AttachmentDownloadServlet
 import core.node.servlets.AttachmentUploadServlet
 import core.utilities.loggerFor

src/main/kotlin/core/node/TraderDemo.kt

@@ -11,13 +11,17 @@ package core.node
 import co.paralleluniverse.fibers.Suspendable
 import com.google.common.net.HostAndPort
 import contracts.CommercialPaper
-import contracts.protocols.TwoPartyTradeProtocol
+import protocols.TwoPartyTradeProtocol
 import core.*
 import core.crypto.DigitalSignature
 import core.crypto.SecureHash
 import core.crypto.generateKeyPair
 import core.messaging.LegallyIdentifiableNode
 import core.messaging.SingleMessageRecipient
+import core.node.services.ArtemisMessagingService
+import core.node.services.NodeAttachmentStorage
+import core.node.services.NodeWalletService
+import core.node.services.TimestampingProtocol
 import core.protocols.ProtocolLogic
 import core.serialization.deserialize
 import core.utilities.ANSIProgressRenderer

src/main/kotlin/core/node/services/ArtemisMessagingService.kt

@@ -6,7 +6,7 @@
  * All other rights reserved.
  */
 
-package core.node
+package core.node.services
 
 import com.google.common.net.HostAndPort
 import core.RunOnCallerThread
@@ -133,7 +133,7 @@ class ArtemisMessagingService(val directory: Path, val myHostPort: HostAndPort)
         inboundConsumer = session.createConsumer("inbound").setMessageHandler { message: ClientMessage ->
             // This code runs for every inbound message.
             if (!message.containsProperty(TOPIC_PROPERTY)) {
-                log.warn("Received message without a $TOPIC_PROPERTY property, ignoring")
+                log.warn("Received message without a ${TOPIC_PROPERTY} property, ignoring")
                 // TODO: Figure out whether we always need to acknowledge messages, even when invalid.
                 return@setMessageHandler
             }

src/main/kotlin/core/node/services/DataVendingService.kt

@@ -6,11 +6,11 @@
  * All other rights reserved.
  */
 
-package core.node
+package core.node.services
 
-import contracts.protocols.FetchAttachmentsProtocol
-import contracts.protocols.FetchTransactionsProtocol
-import core.StorageService
+import protocols.FetchAttachmentsProtocol
+import protocols.FetchTransactionsProtocol
+import core.node.services.StorageService
 import core.crypto.SecureHash
 import core.messaging.Message
 import core.messaging.MessagingService

src/main/kotlin/core/node/services/E2ETestKeyManagementService.kt

@@ -6,9 +6,9 @@
  * All other rights reserved.
  */
 
-package core.node
+package core.node.services
 
-import core.KeyManagementService
+import core.node.services.KeyManagementService
 import core.ThreadBox
 import core.crypto.generateKeyPair
 import java.security.KeyPair

src/main/kotlin/core/node/services/FixedIdentityService.kt

@@ -6,7 +6,7 @@
  * All other rights reserved.
  */
 
-package core.node
+package core.node.services
 
 import core.IdentityService
 import core.Party

src/main/kotlin/core/node/services/NodeAttachmentStorage.kt

@@ -6,14 +6,14 @@
  * All other rights reserved.
  */
 
-package core.node
+package core.node.services
 
 import com.google.common.annotations.VisibleForTesting
 import com.google.common.hash.Hashing
 import com.google.common.hash.HashingInputStream
 import com.google.common.io.CountingInputStream
 import core.Attachment
-import core.AttachmentStorage
+import core.node.services.AttachmentStorage
 import core.crypto.SecureHash
 import core.extractZipFile
 import core.utilities.loggerFor

src/main/kotlin/core/node/services/NodeWalletService.kt

@@ -6,7 +6,7 @@
  * All other rights reserved.
  */
 
-package core.node
+package core.node.services
 
 import contracts.Cash
 import core.*

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

@@ -6,8 +6,9 @@
  * All other rights reserved.
  */
 
-package core
+package core.node.services
 
+import core.*
 import core.crypto.SecureHash
 import core.messaging.MessagingService
 import core.messaging.NetworkMap

src/main/kotlin/core/node/services/TimestamperNodeService.kt

@@ -6,7 +6,7 @@
  * All other rights reserved.
  */
 
-package core.node
+package core.node.services
 
 import co.paralleluniverse.common.util.VisibleForTesting
 import co.paralleluniverse.fibers.Suspendable
@@ -17,6 +17,8 @@ import core.messaging.LegallyIdentifiableNode
 import core.messaging.MessageRecipients
 import core.messaging.MessagingService
 import core.messaging.StateMachineManager
+import core.node.TimestampingError
+import core.node.services.TimestamperService
 import core.protocols.ProtocolLogic
 import core.serialization.SerializedBytes
 import core.serialization.deserialize

src/main/kotlin/core/node/servlets/AttachmentDownloadServlet.kt

@@ -8,7 +8,7 @@
 
 package core.node.servlets
 
-import core.StorageService
+import core.node.services.StorageService
 import core.crypto.SecureHash
 import core.utilities.loggerFor
 import java.io.FileNotFoundException

src/main/kotlin/core/node/servlets/AttachmentUploadServlet.kt

@@ -8,7 +8,7 @@
 
 package core.node.servlets
 
-import core.StorageService
+import core.node.services.StorageService
 import core.utilities.loggerFor
 import org.apache.commons.fileupload.servlet.ServletFileUpload
 import javax.servlet.http.HttpServlet

src/main/kotlin/core/protocols/ProtocolLogic.kt

@@ -9,7 +9,7 @@
 package core.protocols
 
 import co.paralleluniverse.fibers.Suspendable
-import core.ServiceHub
+import core.node.services.ServiceHub
 import core.messaging.MessageRecipients
 import core.utilities.ProgressTracker
 import core.utilities.UntrustworthyData

src/main/kotlin/core/protocols/ProtocolStateMachine.kt

@@ -14,7 +14,7 @@ import co.paralleluniverse.io.serialization.kryo.KryoSerializer
 import com.esotericsoftware.kryo.io.Output
 import com.google.common.util.concurrent.ListenableFuture
 import com.google.common.util.concurrent.SettableFuture
-import core.ServiceHub
+import core.node.services.ServiceHub
 import core.messaging.MessageRecipients
 import core.messaging.StateMachineManager
 import core.serialization.createKryo

src/main/kotlin/protocols/FetchAttachmentsProtocol.kt

@@ -6,7 +6,7 @@
  * All other rights reserved.
  */
 
-package contracts.protocols
+package protocols
 
 import core.Attachment
 import core.crypto.SecureHash

src/main/kotlin/protocols/FetchDataProtocol.kt

@@ -6,13 +6,13 @@
  * All other rights reserved.
  */
 
-package contracts.protocols
+package protocols
 
 import co.paralleluniverse.fibers.Suspendable
 import core.NamedByHash
 import core.crypto.SecureHash
 import core.messaging.SingleMessageRecipient
-import core.node.DataVendingService
+import core.node.services.DataVendingService
 import core.protocols.ProtocolLogic
 import core.random63BitValue
 import core.utilities.UntrustworthyData

src/main/kotlin/protocols/FetchTransactionsProtocol.kt

@@ -6,7 +6,7 @@
  * All other rights reserved.
  */
 
-package contracts.protocols
+package protocols
 
 import core.SignedTransaction
 import core.crypto.SecureHash

src/main/kotlin/protocols/ResolveTransactionsProtocol.kt

@@ -6,7 +6,7 @@
  * All other rights reserved.
  */
 
-package contracts.protocols
+package protocols
 
 import co.paralleluniverse.fibers.Suspendable
 import core.*

src/main/kotlin/protocols/TwoPartyTradeProtocol.kt

@@ -6,7 +6,7 @@
  * All other rights reserved.
  */
 
-package contracts.protocols
+package protocols
 
 import co.paralleluniverse.fibers.Suspendable
 import com.google.common.util.concurrent.ListenableFuture
@@ -18,7 +18,7 @@ import core.crypto.signWithECDSA
 import core.messaging.LegallyIdentifiableNode
 import core.messaging.SingleMessageRecipient
 import core.messaging.StateMachineManager
-import core.node.TimestampingProtocol
+import core.node.services.TimestampingProtocol
 import core.protocols.ProtocolLogic
 import core.utilities.ProgressTracker
 import core.utilities.trace
@@ -57,14 +57,14 @@ object TwoPartyTradeProtocol {
                   otherSide: SingleMessageRecipient, assetToSell: StateAndRef<OwnableState>, price: Amount,
                   myKeyPair: KeyPair, buyerSessionID: Long): ListenableFuture<SignedTransaction> {
         val seller = Seller(otherSide, timestampingAuthority, assetToSell, price, myKeyPair, buyerSessionID)
-        return smm.add("$TRADE_TOPIC.seller", seller)
+        return smm.add("${TRADE_TOPIC}.seller", seller)
     }
 
     fun runBuyer(smm: StateMachineManager, timestampingAuthority: LegallyIdentifiableNode,
                  otherSide: SingleMessageRecipient, acceptablePrice: Amount, typeToBuy: Class<out OwnableState>,
                  sessionID: Long): ListenableFuture<SignedTransaction> {
         val buyer = Buyer(otherSide, timestampingAuthority.identity, acceptablePrice, typeToBuy, sessionID)
-        return smm.add("$TRADE_TOPIC.buyer", buyer)
+        return smm.add("${TRADE_TOPIC}.buyer", buyer)
     }
 
     class UnacceptablePriceException(val givenPrice: Amount) : Exception()
@@ -179,7 +179,7 @@ object TwoPartyTradeProtocol {
 
         @Suspendable
         private fun sendSignatures(partialTX: SignedTransaction, ourSignature: DigitalSignature.WithKey,
-                                tsaSig: DigitalSignature.LegallyIdentifiable): SignedTransaction {
+                                   tsaSig: DigitalSignature.LegallyIdentifiable): SignedTransaction {
             progressTracker.currentStep = SENDING_SIGS
             val fullySigned = partialTX + tsaSig + ourSignature
 

src/test/kotlin/contracts/CommercialPaperTests.kt

@@ -11,6 +11,7 @@ package contracts
 import core.*
 import core.crypto.SecureHash
 import core.node.TimestampingError
+import core.node.services.DummyTimestampingAuthority
 import core.testutils.*
 import org.junit.Test
 import org.junit.runner.RunWith

src/test/kotlin/contracts/CrowdFundTests.kt

@@ -10,6 +10,7 @@ package contracts
 
 import core.*
 import core.crypto.SecureHash
+import core.node.services.DummyTimestampingAuthority
 import core.testutils.*
 import org.junit.Test
 import java.time.Instant

src/test/kotlin/core/MockServices.kt

@@ -12,8 +12,8 @@ import core.crypto.*
 import core.messaging.MessagingService
 import core.messaging.MockNetworkMap
 import core.messaging.NetworkMap
-import core.node.DataVendingService
 import core.node.TimestampingError
+import core.node.services.*
 import core.serialization.SerializedBytes
 import core.serialization.deserialize
 import core.testutils.RecordingMap

src/test/kotlin/core/messaging/AttachmentTests.kt

@@ -8,13 +8,13 @@
 
 package core.messaging
 
-import contracts.protocols.FetchAttachmentsProtocol
-import contracts.protocols.FetchDataProtocol
+import protocols.FetchAttachmentsProtocol
+import protocols.FetchDataProtocol
 import core.Attachment
 import core.crypto.SecureHash
 import core.crypto.sha256
 import core.node.MockNetwork
-import core.node.NodeAttachmentStorage
+import core.node.services.NodeAttachmentStorage
 import core.serialization.OpaqueBytes
 import core.testutils.rootCauseExceptions
 import core.utilities.BriefLogFormatter

src/test/kotlin/core/messaging/InMemoryMessagingNetwork.kt

@@ -11,10 +11,10 @@ package core.messaging
 import com.google.common.util.concurrent.Futures
 import com.google.common.util.concurrent.ListenableFuture
 import com.google.common.util.concurrent.MoreExecutors
-import core.DummyTimestampingAuthority
+import core.node.services.DummyTimestampingAuthority
 import core.ThreadBox
 import core.crypto.sha256
-import core.node.TimestamperNodeService
+import core.node.services.TimestamperNodeService
 import core.utilities.loggerFor
 import java.time.Instant
 import java.util.*

src/test/kotlin/core/messaging/TwoPartyTradeProtocolTests.kt

@@ -10,12 +10,11 @@ package core.messaging
 
 import contracts.Cash
 import contracts.CommercialPaper
-import contracts.protocols.TwoPartyTradeProtocol
+import protocols.TwoPartyTradeProtocol
 import core.*
 import core.crypto.SecureHash
 import core.node.MockNetwork
-import core.node.NodeAttachmentStorage
-import core.node.NodeWalletService
+import core.node.services.*
 import core.testutils.*
 import core.utilities.BriefLogFormatter
 import org.junit.After

src/test/kotlin/core/node/MockNode.kt

@@ -23,6 +23,7 @@ import core.Party
 import core.messaging.InMemoryMessagingNetwork
 import core.messaging.LegallyIdentifiableNode
 import core.messaging.MessagingService
+import core.node.services.FixedIdentityService
 import core.testutils.TEST_KEYS_TO_CORP_MAP
 import core.utilities.loggerFor
 import org.slf4j.Logger

src/test/kotlin/core/node/NodeAttachmentStorageTest.kt

@@ -11,6 +11,7 @@ package core.node
 import com.google.common.jimfs.Configuration
 import com.google.common.jimfs.Jimfs
 import core.crypto.SecureHash
+import core.node.services.NodeAttachmentStorage
 import core.use
 import org.junit.Before
 import org.junit.Test

src/test/kotlin/core/node/NodeWalletServiceTest.kt

@@ -10,6 +10,8 @@ package core.node
 
 import contracts.Cash
 import core.*
+import core.node.services.NodeWalletService
+import core.node.services.ServiceHub
 import core.testutils.*
 import core.utilities.BriefLogFormatter
 import org.junit.After

src/test/kotlin/core/node/TimestamperNodeServiceTest.kt

@@ -12,6 +12,10 @@ import co.paralleluniverse.fibers.Suspendable
 import core.*
 import core.crypto.SecureHash
 import core.messaging.*
+import core.node.services.ServiceHub
+import core.node.services.TimestamperNodeService
+import core.node.services.TimestampingMessages
+import core.node.services.TimestampingProtocol
 import core.protocols.ProtocolLogic
 import core.serialization.serialize
 import core.testutils.ALICE

src/test/kotlin/core/testutils/TestUtils.kt

@@ -14,6 +14,7 @@ import com.google.common.base.Throwables
 import contracts.*
 import core.*
 import core.crypto.*
+import core.node.services.DummyTimestampingAuthority
 import core.serialization.serialize
 import core.visualiser.GraphVisualiser
 import java.security.KeyPair