From 63a5fd1b9e3f868c5311c95ba1f8fa34ac8fec6d Mon Sep 17 00:00:00 2001 From: Matthew Nesbit Date: Mon, 23 May 2016 14:53:56 +0100 Subject: [PATCH 1/4] Add com.r3corda to all namespaces. --- .idea/modules.xml | 15 ++++ build.gradle | 6 +- .../contracts/AnotherDummyContract.kt | 12 +-- .../core/node/DummyContractBackdoor.kt | 12 +++ .../kotlin/core/node/DummyContractBackdoor.kt | 12 --- .../contracts/ICommercialPaperState.java | 8 +- .../contracts/JavaCommercialPaper.java | 14 ++-- .../{ => com/r3corda}/contracts/Cash.kt | 18 ++--- .../r3corda}/contracts/CommercialPaper.kt | 16 ++-- .../{ => com/r3corda}/contracts/CrowdFund.kt | 10 +-- .../r3corda}/contracts/DummyContract.kt | 10 +-- .../kotlin/{ => com/r3corda}/contracts/IRS.kt | 10 +-- .../{ => com/r3corda}/contracts/IRSExport.kt | 2 +- .../{ => com/r3corda}/contracts/IRSUtils.kt | 6 +- .../contracts/cash/CashIssuanceDefinition.kt | 6 +- .../contracts/cash/CommonCashState.kt | 8 +- .../r3corda}/contracts/testing/TestUtils.kt | 16 ++-- .../protocols/TwoPartyTradeProtocol.kt | 28 +++---- .../{ => com/r3corda}/contracts/CashTests.kt | 24 +++--- .../contracts/CommercialPaperTests.kt | 18 ++--- .../r3corda}/contracts/CrowdFundTests.kt | 18 ++--- .../{ => com/r3corda}/contracts/IRSTests.kt | 10 +-- .../core/crypto/AddressFormatException.java | 2 +- .../{ => com/r3corda}/core/crypto/Base58.java | 2 +- .../kotlin/{ => com/r3corda}/core/Utils.kt | 2 +- .../r3corda}/core/contracts/ContractsDSL.kt | 6 +- .../r3corda}/core/contracts/FinanceTypes.kt | 4 +- .../r3corda}/core/contracts/Structures.kt | 20 ++--- .../core/contracts/TransactionBuilder.kt | 18 ++--- .../core/contracts/TransactionGraphSearch.kt | 10 +-- .../core/contracts/TransactionTools.kt | 14 ++-- .../core/contracts/TransactionVerification.kt | 8 +- .../r3corda}/core/contracts/Transactions.kt | 22 ++--- .../r3corda}/core/crypto/CryptoUtilities.kt | 10 +-- .../{ => com/r3corda}/core/crypto/Party.kt | 6 +- .../r3corda}/core/math/Interpolators.kt | 2 +- .../r3corda}/core/messaging/Messaging.kt | 4 +- .../core/node/AttachmentsClassLoader.kt | 6 +- .../{ => com/r3corda}/core/node/NodeInfo.kt | 8 +- .../core/node/PhysicalLocationStructures.kt | 2 +- .../{ => com/r3corda}/core/node/ServiceHub.kt | 12 +-- .../core/node/services/AttachmentStorage.kt | 6 +- .../core/node/services/IdentityService.kt | 4 +- .../core/node/services/NetworkMapCache.kt | 12 +-- .../core/node/services/ServiceType.kt | 2 +- .../r3corda}/core/node/services/Services.kt | 10 +-- .../core/node/services/UniquenessProvider.kt | 10 +-- .../node/services/testing/MockServices.kt | 24 +++--- .../r3corda}/core/protocols/ProtocolLogic.kt | 10 +-- .../core/protocols/ProtocolStateMachine.kt | 8 +- .../r3corda}/core/serialization/ByteArrays.kt | 2 +- .../r3corda}/core/serialization/Kryo.kt | 14 ++-- .../core/serialization/SerializationToken.kt | 2 +- .../r3corda}/core/testing/TestUtils.kt | 14 ++-- .../{ => com/r3corda}/core/utilities/Emoji.kt | 2 +- .../r3corda}/core/utilities/Logging.kt | 2 +- .../core/utilities/ProgressTracker.kt | 4 +- .../r3corda}/core/utilities/RecordingMap.kt | 2 +- .../core/utilities/UntrustworthyData.kt | 2 +- .../protocols/AbstractRequestMessage.kt | 4 +- .../protocols/FetchAttachmentsProtocol.kt | 10 +-- .../r3corda}/protocols/FetchDataProtocol.kt | 14 ++-- .../protocols/FetchTransactionsProtocol.kt | 8 +- .../r3corda}/protocols/NotaryProtocol.kt | 28 +++---- .../r3corda}/protocols/RatesFixProtocol.kt | 22 ++--- .../protocols/ResolveTransactionsProtocol.kt | 12 +-- .../protocols/TwoPartyDealProtocol.kt | 26 +++--- .../core/contracts/LondonHolidayCalendar.txt | 0 .../core/contracts/NewYorkHolidayCalendar.txt | 0 .../{ => com/r3corda}/core/node/cities.txt | 0 .../com/r3corda/core/node/isolated.jar | Bin 0 -> 7553 bytes .../src/main/resources/core/node/isolated.jar | Bin 6945 -> 0 bytes .../r3corda}/core/FinanceTypesTest.kt | 4 +- .../core/contracts/TransactionGroupTests.kt | 10 +-- .../r3corda}/core/crypto/Base58Test.java | 2 +- .../r3corda}/core/crypto/SignedDataTest.kt | 4 +- .../r3corda}/core/math/InterpolatorsTest.kt | 4 +- .../core/node/AttachmentClassLoaderTests.kt | 30 +++---- .../r3corda}/core/serialization/KryoTests.kt | 2 +- .../serialization/SerializationTokenTest.kt | 2 +- .../TransactionSerializationTests.kt | 14 ++-- .../utilities/CollectionExtensionTests.kt | 6 +- .../core/utilities/EmbeddedExpressionsTest.kt | 2 +- .../core/utilities/ProgressTrackerTest.kt | 2 +- .../{ => com/r3corda}/node/api/APIServer.kt | 18 ++--- .../{ => com/r3corda}/node/api/Query.kt | 2 +- .../r3corda}/node/internal/APIServerImpl.kt | 18 ++--- .../r3corda}/node/internal/AbstractNode.kt | 76 +++++++++--------- .../{ => com/r3corda}/node/internal/Node.kt | 26 +++--- .../node/internal/testing/IRSSimulation.kt | 28 +++---- .../node/internal/testing/MockNode.kt | 30 +++---- .../node/internal/testing/Simulation.kt | 26 +++--- .../node/internal/testing/TestUtils.kt | 14 ++-- .../node/internal/testing/TradeSimulation.kt | 20 ++--- .../node/services/api/AbstractNodeService.kt | 14 ++-- .../node/services/api/AcceptsFileUpload.kt | 2 +- .../node/services/api/CheckpointStorage.kt | 8 +- .../node/services/api/MonitoringService.kt | 2 +- .../node/services/api/RegulatorService.kt | 4 +- .../node/services/api/ServiceHubInternal.kt | 4 +- .../services/clientapi/NodeInterestRates.kt | 26 +++--- .../node/services/config/NodeConfiguration.kt | 2 +- .../identity/InMemoryIdentityService.kt | 6 +- .../keys/E2ETestKeyManagementService.kt | 8 +- .../messaging/ArtemisMessagingService.kt | 12 +-- .../network/InMemoryMessagingNetwork.kt | 12 +-- .../network/InMemoryNetworkMapCache.kt | 38 ++++----- .../services/network/MockNetworkMapCache.kt | 10 +-- .../services/network/NetworkMapService.kt | 32 ++++---- .../persistence/DataVendingService.kt | 18 ++--- .../persistence/NodeAttachmentService.kt | 14 ++-- .../persistence/PerFileCheckpointStorage.kt | 16 ++-- .../persistence/StorageServiceImpl.kt | 14 ++-- .../statemachine/ProtocolStateMachineImpl.kt | 22 ++--- .../statemachine/StateMachineManager.kt | 34 ++++---- .../InMemoryUniquenessProvider.kt | 14 ++-- .../services/transactions/NotaryService.kt | 40 ++++----- .../services/transactions/TimestampChecker.kt | 8 +- .../node/services/wallet/NodeWalletService.kt | 22 ++--- .../node/services/wallet/WalletImpl.kt | 14 ++-- .../servlets/AttachmentDownloadServlet.kt | 8 +- .../{ => com/r3corda}/node/servlets/Config.kt | 6 +- .../node/servlets/DataUploadServlet.kt | 8 +- .../r3corda}/node/servlets/ResponseFilter.kt | 2 +- .../node/utilities/ANSIProgressRenderer.kt | 8 +- .../r3corda}/node/utilities/AddOrRemove.kt | 2 +- .../node/utilities/AffinityExecutor.kt | 4 +- .../r3corda}/node/utilities/JsonSupport.kt | 10 +-- .../node/internal/testing/example.rates.txt | 0 .../r3corda}/node/internal/testing/trade.json | 0 .../node/messaging/AttachmentTests.kt | 32 ++++---- .../node/messaging/InMemoryMessagingTests.kt | 12 +-- .../messaging/TwoPartyTradeProtocolTests.kt | 60 +++++++------- .../services/ArtemisMessagingServiceTests.kt | 10 +-- .../services/InMemoryNetworkMapCacheTest.kt | 4 +- .../services/InMemoryNetworkMapServiceTest.kt | 22 ++--- .../r3corda}/node/services/MockServices.kt | 26 +++--- .../services/NodeAttachmentStorageTest.kt | 8 +- .../node/services/NodeInterestRatesTest.kt | 30 +++---- .../node/services/NodeWalletServiceTest.kt | 24 +++--- .../node/services/NotaryServiceTests.kt | 20 ++--- .../services/PerFileCheckpointStorageTests.kt | 8 +- .../node/services/TimestampCheckerTests.kt | 8 +- .../node/services/UniquenessProviderTests.kt | 12 +-- .../node/utilities/AffinityExecutorTests.kt | 2 +- .../r3corda}/node/visualiser/GraphStream.kt | 2 +- .../node/visualiser/GroupToGraphConversion.kt | 10 +-- .../r3corda}/node/visualiser/StateViewer.form | 2 +- .../r3corda}/node/visualiser/StateViewer.java | 2 +- .../r3corda}/node/visualiser/graph.css | 0 .../{ => com/r3corda}/demos/DemoClock.kt | 2 +- .../kotlin/{ => com/r3corda}/demos/IRSDemo.kt | 36 ++++----- .../{ => com/r3corda}/demos/RateFixDemo.kt | 38 ++++----- .../{ => com/r3corda}/demos/TraderDemo.kt | 58 ++++++------- .../r3corda}/demos/api/InterestRateSwapAPI.kt | 18 ++--- .../demos/protocols/AutoOfferProtocol.kt | 24 +++--- .../demos/protocols/ExitServerProtocol.kt | 12 +-- .../protocols/UpdateBusinessDayProtocol.kt | 30 +++---- .../r3corda}/demos/bank-of-london-cp.jar | Bin .../core/testing/IRSSimulationTest.kt | 6 +- 160 files changed, 1004 insertions(+), 989 deletions(-) rename contracts/isolated/src/main/kotlin/{ => com/r3corda}/contracts/AnotherDummyContract.kt (82%) create mode 100644 contracts/isolated/src/main/kotlin/com/r3corda/core/node/DummyContractBackdoor.kt delete mode 100644 contracts/isolated/src/main/kotlin/core/node/DummyContractBackdoor.kt rename contracts/src/main/java/{ => com/r3corda}/contracts/ICommercialPaperState.java (81%) rename contracts/src/main/java/{ => com/r3corda}/contracts/JavaCommercialPaper.java (96%) rename contracts/src/main/kotlin/{ => com/r3corda}/contracts/Cash.kt (97%) rename contracts/src/main/kotlin/{ => com/r3corda}/contracts/CommercialPaper.kt (96%) rename contracts/src/main/kotlin/{ => com/r3corda}/contracts/CrowdFund.kt (98%) rename contracts/src/main/kotlin/{ => com/r3corda}/contracts/DummyContract.kt (83%) rename contracts/src/main/kotlin/{ => com/r3corda}/contracts/IRS.kt (99%) rename contracts/src/main/kotlin/{ => com/r3corda}/contracts/IRSExport.kt (93%) rename contracts/src/main/kotlin/{ => com/r3corda}/contracts/IRSUtils.kt (97%) rename contracts/src/main/kotlin/{ => com/r3corda}/contracts/cash/CashIssuanceDefinition.kt (74%) rename contracts/src/main/kotlin/{ => com/r3corda}/contracts/cash/CommonCashState.kt (62%) rename contracts/src/main/kotlin/{ => com/r3corda}/contracts/testing/TestUtils.kt (86%) rename contracts/src/main/kotlin/{ => com/r3corda}/protocols/TwoPartyTradeProtocol.kt (95%) rename contracts/src/test/kotlin/{ => com/r3corda}/contracts/CashTests.kt (96%) rename contracts/src/test/kotlin/{ => com/r3corda}/contracts/CommercialPaperTests.kt (96%) rename contracts/src/test/kotlin/{ => com/r3corda}/contracts/CrowdFundTests.kt (94%) rename contracts/src/test/kotlin/{ => com/r3corda}/contracts/IRSTests.kt (99%) rename core/src/main/java/{ => com/r3corda}/core/crypto/AddressFormatException.java (86%) rename core/src/main/java/{ => com/r3corda}/core/crypto/Base58.java (99%) rename core/src/main/kotlin/{ => com/r3corda}/core/Utils.kt (98%) rename core/src/main/kotlin/{ => com/r3corda}/core/contracts/ContractsDSL.kt (97%) rename core/src/main/kotlin/{ => com/r3corda}/core/contracts/FinanceTypes.kt (99%) rename core/src/main/kotlin/{ => com/r3corda}/core/contracts/Structures.kt (95%) rename core/src/main/kotlin/{ => com/r3corda}/core/contracts/TransactionBuilder.kt (93%) rename core/src/main/kotlin/{ => com/r3corda}/core/contracts/TransactionGraphSearch.kt (87%) rename core/src/main/kotlin/{ => com/r3corda}/core/contracts/TransactionTools.kt (78%) rename core/src/main/kotlin/{ => com/r3corda}/core/contracts/TransactionVerification.kt (98%) rename core/src/main/kotlin/{ => com/r3corda}/core/contracts/Transactions.kt (94%) rename core/src/main/kotlin/{ => com/r3corda}/core/crypto/CryptoUtilities.kt (96%) rename core/src/main/kotlin/{ => com/r3corda}/core/crypto/Party.kt (75%) rename core/src/main/kotlin/{ => com/r3corda}/core/math/Interpolators.kt (99%) rename core/src/main/kotlin/{ => com/r3corda}/core/messaging/Messaging.kt (98%) rename core/src/main/kotlin/{ => com/r3corda}/core/node/AttachmentsClassLoader.kt (97%) rename core/src/main/kotlin/{ => com/r3corda}/core/node/NodeInfo.kt (64%) rename core/src/main/kotlin/{ => com/r3corda}/core/node/PhysicalLocationStructures.kt (98%) rename core/src/main/kotlin/{ => com/r3corda}/core/node/ServiceHub.kt (92%) rename core/src/main/kotlin/{ => com/r3corda}/core/node/services/AttachmentStorage.kt (91%) rename core/src/main/kotlin/{ => com/r3corda}/core/node/services/IdentityService.kt (90%) rename core/src/main/kotlin/{ => com/r3corda}/core/node/services/NetworkMapCache.kt (93%) rename core/src/main/kotlin/{ => com/r3corda}/core/node/services/ServiceType.kt (96%) rename core/src/main/kotlin/{ => com/r3corda}/core/node/services/Services.kt (96%) rename core/src/main/kotlin/{ => com/r3corda}/core/node/services/UniquenessProvider.kt (83%) rename core/src/main/kotlin/{ => com/r3corda}/core/node/services/testing/MockServices.kt (86%) rename core/src/main/kotlin/{ => com/r3corda}/core/protocols/ProtocolLogic.kt (94%) rename core/src/main/kotlin/{ => com/r3corda}/core/protocols/ProtocolStateMachine.kt (80%) rename core/src/main/kotlin/{ => com/r3corda}/core/serialization/ByteArrays.kt (96%) rename core/src/main/kotlin/{ => com/r3corda}/core/serialization/Kryo.kt (97%) rename core/src/main/kotlin/{ => com/r3corda}/core/serialization/SerializationToken.kt (99%) rename core/src/main/kotlin/{ => com/r3corda}/core/testing/TestUtils.kt (97%) rename core/src/main/kotlin/{ => com/r3corda}/core/utilities/Emoji.kt (97%) rename core/src/main/kotlin/{ => com/r3corda}/core/utilities/Logging.kt (99%) rename core/src/main/kotlin/{ => com/r3corda}/core/utilities/ProgressTracker.kt (99%) rename core/src/main/kotlin/{ => com/r3corda}/core/utilities/RecordingMap.kt (97%) rename core/src/main/kotlin/{ => com/r3corda}/core/utilities/UntrustworthyData.kt (96%) rename core/src/main/kotlin/{ => com/r3corda}/protocols/AbstractRequestMessage.kt (64%) rename core/src/main/kotlin/{ => com/r3corda}/protocols/FetchAttachmentsProtocol.kt (85%) rename core/src/main/kotlin/{ => com/r3corda}/protocols/FetchDataProtocol.kt (93%) rename core/src/main/kotlin/{ => com/r3corda}/protocols/FetchTransactionsProtocol.kt (84%) rename core/src/main/kotlin/{ => com/r3corda}/protocols/NotaryProtocol.kt (87%) rename core/src/main/kotlin/{ => com/r3corda}/protocols/RatesFixProtocol.kt (89%) rename core/src/main/kotlin/{ => com/r3corda}/protocols/ResolveTransactionsProtocol.kt (96%) rename core/src/main/kotlin/{ => com/r3corda}/protocols/TwoPartyDealProtocol.kt (97%) rename core/src/main/resources/{ => com/r3corda}/core/contracts/LondonHolidayCalendar.txt (100%) rename core/src/main/resources/{ => com/r3corda}/core/contracts/NewYorkHolidayCalendar.txt (100%) rename core/src/main/resources/{ => com/r3corda}/core/node/cities.txt (100%) create mode 100644 core/src/main/resources/com/r3corda/core/node/isolated.jar delete mode 100644 core/src/main/resources/core/node/isolated.jar rename core/src/test/kotlin/{ => com/r3corda}/core/FinanceTypesTest.kt (98%) rename core/src/test/kotlin/{ => com/r3corda}/core/contracts/TransactionGroupTests.kt (96%) rename core/src/test/kotlin/{ => com/r3corda}/core/crypto/Base58Test.java (98%) rename core/src/test/kotlin/{ => com/r3corda}/core/crypto/SignedDataTest.kt (91%) rename core/src/test/kotlin/{ => com/r3corda}/core/math/InterpolatorsTest.kt (97%) rename core/src/test/kotlin/{ => com/r3corda}/core/node/AttachmentClassLoaderTests.kt (90%) rename core/src/test/kotlin/{ => com/r3corda}/core/serialization/KryoTests.kt (95%) rename core/src/test/kotlin/{ => com/r3corda}/core/serialization/SerializationTokenTest.kt (98%) rename core/src/test/kotlin/{ => com/r3corda}/core/serialization/TransactionSerializationTests.kt (93%) rename core/src/test/kotlin/{ => com/r3corda}/core/utilities/CollectionExtensionTests.kt (91%) rename core/src/test/kotlin/{ => com/r3corda}/core/utilities/EmbeddedExpressionsTest.kt (90%) rename core/src/test/kotlin/{ => com/r3corda}/core/utilities/ProgressTrackerTest.kt (98%) rename node/src/main/kotlin/{ => com/r3corda}/node/api/APIServer.kt (92%) rename node/src/main/kotlin/{ => com/r3corda}/node/api/Query.kt (95%) rename node/src/main/kotlin/{ => com/r3corda}/node/internal/APIServerImpl.kt (92%) rename node/src/main/kotlin/{ => com/r3corda}/node/internal/AbstractNode.kt (86%) rename node/src/main/kotlin/{ => com/r3corda}/node/internal/Node.kt (92%) rename node/src/main/kotlin/{ => com/r3corda}/node/internal/testing/IRSSimulation.kt (90%) rename node/src/main/kotlin/{ => com/r3corda}/node/internal/testing/MockNode.kt (90%) rename node/src/main/kotlin/{ => com/r3corda}/node/internal/testing/Simulation.kt (94%) rename node/src/main/kotlin/{ => com/r3corda}/node/internal/testing/TestUtils.kt (59%) rename node/src/main/kotlin/{ => com/r3corda}/node/internal/testing/TradeSimulation.kt (84%) rename node/src/main/kotlin/{ => com/r3corda}/node/services/api/AbstractNodeService.kt (87%) rename node/src/main/kotlin/{ => com/r3corda}/node/services/api/AcceptsFileUpload.kt (94%) rename node/src/main/kotlin/{ => com/r3corda}/node/services/api/CheckpointStorage.kt (87%) rename node/src/main/kotlin/{ => com/r3corda}/node/services/api/MonitoringService.kt (73%) rename node/src/main/kotlin/{ => com/r3corda}/node/services/api/RegulatorService.kt (60%) rename node/src/main/kotlin/{ => com/r3corda}/node/services/api/ServiceHubInternal.kt (53%) rename node/src/main/kotlin/{ => com/r3corda}/node/services/clientapi/NodeInterestRates.kt (93%) rename node/src/main/kotlin/{ => com/r3corda}/node/services/config/NodeConfiguration.kt (94%) rename node/src/main/kotlin/{ => com/r3corda}/node/services/identity/InMemoryIdentityService.kt (84%) rename node/src/main/kotlin/{ => com/r3corda}/node/services/keys/E2ETestKeyManagementService.kt (86%) rename node/src/main/kotlin/{ => com/r3corda}/node/services/messaging/ArtemisMessagingService.kt (98%) rename node/src/main/kotlin/{ => com/r3corda}/node/services/network/InMemoryMessagingNetwork.kt (98%) rename node/src/main/kotlin/{ => com/r3corda}/node/services/network/InMemoryNetworkMapCache.kt (86%) rename node/src/main/kotlin/{ => com/r3corda}/node/services/network/MockNetworkMapCache.kt (86%) rename node/src/main/kotlin/{ => com/r3corda}/node/services/network/NetworkMapService.kt (94%) rename node/src/main/kotlin/{ => com/r3corda}/node/services/persistence/DataVendingService.kt (84%) rename node/src/main/kotlin/{ => com/r3corda}/node/services/persistence/NodeAttachmentService.kt (95%) rename node/src/main/kotlin/{ => com/r3corda}/node/services/persistence/PerFileCheckpointStorage.kt (85%) rename node/src/main/kotlin/{ => com/r3corda}/node/services/persistence/StorageServiceImpl.kt (80%) rename node/src/main/kotlin/{ => com/r3corda}/node/services/statemachine/ProtocolStateMachineImpl.kt (89%) rename node/src/main/kotlin/{ => com/r3corda}/node/services/statemachine/StateMachineManager.kt (94%) rename node/src/main/kotlin/{ => com/r3corda}/node/services/transactions/InMemoryUniquenessProvider.kt (80%) rename node/src/main/kotlin/{ => com/r3corda}/node/services/transactions/NotaryService.kt (78%) rename node/src/main/kotlin/{ => com/r3corda}/node/services/transactions/TimestampChecker.kt (83%) rename node/src/main/kotlin/{ => com/r3corda}/node/services/wallet/NodeWalletService.kt (94%) rename node/src/main/kotlin/{ => com/r3corda}/node/services/wallet/WalletImpl.kt (81%) rename node/src/main/kotlin/{ => com/r3corda}/node/servlets/AttachmentDownloadServlet.kt (93%) rename node/src/main/kotlin/{ => com/r3corda}/node/servlets/Config.kt (81%) rename node/src/main/kotlin/{ => com/r3corda}/node/servlets/DataUploadServlet.kt (93%) rename node/src/main/kotlin/{ => com/r3corda}/node/servlets/ResponseFilter.kt (97%) rename node/src/main/kotlin/{ => com/r3corda}/node/utilities/ANSIProgressRenderer.kt (96%) rename node/src/main/kotlin/{ => com/r3corda}/node/utilities/AddOrRemove.kt (81%) rename node/src/main/kotlin/{ => com/r3corda}/node/utilities/AffinityExecutor.kt (98%) rename node/src/main/kotlin/{ => com/r3corda}/node/utilities/JsonSupport.kt (96%) rename node/src/main/resources/{ => com/r3corda}/node/internal/testing/example.rates.txt (100%) rename node/src/main/resources/{ => com/r3corda}/node/internal/testing/trade.json (100%) rename node/src/test/kotlin/{ => com/r3corda}/node/messaging/AttachmentTests.kt (83%) rename node/src/test/kotlin/{ => com/r3corda}/node/messaging/InMemoryMessagingTests.kt (93%) rename node/src/test/kotlin/{ => com/r3corda}/node/messaging/TwoPartyTradeProtocolTests.kt (93%) rename node/src/test/kotlin/{ => com/r3corda}/node/services/ArtemisMessagingServiceTests.kt (84%) rename node/src/test/kotlin/{ => com/r3corda}/node/services/InMemoryNetworkMapCacheTest.kt (83%) rename node/src/test/kotlin/{ => com/r3corda}/node/services/InMemoryNetworkMapServiceTest.kt (94%) rename node/src/test/kotlin/{ => com/r3corda}/node/services/MockServices.kt (76%) rename node/src/test/kotlin/{ => com/r3corda}/node/services/NodeAttachmentStorageTest.kt (95%) rename node/src/test/kotlin/{ => com/r3corda}/node/services/NodeInterestRatesTest.kt (85%) rename node/src/test/kotlin/{ => com/r3corda}/node/services/NodeWalletServiceTest.kt (83%) rename node/src/test/kotlin/{ => com/r3corda}/node/services/NotaryServiceTests.kt (87%) rename node/src/test/kotlin/{ => com/r3corda}/node/services/PerFileCheckpointStorageTests.kt (94%) rename node/src/test/kotlin/{ => com/r3corda}/node/services/TimestampCheckerTests.kt (86%) rename node/src/test/kotlin/{ => com/r3corda}/node/services/UniquenessProviderTests.kt (79%) rename node/src/test/kotlin/{ => com/r3corda}/node/utilities/AffinityExecutorTests.kt (98%) rename node/src/test/kotlin/{ => com/r3corda}/node/visualiser/GraphStream.kt (98%) rename node/src/test/kotlin/{ => com/r3corda}/node/visualiser/GroupToGraphConversion.kt (93%) rename node/src/test/kotlin/{ => com/r3corda}/node/visualiser/StateViewer.form (95%) rename node/src/test/kotlin/{ => com/r3corda}/node/visualiser/StateViewer.java (98%) rename node/src/test/resources/{ => com/r3corda}/node/visualiser/graph.css (100%) rename src/main/kotlin/{ => com/r3corda}/demos/DemoClock.kt (97%) rename src/main/kotlin/{ => com/r3corda}/demos/IRSDemo.kt (85%) rename src/main/kotlin/{ => com/r3corda}/demos/RateFixDemo.kt (81%) rename src/main/kotlin/{ => com/r3corda}/demos/TraderDemo.kt (91%) rename src/main/kotlin/{ => com/r3corda}/demos/api/InterestRateSwapAPI.kt (91%) rename src/main/kotlin/{ => com/r3corda}/demos/protocols/AutoOfferProtocol.kt (90%) rename src/main/kotlin/{ => com/r3corda}/demos/protocols/ExitServerProtocol.kt (89%) rename src/main/kotlin/{ => com/r3corda}/demos/protocols/UpdateBusinessDayProtocol.kt (92%) rename src/main/resources/{ => com/r3corda}/demos/bank-of-london-cp.jar (100%) rename src/test/kotlin/{ => com/r3corda}/core/testing/IRSSimulationTest.kt (77%) diff --git a/.idea/modules.xml b/.idea/modules.xml index 3f38645c0c..72d42b27a1 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -3,19 +3,34 @@ + + + + + + + + + + + + + + + diff --git a/build.gradle b/build.gradle index 287dbccb53..06ebb82c4d 100644 --- a/build.gradle +++ b/build.gradle @@ -86,7 +86,7 @@ tasks.withType(JavaExec) { // Package up the demo programs. task getRateFixDemo(type: CreateStartScripts) { - mainClassName = "demos.RateFixDemoKt" + mainClassName = "com.r3corda.demos.RateFixDemoKt" applicationName = "get-rate-fix" defaultJvmOpts = ["-javaagent:${configurations.quasar.singleFile}"] outputDir = new File(project.buildDir, 'scripts') @@ -94,7 +94,7 @@ task getRateFixDemo(type: CreateStartScripts) { } task getIRSDemo(type: CreateStartScripts) { - mainClassName = "demos.IRSDemoKt" + mainClassName = "com.r3corda.demos.IRSDemoKt" applicationName = "irsdemo" defaultJvmOpts = ["-javaagent:${configurations.quasar.singleFile}"] outputDir = new File(project.buildDir, 'scripts') @@ -102,7 +102,7 @@ task getIRSDemo(type: CreateStartScripts) { } task getTraderDemo(type: CreateStartScripts) { - mainClassName = "demos.TraderDemoKt" + mainClassName = "com.r3corda.demos.TraderDemoKt" applicationName = "trader-demo" defaultJvmOpts = ["-javaagent:${configurations.quasar.singleFile}"] outputDir = new File(project.buildDir, 'scripts') diff --git a/contracts/isolated/src/main/kotlin/contracts/AnotherDummyContract.kt b/contracts/isolated/src/main/kotlin/com/r3corda/contracts/AnotherDummyContract.kt similarity index 82% rename from contracts/isolated/src/main/kotlin/contracts/AnotherDummyContract.kt rename to contracts/isolated/src/main/kotlin/com/r3corda/contracts/AnotherDummyContract.kt index e2762df95c..c8b60ed9aa 100644 --- a/contracts/isolated/src/main/kotlin/contracts/AnotherDummyContract.kt +++ b/contracts/isolated/src/main/kotlin/com/r3corda/contracts/AnotherDummyContract.kt @@ -6,18 +6,18 @@ * All other rights reserved. */ -package contracts.isolated +package com.r3corda.contracts.isolated -import core.* -import core.contracts.* -import core.crypto.Party -import core.crypto.SecureHash +import com.r3corda.core.* +import com.r3corda.core.contracts.* +import com.r3corda.core.crypto.Party +import com.r3corda.core.crypto.SecureHash // The dummy contract doesn't do anything useful. It exists for testing purposes. val ANOTHER_DUMMY_PROGRAM_ID = AnotherDummyContract() -class AnotherDummyContract : Contract, core.node.DummyContractBackdoor { +class AnotherDummyContract : Contract, com.r3corda.core.node.DummyContractBackdoor { class State(val magicNumber: Int = 0, override val notary: Party) : ContractState { override val contract = ANOTHER_DUMMY_PROGRAM_ID } diff --git a/contracts/isolated/src/main/kotlin/com/r3corda/core/node/DummyContractBackdoor.kt b/contracts/isolated/src/main/kotlin/com/r3corda/core/node/DummyContractBackdoor.kt new file mode 100644 index 0000000000..a01d417df3 --- /dev/null +++ b/contracts/isolated/src/main/kotlin/com/r3corda/core/node/DummyContractBackdoor.kt @@ -0,0 +1,12 @@ +package com.r3corda.core.node + +import com.r3corda.core.contracts.ContractState +import com.r3corda.core.crypto.Party +import com.r3corda.core.contracts.PartyAndReference +import com.r3corda.core.contracts.TransactionBuilder + +interface DummyContractBackdoor { + fun generateInitial(owner: PartyAndReference, magicNumber: Int, notary: Party): TransactionBuilder + + fun inspectState(state: ContractState): Int +} \ No newline at end of file diff --git a/contracts/isolated/src/main/kotlin/core/node/DummyContractBackdoor.kt b/contracts/isolated/src/main/kotlin/core/node/DummyContractBackdoor.kt deleted file mode 100644 index 22560d4f8a..0000000000 --- a/contracts/isolated/src/main/kotlin/core/node/DummyContractBackdoor.kt +++ /dev/null @@ -1,12 +0,0 @@ -package core.node - -import core.contracts.ContractState -import core.crypto.Party -import core.contracts.PartyAndReference -import core.contracts.TransactionBuilder - -interface DummyContractBackdoor { - fun generateInitial(owner: PartyAndReference, magicNumber: Int, notary: Party): TransactionBuilder - - fun inspectState(state: ContractState): Int -} \ No newline at end of file diff --git a/contracts/src/main/java/contracts/ICommercialPaperState.java b/contracts/src/main/java/com/r3corda/contracts/ICommercialPaperState.java similarity index 81% rename from contracts/src/main/java/contracts/ICommercialPaperState.java rename to contracts/src/main/java/com/r3corda/contracts/ICommercialPaperState.java index 5cde906a9d..86329e4540 100644 --- a/contracts/src/main/java/contracts/ICommercialPaperState.java +++ b/contracts/src/main/java/com/r3corda/contracts/ICommercialPaperState.java @@ -1,8 +1,8 @@ -package contracts; +package com.r3corda.contracts; -import core.contracts.Amount; -import core.contracts.ContractState; -import core.contracts.PartyAndReference; +import com.r3corda.core.contracts.Amount; +import com.r3corda.core.contracts.ContractState; +import com.r3corda.core.contracts.PartyAndReference; import java.security.*; import java.time.*; diff --git a/contracts/src/main/java/contracts/JavaCommercialPaper.java b/contracts/src/main/java/com/r3corda/contracts/JavaCommercialPaper.java similarity index 96% rename from contracts/src/main/java/contracts/JavaCommercialPaper.java rename to contracts/src/main/java/com/r3corda/contracts/JavaCommercialPaper.java index 39d1cd5d8f..ee3a7eda9f 100644 --- a/contracts/src/main/java/contracts/JavaCommercialPaper.java +++ b/contracts/src/main/java/com/r3corda/contracts/JavaCommercialPaper.java @@ -1,10 +1,10 @@ -package contracts; +package com.r3corda.contracts; -import core.contracts.TransactionForVerification.InOutGroup; -import core.contracts.*; -import core.crypto.NullPublicKey; -import core.crypto.Party; -import core.crypto.SecureHash; +import com.r3corda.core.contracts.TransactionForVerification.InOutGroup; +import com.r3corda.core.contracts.*; +import com.r3corda.core.crypto.NullPublicKey; +import com.r3corda.core.crypto.Party; +import com.r3corda.core.crypto.SecureHash; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -12,7 +12,7 @@ import java.security.PublicKey; import java.time.Instant; import java.util.List; -import static core.contracts.ContractsDSLKt.requireSingleCommand; +import static com.r3corda.core.contracts.ContractsDSLKt.requireSingleCommand; import static kotlin.collections.CollectionsKt.single; diff --git a/contracts/src/main/kotlin/contracts/Cash.kt b/contracts/src/main/kotlin/com/r3corda/contracts/Cash.kt similarity index 97% rename from contracts/src/main/kotlin/contracts/Cash.kt rename to contracts/src/main/kotlin/com/r3corda/contracts/Cash.kt index 2707ea05a7..b78687eb46 100644 --- a/contracts/src/main/kotlin/contracts/Cash.kt +++ b/contracts/src/main/kotlin/com/r3corda/contracts/Cash.kt @@ -1,13 +1,13 @@ -package contracts +package com.r3corda.contracts -import contracts.cash.CashIssuanceDefinition -import contracts.cash.CommonCashState -import core.* -import core.contracts.* -import core.crypto.Party -import core.crypto.SecureHash -import core.crypto.toStringShort -import core.utilities.Emoji +import com.r3corda.contracts.cash.CashIssuanceDefinition +import com.r3corda.contracts.cash.CommonCashState +import com.r3corda.core.* +import com.r3corda.core.contracts.* +import com.r3corda.core.crypto.Party +import com.r3corda.core.crypto.SecureHash +import com.r3corda.core.crypto.toStringShort +import com.r3corda.core.utilities.Emoji import java.security.PublicKey import java.security.SecureRandom import java.util.* diff --git a/contracts/src/main/kotlin/contracts/CommercialPaper.kt b/contracts/src/main/kotlin/com/r3corda/contracts/CommercialPaper.kt similarity index 96% rename from contracts/src/main/kotlin/contracts/CommercialPaper.kt rename to contracts/src/main/kotlin/com/r3corda/contracts/CommercialPaper.kt index 57c970a5cc..f0e11bbb45 100644 --- a/contracts/src/main/kotlin/contracts/CommercialPaper.kt +++ b/contracts/src/main/kotlin/com/r3corda/contracts/CommercialPaper.kt @@ -1,12 +1,12 @@ -package contracts +package com.r3corda.contracts -import core.* -import core.contracts.* -import core.crypto.NullPublicKey -import core.crypto.Party -import core.crypto.SecureHash -import core.crypto.toStringShort -import core.utilities.Emoji +import com.r3corda.core.* +import com.r3corda.core.contracts.* +import com.r3corda.core.crypto.NullPublicKey +import com.r3corda.core.crypto.Party +import com.r3corda.core.crypto.SecureHash +import com.r3corda.core.crypto.toStringShort +import com.r3corda.core.utilities.Emoji import java.security.PublicKey import java.time.Instant diff --git a/contracts/src/main/kotlin/contracts/CrowdFund.kt b/contracts/src/main/kotlin/com/r3corda/contracts/CrowdFund.kt similarity index 98% rename from contracts/src/main/kotlin/contracts/CrowdFund.kt rename to contracts/src/main/kotlin/com/r3corda/contracts/CrowdFund.kt index 13c4d12848..4cdb715b79 100644 --- a/contracts/src/main/kotlin/contracts/CrowdFund.kt +++ b/contracts/src/main/kotlin/com/r3corda/contracts/CrowdFund.kt @@ -1,9 +1,9 @@ -package contracts +package com.r3corda.contracts -import core.* -import core.contracts.* -import core.crypto.Party -import core.crypto.SecureHash +import com.r3corda.core.* +import com.r3corda.core.contracts.* +import com.r3corda.core.crypto.Party +import com.r3corda.core.crypto.SecureHash import java.security.PublicKey import java.time.Instant import java.util.* diff --git a/contracts/src/main/kotlin/contracts/DummyContract.kt b/contracts/src/main/kotlin/com/r3corda/contracts/DummyContract.kt similarity index 83% rename from contracts/src/main/kotlin/contracts/DummyContract.kt rename to contracts/src/main/kotlin/com/r3corda/contracts/DummyContract.kt index c47003d1f9..9e7210645a 100644 --- a/contracts/src/main/kotlin/contracts/DummyContract.kt +++ b/contracts/src/main/kotlin/com/r3corda/contracts/DummyContract.kt @@ -1,9 +1,9 @@ -package contracts +package com.r3corda.contracts -import core.* -import core.contracts.* -import core.crypto.Party -import core.crypto.SecureHash +import com.r3corda.core.* +import com.r3corda.core.contracts.* +import com.r3corda.core.crypto.Party +import com.r3corda.core.crypto.SecureHash // The dummy contract doesn't do anything useful. It exists for testing purposes. diff --git a/contracts/src/main/kotlin/contracts/IRS.kt b/contracts/src/main/kotlin/com/r3corda/contracts/IRS.kt similarity index 99% rename from contracts/src/main/kotlin/contracts/IRS.kt rename to contracts/src/main/kotlin/com/r3corda/contracts/IRS.kt index d01c61f63d..4d51c62436 100644 --- a/contracts/src/main/kotlin/contracts/IRS.kt +++ b/contracts/src/main/kotlin/com/r3corda/contracts/IRS.kt @@ -1,9 +1,9 @@ -package contracts +package com.r3corda.contracts -import core.* -import core.contracts.* -import core.crypto.Party -import core.crypto.SecureHash +import com.r3corda.core.* +import com.r3corda.core.contracts.* +import com.r3corda.core.crypto.Party +import com.r3corda.core.crypto.SecureHash import org.apache.commons.jexl3.JexlBuilder import org.apache.commons.jexl3.MapContext import java.math.BigDecimal diff --git a/contracts/src/main/kotlin/contracts/IRSExport.kt b/contracts/src/main/kotlin/com/r3corda/contracts/IRSExport.kt similarity index 93% rename from contracts/src/main/kotlin/contracts/IRSExport.kt rename to contracts/src/main/kotlin/com/r3corda/contracts/IRSExport.kt index 399b241e2e..99951c4a96 100644 --- a/contracts/src/main/kotlin/contracts/IRSExport.kt +++ b/contracts/src/main/kotlin/com/r3corda/contracts/IRSExport.kt @@ -1,4 +1,4 @@ -package contracts +package com.r3corda.contracts fun InterestRateSwap.State.exportIRSToCSV(): String = "Fixed Leg\n" + FixedRatePaymentEvent.CSVHeader + "\n" + diff --git a/contracts/src/main/kotlin/contracts/IRSUtils.kt b/contracts/src/main/kotlin/com/r3corda/contracts/IRSUtils.kt similarity index 97% rename from contracts/src/main/kotlin/contracts/IRSUtils.kt rename to contracts/src/main/kotlin/com/r3corda/contracts/IRSUtils.kt index 62aa3bca89..b52a152187 100644 --- a/contracts/src/main/kotlin/contracts/IRSUtils.kt +++ b/contracts/src/main/kotlin/com/r3corda/contracts/IRSUtils.kt @@ -1,7 +1,7 @@ -package contracts +package com.r3corda.contracts -import core.contracts.Amount -import core.contracts.Tenor +import com.r3corda.core.contracts.Amount +import com.r3corda.core.contracts.Tenor import java.math.BigDecimal diff --git a/contracts/src/main/kotlin/contracts/cash/CashIssuanceDefinition.kt b/contracts/src/main/kotlin/com/r3corda/contracts/cash/CashIssuanceDefinition.kt similarity index 74% rename from contracts/src/main/kotlin/contracts/cash/CashIssuanceDefinition.kt rename to contracts/src/main/kotlin/com/r3corda/contracts/cash/CashIssuanceDefinition.kt index 7098013e5b..eaade3fd4d 100644 --- a/contracts/src/main/kotlin/contracts/cash/CashIssuanceDefinition.kt +++ b/contracts/src/main/kotlin/com/r3corda/contracts/cash/CashIssuanceDefinition.kt @@ -1,7 +1,7 @@ -package contracts.cash +package com.r3corda.contracts.cash -import core.contracts.IssuanceDefinition -import core.contracts.PartyAndReference +import com.r3corda.core.contracts.IssuanceDefinition +import com.r3corda.core.contracts.PartyAndReference import java.util.* /** diff --git a/contracts/src/main/kotlin/contracts/cash/CommonCashState.kt b/contracts/src/main/kotlin/com/r3corda/contracts/cash/CommonCashState.kt similarity index 62% rename from contracts/src/main/kotlin/contracts/cash/CommonCashState.kt rename to contracts/src/main/kotlin/com/r3corda/contracts/cash/CommonCashState.kt index ee842d5f42..b0a4995004 100644 --- a/contracts/src/main/kotlin/contracts/cash/CommonCashState.kt +++ b/contracts/src/main/kotlin/com/r3corda/contracts/cash/CommonCashState.kt @@ -1,8 +1,8 @@ -package contracts.cash +package com.r3corda.contracts.cash -import core.contracts.Amount -import core.contracts.OwnableState -import core.contracts.PartyAndReference +import com.r3corda.core.contracts.Amount +import com.r3corda.core.contracts.OwnableState +import com.r3corda.core.contracts.PartyAndReference /** * Common elements of cash contract states. diff --git a/contracts/src/main/kotlin/contracts/testing/TestUtils.kt b/contracts/src/main/kotlin/com/r3corda/contracts/testing/TestUtils.kt similarity index 86% rename from contracts/src/main/kotlin/contracts/testing/TestUtils.kt rename to contracts/src/main/kotlin/com/r3corda/contracts/testing/TestUtils.kt index febd5941b2..abc44fae51 100644 --- a/contracts/src/main/kotlin/contracts/testing/TestUtils.kt +++ b/contracts/src/main/kotlin/com/r3corda/contracts/testing/TestUtils.kt @@ -1,12 +1,12 @@ -package contracts.testing +package com.r3corda.contracts.testing -import contracts.* -import core.contracts.Amount -import core.contracts.Contract -import core.crypto.NullPublicKey -import core.crypto.Party -import core.testing.DUMMY_NOTARY -import core.testing.MINI_CORP +import com.r3corda.contracts.* +import com.r3corda.core.contracts.Amount +import com.r3corda.core.contracts.Contract +import com.r3corda.core.crypto.NullPublicKey +import com.r3corda.core.crypto.Party +import com.r3corda.core.testing.DUMMY_NOTARY +import com.r3corda.core.testing.MINI_CORP import java.security.PublicKey import java.util.* diff --git a/contracts/src/main/kotlin/protocols/TwoPartyTradeProtocol.kt b/contracts/src/main/kotlin/com/r3corda/protocols/TwoPartyTradeProtocol.kt similarity index 95% rename from contracts/src/main/kotlin/protocols/TwoPartyTradeProtocol.kt rename to contracts/src/main/kotlin/com/r3corda/protocols/TwoPartyTradeProtocol.kt index 6da66c4ab9..98aa195b6f 100644 --- a/contracts/src/main/kotlin/protocols/TwoPartyTradeProtocol.kt +++ b/contracts/src/main/kotlin/com/r3corda/protocols/TwoPartyTradeProtocol.kt @@ -1,19 +1,19 @@ -package protocols +package com.r3corda.protocols import co.paralleluniverse.fibers.Suspendable -import contracts.Cash -import contracts.sumCashBy -import core.contracts.* -import core.crypto.DigitalSignature -import core.crypto.Party -import core.crypto.signWithECDSA -import core.messaging.SingleMessageRecipient -import core.node.NodeInfo -import core.protocols.ProtocolLogic -import core.random63BitValue -import core.seconds -import core.utilities.ProgressTracker -import core.utilities.trace +import com.r3corda.contracts.Cash +import com.r3corda.contracts.sumCashBy +import com.r3corda.core.contracts.* +import com.r3corda.core.crypto.DigitalSignature +import com.r3corda.core.crypto.Party +import com.r3corda.core.crypto.signWithECDSA +import com.r3corda.core.messaging.SingleMessageRecipient +import com.r3corda.core.node.NodeInfo +import com.r3corda.core.protocols.ProtocolLogic +import com.r3corda.core.random63BitValue +import com.r3corda.core.seconds +import com.r3corda.core.utilities.ProgressTracker +import com.r3corda.core.utilities.trace import java.security.KeyPair import java.security.PublicKey import java.security.SignatureException diff --git a/contracts/src/test/kotlin/contracts/CashTests.kt b/contracts/src/test/kotlin/com/r3corda/contracts/CashTests.kt similarity index 96% rename from contracts/src/test/kotlin/contracts/CashTests.kt rename to contracts/src/test/kotlin/com/r3corda/contracts/CashTests.kt index 864274c8d7..0b84ac1377 100644 --- a/contracts/src/test/kotlin/contracts/CashTests.kt +++ b/contracts/src/test/kotlin/com/r3corda/contracts/CashTests.kt @@ -1,13 +1,13 @@ -import contracts.Cash -import contracts.DummyContract -import contracts.InsufficientBalanceException -import contracts.testing.`issued by` -import contracts.testing.`owned by` -import core.contracts.* -import core.crypto.Party -import core.crypto.SecureHash -import core.serialization.OpaqueBytes -import core.testing.* +import com.r3corda.contracts.Cash +import com.r3corda.contracts.DummyContract +import com.r3corda.contracts.InsufficientBalanceException +import com.r3corda.contracts.testing.`issued by` +import com.r3corda.contracts.testing.`owned by` +import com.r3corda.core.contracts.* +import com.r3corda.core.crypto.Party +import com.r3corda.core.crypto.SecureHash +import com.r3corda.core.serialization.OpaqueBytes +import com.r3corda.core.testing.* import org.junit.Test import java.security.PublicKey import java.util.* @@ -40,7 +40,7 @@ class CashTests { tweak { output { outState } // No command arguments - this `fails requirement` "required contracts.Cash.Commands.Move command" + this `fails requirement` "required com.r3corda.contracts.Cash.Commands.Move command" } tweak { output { outState } @@ -277,7 +277,7 @@ class CashTests { tweak { arg(MEGA_CORP_PUBKEY) { Cash.Commands.Exit(200.DOLLARS) } - this `fails requirement` "required contracts.Cash.Commands.Move command" + this `fails requirement` "required com.r3corda.contracts.Cash.Commands.Move command" tweak { arg(DUMMY_PUBKEY_1) { Cash.Commands.Move() } diff --git a/contracts/src/test/kotlin/contracts/CommercialPaperTests.kt b/contracts/src/test/kotlin/com/r3corda/contracts/CommercialPaperTests.kt similarity index 96% rename from contracts/src/test/kotlin/contracts/CommercialPaperTests.kt rename to contracts/src/test/kotlin/com/r3corda/contracts/CommercialPaperTests.kt index 3b59e4dbfd..ee3b4f270d 100644 --- a/contracts/src/test/kotlin/contracts/CommercialPaperTests.kt +++ b/contracts/src/test/kotlin/com/r3corda/contracts/CommercialPaperTests.kt @@ -1,13 +1,13 @@ -package contracts +package com.r3corda.contracts -import contracts.testing.CASH -import contracts.testing.`owned by` -import core.contracts.* -import core.crypto.SecureHash -import core.days -import core.node.services.testing.MockStorageService -import core.seconds -import core.testing.* +import com.r3corda.contracts.testing.CASH +import com.r3corda.contracts.testing.`owned by` +import com.r3corda.core.contracts.* +import com.r3corda.core.crypto.SecureHash +import com.r3corda.core.days +import com.r3corda.core.node.services.testing.MockStorageService +import com.r3corda.core.seconds +import com.r3corda.core.testing.* import org.junit.Test import org.junit.runner.RunWith import org.junit.runners.Parameterized diff --git a/contracts/src/test/kotlin/contracts/CrowdFundTests.kt b/contracts/src/test/kotlin/com/r3corda/contracts/CrowdFundTests.kt similarity index 94% rename from contracts/src/test/kotlin/contracts/CrowdFundTests.kt rename to contracts/src/test/kotlin/com/r3corda/contracts/CrowdFundTests.kt index eeba0593ae..79331f9b61 100644 --- a/contracts/src/test/kotlin/contracts/CrowdFundTests.kt +++ b/contracts/src/test/kotlin/com/r3corda/contracts/CrowdFundTests.kt @@ -1,13 +1,13 @@ -package contracts +package com.r3corda.contracts -import contracts.testing.CASH -import contracts.testing.`owned by` -import core.contracts.* -import core.crypto.SecureHash -import core.days -import core.node.services.testing.MockStorageService -import core.seconds -import core.testing.* +import com.r3corda.contracts.testing.CASH +import com.r3corda.contracts.testing.`owned by` +import com.r3corda.core.contracts.* +import com.r3corda.core.crypto.SecureHash +import com.r3corda.core.days +import com.r3corda.core.node.services.testing.MockStorageService +import com.r3corda.core.seconds +import com.r3corda.core.testing.* import org.junit.Test import java.time.Instant import java.util.* diff --git a/contracts/src/test/kotlin/contracts/IRSTests.kt b/contracts/src/test/kotlin/com/r3corda/contracts/IRSTests.kt similarity index 99% rename from contracts/src/test/kotlin/contracts/IRSTests.kt rename to contracts/src/test/kotlin/com/r3corda/contracts/IRSTests.kt index ce5ebc7bb6..2c977dd2a4 100644 --- a/contracts/src/test/kotlin/contracts/IRSTests.kt +++ b/contracts/src/test/kotlin/com/r3corda/contracts/IRSTests.kt @@ -1,9 +1,9 @@ -package contracts +package com.r3corda.contracts -import core.contracts.* -import core.node.services.testing.MockStorageService -import core.seconds -import core.testing.* +import com.r3corda.core.contracts.* +import com.r3corda.core.node.services.testing.MockStorageService +import com.r3corda.core.seconds +import com.r3corda.core.testing.* import org.junit.Test import java.math.BigDecimal import java.time.LocalDate diff --git a/core/src/main/java/core/crypto/AddressFormatException.java b/core/src/main/java/com/r3corda/core/crypto/AddressFormatException.java similarity index 86% rename from core/src/main/java/core/crypto/AddressFormatException.java rename to core/src/main/java/com/r3corda/core/crypto/AddressFormatException.java index 7aa5ac8a66..d0019d2b34 100644 --- a/core/src/main/java/core/crypto/AddressFormatException.java +++ b/core/src/main/java/com/r3corda/core/crypto/AddressFormatException.java @@ -1,4 +1,4 @@ -package core.crypto; +package com.r3corda.core.crypto; public class AddressFormatException extends IllegalArgumentException { public AddressFormatException() { diff --git a/core/src/main/java/core/crypto/Base58.java b/core/src/main/java/com/r3corda/core/crypto/Base58.java similarity index 99% rename from core/src/main/java/core/crypto/Base58.java rename to core/src/main/java/com/r3corda/core/crypto/Base58.java index 7569e8edba..80f461b3fa 100644 --- a/core/src/main/java/core/crypto/Base58.java +++ b/core/src/main/java/com/r3corda/core/crypto/Base58.java @@ -1,4 +1,4 @@ -package core.crypto; +package com.r3corda.core.crypto; import java.math.*; import java.util.*; diff --git a/core/src/main/kotlin/core/Utils.kt b/core/src/main/kotlin/com/r3corda/core/Utils.kt similarity index 98% rename from core/src/main/kotlin/core/Utils.kt rename to core/src/main/kotlin/com/r3corda/core/Utils.kt index c0a09cf49d..dfe26c377e 100644 --- a/core/src/main/kotlin/core/Utils.kt +++ b/core/src/main/kotlin/com/r3corda/core/Utils.kt @@ -1,4 +1,4 @@ -package core +package com.r3corda.core import com.google.common.io.ByteStreams import com.google.common.util.concurrent.ListenableFuture diff --git a/core/src/main/kotlin/core/contracts/ContractsDSL.kt b/core/src/main/kotlin/com/r3corda/core/contracts/ContractsDSL.kt similarity index 97% rename from core/src/main/kotlin/core/contracts/ContractsDSL.kt rename to core/src/main/kotlin/com/r3corda/core/contracts/ContractsDSL.kt index bec287067d..be45d98a5b 100644 --- a/core/src/main/kotlin/core/contracts/ContractsDSL.kt +++ b/core/src/main/kotlin/com/r3corda/core/contracts/ContractsDSL.kt @@ -1,7 +1,7 @@ -package core.contracts +package com.r3corda.core.contracts -import core.* -import core.crypto.Party +import com.r3corda.core.* +import com.r3corda.core.crypto.Party import java.security.PublicKey import java.util.* diff --git a/core/src/main/kotlin/core/contracts/FinanceTypes.kt b/core/src/main/kotlin/com/r3corda/core/contracts/FinanceTypes.kt similarity index 99% rename from core/src/main/kotlin/core/contracts/FinanceTypes.kt rename to core/src/main/kotlin/com/r3corda/core/contracts/FinanceTypes.kt index 4a8f9ebab3..39484a167d 100644 --- a/core/src/main/kotlin/core/contracts/FinanceTypes.kt +++ b/core/src/main/kotlin/com/r3corda/core/contracts/FinanceTypes.kt @@ -1,4 +1,4 @@ -package core.contracts +package com.r3corda.core.contracts import com.fasterxml.jackson.core.JsonGenerator import com.fasterxml.jackson.core.JsonParser @@ -8,7 +8,7 @@ import com.fasterxml.jackson.databind.JsonSerializer import com.fasterxml.jackson.databind.SerializerProvider import com.fasterxml.jackson.databind.annotation.JsonDeserialize import com.fasterxml.jackson.databind.annotation.JsonSerialize -import core.contracts.CommandData +import com.r3corda.core.contracts.CommandData import java.math.BigDecimal import java.time.DayOfWeek import java.time.LocalDate diff --git a/core/src/main/kotlin/core/contracts/Structures.kt b/core/src/main/kotlin/com/r3corda/core/contracts/Structures.kt similarity index 95% rename from core/src/main/kotlin/core/contracts/Structures.kt rename to core/src/main/kotlin/com/r3corda/core/contracts/Structures.kt index 1b88425775..eefe181eeb 100644 --- a/core/src/main/kotlin/core/contracts/Structures.kt +++ b/core/src/main/kotlin/com/r3corda/core/contracts/Structures.kt @@ -1,14 +1,14 @@ -package core.contracts +package com.r3corda.core.contracts -import core.contracts.TransactionBuilder -import core.contracts.TransactionForVerification -import core.contracts.Fix -import core.contracts.FixOf -import core.crypto.Party -import core.crypto.SecureHash -import core.crypto.toStringShort -import core.serialization.OpaqueBytes -import core.serialization.serialize +import com.r3corda.core.contracts.TransactionBuilder +import com.r3corda.core.contracts.TransactionForVerification +import com.r3corda.core.contracts.Fix +import com.r3corda.core.contracts.FixOf +import com.r3corda.core.crypto.Party +import com.r3corda.core.crypto.SecureHash +import com.r3corda.core.crypto.toStringShort +import com.r3corda.core.serialization.OpaqueBytes +import com.r3corda.core.serialization.serialize import java.io.FileNotFoundException import java.io.InputStream import java.io.OutputStream diff --git a/core/src/main/kotlin/core/contracts/TransactionBuilder.kt b/core/src/main/kotlin/com/r3corda/core/contracts/TransactionBuilder.kt similarity index 93% rename from core/src/main/kotlin/core/contracts/TransactionBuilder.kt rename to core/src/main/kotlin/com/r3corda/core/contracts/TransactionBuilder.kt index f248ddd829..820d9221f0 100644 --- a/core/src/main/kotlin/core/contracts/TransactionBuilder.kt +++ b/core/src/main/kotlin/com/r3corda/core/contracts/TransactionBuilder.kt @@ -1,13 +1,13 @@ -package core.contracts +package com.r3corda.core.contracts -import core.contracts.SignedTransaction -import core.contracts.WireTransaction -import core.contracts.* -import core.crypto.DigitalSignature -import core.crypto.Party -import core.crypto.SecureHash -import core.crypto.signWithECDSA -import core.serialization.serialize +import com.r3corda.core.contracts.SignedTransaction +import com.r3corda.core.contracts.WireTransaction +import com.r3corda.core.contracts.* +import com.r3corda.core.crypto.DigitalSignature +import com.r3corda.core.crypto.Party +import com.r3corda.core.crypto.SecureHash +import com.r3corda.core.crypto.signWithECDSA +import com.r3corda.core.serialization.serialize import java.security.KeyPair import java.security.PublicKey import java.time.Duration diff --git a/core/src/main/kotlin/core/contracts/TransactionGraphSearch.kt b/core/src/main/kotlin/com/r3corda/core/contracts/TransactionGraphSearch.kt similarity index 87% rename from core/src/main/kotlin/core/contracts/TransactionGraphSearch.kt rename to core/src/main/kotlin/com/r3corda/core/contracts/TransactionGraphSearch.kt index 901d0b41b4..244cabf4a6 100644 --- a/core/src/main/kotlin/core/contracts/TransactionGraphSearch.kt +++ b/core/src/main/kotlin/com/r3corda/core/contracts/TransactionGraphSearch.kt @@ -1,9 +1,9 @@ -package core.contracts +package com.r3corda.core.contracts -import core.contracts.SignedTransaction -import core.contracts.WireTransaction -import core.contracts.CommandData -import core.crypto.SecureHash +import com.r3corda.core.contracts.SignedTransaction +import com.r3corda.core.contracts.WireTransaction +import com.r3corda.core.contracts.CommandData +import com.r3corda.core.crypto.SecureHash import java.util.* import java.util.concurrent.Callable diff --git a/core/src/main/kotlin/core/contracts/TransactionTools.kt b/core/src/main/kotlin/com/r3corda/core/contracts/TransactionTools.kt similarity index 78% rename from core/src/main/kotlin/core/contracts/TransactionTools.kt rename to core/src/main/kotlin/com/r3corda/core/contracts/TransactionTools.kt index d2e223a6f1..d749e31e95 100644 --- a/core/src/main/kotlin/core/contracts/TransactionTools.kt +++ b/core/src/main/kotlin/com/r3corda/core/contracts/TransactionTools.kt @@ -1,11 +1,11 @@ -package core.contracts +package com.r3corda.core.contracts -import core.contracts.AuthenticatedObject -import core.contracts.LedgerTransaction -import core.contracts.SignedTransaction -import core.contracts.WireTransaction -import core.node.services.AttachmentStorage -import core.node.services.IdentityService +import com.r3corda.core.contracts.AuthenticatedObject +import com.r3corda.core.contracts.LedgerTransaction +import com.r3corda.core.contracts.SignedTransaction +import com.r3corda.core.contracts.WireTransaction +import com.r3corda.core.node.services.AttachmentStorage +import com.r3corda.core.node.services.IdentityService import java.io.FileNotFoundException /** diff --git a/core/src/main/kotlin/core/contracts/TransactionVerification.kt b/core/src/main/kotlin/com/r3corda/core/contracts/TransactionVerification.kt similarity index 98% rename from core/src/main/kotlin/core/contracts/TransactionVerification.kt rename to core/src/main/kotlin/com/r3corda/core/contracts/TransactionVerification.kt index 9902cdf25a..551ca6734a 100644 --- a/core/src/main/kotlin/core/contracts/TransactionVerification.kt +++ b/core/src/main/kotlin/com/r3corda/core/contracts/TransactionVerification.kt @@ -1,8 +1,8 @@ -package core.contracts +package com.r3corda.core.contracts -import core.contracts.* -import core.crypto.Party -import core.crypto.SecureHash +import com.r3corda.core.contracts.* +import com.r3corda.core.crypto.Party +import com.r3corda.core.crypto.SecureHash import java.util.* // TODO: Consider moving this out of the core module and providing a different way for unit tests to test contracts. diff --git a/core/src/main/kotlin/core/contracts/Transactions.kt b/core/src/main/kotlin/com/r3corda/core/contracts/Transactions.kt similarity index 94% rename from core/src/main/kotlin/core/contracts/Transactions.kt rename to core/src/main/kotlin/com/r3corda/core/contracts/Transactions.kt index 9166b32e73..9d4260650d 100644 --- a/core/src/main/kotlin/core/contracts/Transactions.kt +++ b/core/src/main/kotlin/com/r3corda/core/contracts/Transactions.kt @@ -1,16 +1,16 @@ -package core.contracts +package com.r3corda.core.contracts import com.esotericsoftware.kryo.Kryo -import core.contracts.* -import core.crypto.DigitalSignature -import core.crypto.SecureHash -import core.crypto.toStringShort -import core.indexOfOrThrow -import core.serialization.SerializedBytes -import core.serialization.THREAD_LOCAL_KRYO -import core.serialization.deserialize -import core.serialization.serialize -import core.utilities.Emoji +import com.r3corda.core.contracts.* +import com.r3corda.core.crypto.DigitalSignature +import com.r3corda.core.crypto.SecureHash +import com.r3corda.core.crypto.toStringShort +import com.r3corda.core.indexOfOrThrow +import com.r3corda.core.serialization.SerializedBytes +import com.r3corda.core.serialization.THREAD_LOCAL_KRYO +import com.r3corda.core.serialization.deserialize +import com.r3corda.core.serialization.serialize +import com.r3corda.core.utilities.Emoji import java.security.PublicKey import java.security.SignatureException diff --git a/core/src/main/kotlin/core/crypto/CryptoUtilities.kt b/core/src/main/kotlin/com/r3corda/core/crypto/CryptoUtilities.kt similarity index 96% rename from core/src/main/kotlin/core/crypto/CryptoUtilities.kt rename to core/src/main/kotlin/com/r3corda/core/crypto/CryptoUtilities.kt index d79c9e831b..7361fdf49b 100644 --- a/core/src/main/kotlin/core/crypto/CryptoUtilities.kt +++ b/core/src/main/kotlin/com/r3corda/core/crypto/CryptoUtilities.kt @@ -1,10 +1,10 @@ -package core.crypto +package com.r3corda.core.crypto import com.google.common.io.BaseEncoding -import core.crypto.Party -import core.serialization.OpaqueBytes -import core.serialization.SerializedBytes -import core.serialization.deserialize +import com.r3corda.core.crypto.Party +import com.r3corda.core.serialization.OpaqueBytes +import com.r3corda.core.serialization.SerializedBytes +import com.r3corda.core.serialization.deserialize import java.math.BigInteger import java.security.* import java.security.interfaces.ECPublicKey diff --git a/core/src/main/kotlin/core/crypto/Party.kt b/core/src/main/kotlin/com/r3corda/core/crypto/Party.kt similarity index 75% rename from core/src/main/kotlin/core/crypto/Party.kt rename to core/src/main/kotlin/com/r3corda/core/crypto/Party.kt index b1237f3ada..587992fbc1 100644 --- a/core/src/main/kotlin/core/crypto/Party.kt +++ b/core/src/main/kotlin/com/r3corda/core/crypto/Party.kt @@ -1,7 +1,7 @@ -package core.crypto +package com.r3corda.core.crypto -import core.contracts.PartyAndReference -import core.serialization.OpaqueBytes +import com.r3corda.core.contracts.PartyAndReference +import com.r3corda.core.serialization.OpaqueBytes import java.security.PublicKey /** diff --git a/core/src/main/kotlin/core/math/Interpolators.kt b/core/src/main/kotlin/com/r3corda/core/math/Interpolators.kt similarity index 99% rename from core/src/main/kotlin/core/math/Interpolators.kt rename to core/src/main/kotlin/com/r3corda/core/math/Interpolators.kt index 30e431e51f..f5b0eb2859 100644 --- a/core/src/main/kotlin/core/math/Interpolators.kt +++ b/core/src/main/kotlin/com/r3corda/core/math/Interpolators.kt @@ -1,4 +1,4 @@ -package core.math +package com.r3corda.core.math import java.util.* diff --git a/core/src/main/kotlin/core/messaging/Messaging.kt b/core/src/main/kotlin/com/r3corda/core/messaging/Messaging.kt similarity index 98% rename from core/src/main/kotlin/core/messaging/Messaging.kt rename to core/src/main/kotlin/com/r3corda/core/messaging/Messaging.kt index ea9c58769e..1f5d842991 100644 --- a/core/src/main/kotlin/core/messaging/Messaging.kt +++ b/core/src/main/kotlin/com/r3corda/core/messaging/Messaging.kt @@ -1,7 +1,7 @@ -package core.messaging +package com.r3corda.core.messaging import com.google.common.util.concurrent.ListenableFuture -import core.serialization.serialize +import com.r3corda.core.serialization.serialize import java.time.Instant import java.util.concurrent.Executor import javax.annotation.concurrent.ThreadSafe diff --git a/core/src/main/kotlin/core/node/AttachmentsClassLoader.kt b/core/src/main/kotlin/com/r3corda/core/node/AttachmentsClassLoader.kt similarity index 97% rename from core/src/main/kotlin/core/node/AttachmentsClassLoader.kt rename to core/src/main/kotlin/com/r3corda/core/node/AttachmentsClassLoader.kt index 6c80332b21..1023be43b7 100644 --- a/core/src/main/kotlin/core/node/AttachmentsClassLoader.kt +++ b/core/src/main/kotlin/com/r3corda/core/node/AttachmentsClassLoader.kt @@ -1,7 +1,7 @@ -package core.node +package com.r3corda.core.node -import core.contracts.Attachment -import core.crypto.SecureHash +import com.r3corda.core.contracts.Attachment +import com.r3corda.core.crypto.SecureHash import java.io.ByteArrayInputStream import java.io.ByteArrayOutputStream import java.io.FileNotFoundException diff --git a/core/src/main/kotlin/core/node/NodeInfo.kt b/core/src/main/kotlin/com/r3corda/core/node/NodeInfo.kt similarity index 64% rename from core/src/main/kotlin/core/node/NodeInfo.kt rename to core/src/main/kotlin/com/r3corda/core/node/NodeInfo.kt index 96a200d453..56446c33c3 100644 --- a/core/src/main/kotlin/core/node/NodeInfo.kt +++ b/core/src/main/kotlin/com/r3corda/core/node/NodeInfo.kt @@ -1,8 +1,8 @@ -package core.node +package com.r3corda.core.node -import core.crypto.Party -import core.messaging.SingleMessageRecipient -import core.node.services.ServiceType +import com.r3corda.core.crypto.Party +import com.r3corda.core.messaging.SingleMessageRecipient +import com.r3corda.core.node.services.ServiceType /** * Info about a network node that acts on behalf of some form of contract party. diff --git a/core/src/main/kotlin/core/node/PhysicalLocationStructures.kt b/core/src/main/kotlin/com/r3corda/core/node/PhysicalLocationStructures.kt similarity index 98% rename from core/src/main/kotlin/core/node/PhysicalLocationStructures.kt rename to core/src/main/kotlin/com/r3corda/core/node/PhysicalLocationStructures.kt index 7fba96aea9..982c85d54c 100644 --- a/core/src/main/kotlin/core/node/PhysicalLocationStructures.kt +++ b/core/src/main/kotlin/com/r3corda/core/node/PhysicalLocationStructures.kt @@ -1,4 +1,4 @@ -package core.node +package com.r3corda.core.node import java.util.* diff --git a/core/src/main/kotlin/core/node/ServiceHub.kt b/core/src/main/kotlin/com/r3corda/core/node/ServiceHub.kt similarity index 92% rename from core/src/main/kotlin/core/node/ServiceHub.kt rename to core/src/main/kotlin/com/r3corda/core/node/ServiceHub.kt index 73e491486b..e436574204 100644 --- a/core/src/main/kotlin/core/node/ServiceHub.kt +++ b/core/src/main/kotlin/com/r3corda/core/node/ServiceHub.kt @@ -1,10 +1,10 @@ -package core.node +package com.r3corda.core.node -import core.contracts.* -import core.crypto.SecureHash -import core.messaging.MessagingService -import core.node.services.* -import core.utilities.RecordingMap +import com.r3corda.core.contracts.* +import com.r3corda.core.crypto.SecureHash +import com.r3corda.core.messaging.MessagingService +import com.r3corda.core.node.services.* +import com.r3corda.core.utilities.RecordingMap import java.time.Clock /** diff --git a/core/src/main/kotlin/core/node/services/AttachmentStorage.kt b/core/src/main/kotlin/com/r3corda/core/node/services/AttachmentStorage.kt similarity index 91% rename from core/src/main/kotlin/core/node/services/AttachmentStorage.kt rename to core/src/main/kotlin/com/r3corda/core/node/services/AttachmentStorage.kt index 91732ab0a1..1f6e9a35fa 100644 --- a/core/src/main/kotlin/core/node/services/AttachmentStorage.kt +++ b/core/src/main/kotlin/com/r3corda/core/node/services/AttachmentStorage.kt @@ -1,7 +1,7 @@ -package core.node.services +package com.r3corda.core.node.services -import core.contracts.Attachment -import core.crypto.SecureHash +import com.r3corda.core.contracts.Attachment +import com.r3corda.core.crypto.SecureHash import java.io.InputStream /** diff --git a/core/src/main/kotlin/core/node/services/IdentityService.kt b/core/src/main/kotlin/com/r3corda/core/node/services/IdentityService.kt similarity index 90% rename from core/src/main/kotlin/core/node/services/IdentityService.kt rename to core/src/main/kotlin/com/r3corda/core/node/services/IdentityService.kt index 31e3b6e848..f49437ad65 100644 --- a/core/src/main/kotlin/core/node/services/IdentityService.kt +++ b/core/src/main/kotlin/com/r3corda/core/node/services/IdentityService.kt @@ -1,6 +1,6 @@ -package core.node.services +package com.r3corda.core.node.services -import core.crypto.Party +import com.r3corda.core.crypto.Party import java.security.PublicKey /** diff --git a/core/src/main/kotlin/core/node/services/NetworkMapCache.kt b/core/src/main/kotlin/com/r3corda/core/node/services/NetworkMapCache.kt similarity index 93% rename from core/src/main/kotlin/core/node/services/NetworkMapCache.kt rename to core/src/main/kotlin/com/r3corda/core/node/services/NetworkMapCache.kt index 992198b3d0..fa86c2669c 100644 --- a/core/src/main/kotlin/core/node/services/NetworkMapCache.kt +++ b/core/src/main/kotlin/com/r3corda/core/node/services/NetworkMapCache.kt @@ -1,11 +1,11 @@ -package core.node.services +package com.r3corda.core.node.services import com.google.common.util.concurrent.ListenableFuture -import core.contracts.Contract -import core.crypto.Party -import core.messaging.MessagingService -import core.node.NodeInfo -import core.node.services.ServiceType +import com.r3corda.core.contracts.Contract +import com.r3corda.core.crypto.Party +import com.r3corda.core.messaging.MessagingService +import com.r3corda.core.node.NodeInfo +import com.r3corda.core.node.services.ServiceType import org.slf4j.LoggerFactory import java.security.PublicKey diff --git a/core/src/main/kotlin/core/node/services/ServiceType.kt b/core/src/main/kotlin/com/r3corda/core/node/services/ServiceType.kt similarity index 96% rename from core/src/main/kotlin/core/node/services/ServiceType.kt rename to core/src/main/kotlin/com/r3corda/core/node/services/ServiceType.kt index 85295b2eef..8ea663a46b 100644 --- a/core/src/main/kotlin/core/node/services/ServiceType.kt +++ b/core/src/main/kotlin/com/r3corda/core/node/services/ServiceType.kt @@ -6,7 +6,7 @@ * All other rights reserved. */ -package core.node.services +package com.r3corda.core.node.services /** * Identifier for service types a node can expose over the network to other peers. These types are placed into network diff --git a/core/src/main/kotlin/core/node/services/Services.kt b/core/src/main/kotlin/com/r3corda/core/node/services/Services.kt similarity index 96% rename from core/src/main/kotlin/core/node/services/Services.kt rename to core/src/main/kotlin/com/r3corda/core/node/services/Services.kt index 1f4fdf70eb..c4febb7089 100644 --- a/core/src/main/kotlin/core/node/services/Services.kt +++ b/core/src/main/kotlin/com/r3corda/core/node/services/Services.kt @@ -1,9 +1,9 @@ -package core.node.services +package com.r3corda.core.node.services -import core.contracts.* -import core.crypto.Party -import core.crypto.SecureHash -import core.node.services.AttachmentStorage +import com.r3corda.core.contracts.* +import com.r3corda.core.crypto.Party +import com.r3corda.core.crypto.SecureHash +import com.r3corda.core.node.services.AttachmentStorage import java.security.KeyPair import java.security.PrivateKey import java.security.PublicKey diff --git a/core/src/main/kotlin/core/node/services/UniquenessProvider.kt b/core/src/main/kotlin/com/r3corda/core/node/services/UniquenessProvider.kt similarity index 83% rename from core/src/main/kotlin/core/node/services/UniquenessProvider.kt rename to core/src/main/kotlin/com/r3corda/core/node/services/UniquenessProvider.kt index 1b642c95ee..1ee6b76330 100644 --- a/core/src/main/kotlin/core/node/services/UniquenessProvider.kt +++ b/core/src/main/kotlin/com/r3corda/core/node/services/UniquenessProvider.kt @@ -1,9 +1,9 @@ -package core.node.services +package com.r3corda.core.node.services -import core.crypto.Party -import core.contracts.StateRef -import core.contracts.WireTransaction -import core.crypto.SecureHash +import com.r3corda.core.crypto.Party +import com.r3corda.core.contracts.StateRef +import com.r3corda.core.contracts.WireTransaction +import com.r3corda.core.crypto.SecureHash /** * A service that records input states of the given transaction and provides conflict information diff --git a/core/src/main/kotlin/core/node/services/testing/MockServices.kt b/core/src/main/kotlin/com/r3corda/core/node/services/testing/MockServices.kt similarity index 86% rename from core/src/main/kotlin/core/node/services/testing/MockServices.kt rename to core/src/main/kotlin/com/r3corda/core/node/services/testing/MockServices.kt index 737be869af..e67d4d9f1b 100644 --- a/core/src/main/kotlin/core/node/services/testing/MockServices.kt +++ b/core/src/main/kotlin/com/r3corda/core/node/services/testing/MockServices.kt @@ -1,16 +1,16 @@ -package core.node.services.testing +package com.r3corda.core.node.services.testing -import core.contracts.Attachment -import core.contracts.SignedTransaction -import core.crypto.Party -import core.crypto.SecureHash -import core.crypto.generateKeyPair -import core.crypto.sha256 -import core.node.services.AttachmentStorage -import core.node.services.IdentityService -import core.node.services.KeyManagementService -import core.node.services.StorageService -import core.utilities.RecordingMap +import com.r3corda.core.contracts.Attachment +import com.r3corda.core.contracts.SignedTransaction +import com.r3corda.core.crypto.Party +import com.r3corda.core.crypto.SecureHash +import com.r3corda.core.crypto.generateKeyPair +import com.r3corda.core.crypto.sha256 +import com.r3corda.core.node.services.AttachmentStorage +import com.r3corda.core.node.services.IdentityService +import com.r3corda.core.node.services.KeyManagementService +import com.r3corda.core.node.services.StorageService +import com.r3corda.core.utilities.RecordingMap import org.slf4j.LoggerFactory import java.io.ByteArrayInputStream import java.io.ByteArrayOutputStream diff --git a/core/src/main/kotlin/core/protocols/ProtocolLogic.kt b/core/src/main/kotlin/com/r3corda/core/protocols/ProtocolLogic.kt similarity index 94% rename from core/src/main/kotlin/core/protocols/ProtocolLogic.kt rename to core/src/main/kotlin/com/r3corda/core/protocols/ProtocolLogic.kt index 364d216829..56cff779f3 100644 --- a/core/src/main/kotlin/core/protocols/ProtocolLogic.kt +++ b/core/src/main/kotlin/com/r3corda/core/protocols/ProtocolLogic.kt @@ -1,10 +1,10 @@ -package core.protocols +package com.r3corda.core.protocols import co.paralleluniverse.fibers.Suspendable -import core.messaging.MessageRecipients -import core.node.ServiceHub -import core.utilities.ProgressTracker -import core.utilities.UntrustworthyData +import com.r3corda.core.messaging.MessageRecipients +import com.r3corda.core.node.ServiceHub +import com.r3corda.core.utilities.ProgressTracker +import com.r3corda.core.utilities.UntrustworthyData import org.slf4j.Logger /** diff --git a/core/src/main/kotlin/core/protocols/ProtocolStateMachine.kt b/core/src/main/kotlin/com/r3corda/core/protocols/ProtocolStateMachine.kt similarity index 80% rename from core/src/main/kotlin/core/protocols/ProtocolStateMachine.kt rename to core/src/main/kotlin/com/r3corda/core/protocols/ProtocolStateMachine.kt index 26022d7029..fc4f8039e8 100644 --- a/core/src/main/kotlin/core/protocols/ProtocolStateMachine.kt +++ b/core/src/main/kotlin/com/r3corda/core/protocols/ProtocolStateMachine.kt @@ -1,9 +1,9 @@ -package core.protocols +package com.r3corda.core.protocols import co.paralleluniverse.fibers.Suspendable -import core.messaging.MessageRecipients -import core.node.ServiceHub -import core.utilities.UntrustworthyData +import com.r3corda.core.messaging.MessageRecipients +import com.r3corda.core.node.ServiceHub +import com.r3corda.core.utilities.UntrustworthyData import org.slf4j.Logger diff --git a/core/src/main/kotlin/core/serialization/ByteArrays.kt b/core/src/main/kotlin/com/r3corda/core/serialization/ByteArrays.kt similarity index 96% rename from core/src/main/kotlin/core/serialization/ByteArrays.kt rename to core/src/main/kotlin/com/r3corda/core/serialization/ByteArrays.kt index 1193c92cff..7edb68744b 100644 --- a/core/src/main/kotlin/core/serialization/ByteArrays.kt +++ b/core/src/main/kotlin/com/r3corda/core/serialization/ByteArrays.kt @@ -1,4 +1,4 @@ -package core.serialization +package com.r3corda.core.serialization import com.google.common.io.BaseEncoding import java.util.* diff --git a/core/src/main/kotlin/core/serialization/Kryo.kt b/core/src/main/kotlin/com/r3corda/core/serialization/Kryo.kt similarity index 97% rename from core/src/main/kotlin/core/serialization/Kryo.kt rename to core/src/main/kotlin/com/r3corda/core/serialization/Kryo.kt index 37acca91ae..5d4c397e92 100644 --- a/core/src/main/kotlin/core/serialization/Kryo.kt +++ b/core/src/main/kotlin/com/r3corda/core/serialization/Kryo.kt @@ -1,4 +1,4 @@ -package core.serialization +package com.r3corda.core.serialization import co.paralleluniverse.fibers.Fiber import co.paralleluniverse.io.serialization.kryo.KryoSerializer @@ -8,12 +8,12 @@ import com.esotericsoftware.kryo.Serializer import com.esotericsoftware.kryo.io.Input import com.esotericsoftware.kryo.io.Output import com.esotericsoftware.kryo.serializers.JavaSerializer -import core.contracts.* -import core.crypto.SecureHash -import core.crypto.generateKeyPair -import core.crypto.sha256 -import core.node.AttachmentsClassLoader -import core.node.services.AttachmentStorage +import com.r3corda.core.contracts.* +import com.r3corda.core.crypto.SecureHash +import com.r3corda.core.crypto.generateKeyPair +import com.r3corda.core.crypto.sha256 +import com.r3corda.core.node.AttachmentsClassLoader +import com.r3corda.core.node.services.AttachmentStorage import de.javakaffee.kryoserializers.ArraysAsListSerializer import org.objenesis.strategy.StdInstantiatorStrategy import java.io.ByteArrayOutputStream diff --git a/core/src/main/kotlin/core/serialization/SerializationToken.kt b/core/src/main/kotlin/com/r3corda/core/serialization/SerializationToken.kt similarity index 99% rename from core/src/main/kotlin/core/serialization/SerializationToken.kt rename to core/src/main/kotlin/com/r3corda/core/serialization/SerializationToken.kt index 8b50cdf64a..0e2e50418d 100644 --- a/core/src/main/kotlin/core/serialization/SerializationToken.kt +++ b/core/src/main/kotlin/com/r3corda/core/serialization/SerializationToken.kt @@ -1,4 +1,4 @@ -package core.serialization +package com.r3corda.core.serialization import com.esotericsoftware.kryo.DefaultSerializer import com.esotericsoftware.kryo.Kryo diff --git a/core/src/main/kotlin/core/testing/TestUtils.kt b/core/src/main/kotlin/com/r3corda/core/testing/TestUtils.kt similarity index 97% rename from core/src/main/kotlin/core/testing/TestUtils.kt rename to core/src/main/kotlin/com/r3corda/core/testing/TestUtils.kt index ea76bdc1f4..d31ae905f2 100644 --- a/core/src/main/kotlin/core/testing/TestUtils.kt +++ b/core/src/main/kotlin/com/r3corda/core/testing/TestUtils.kt @@ -1,15 +1,15 @@ @file:Suppress("UNUSED_PARAMETER", "UNCHECKED_CAST") -package core.testing +package com.r3corda.core.testing import com.google.common.base.Throwables import com.google.common.net.HostAndPort -import core.* -import core.contracts.* -import core.crypto.* -import core.serialization.serialize -import core.node.services.testing.MockIdentityService -import core.node.services.testing.MockStorageService +import com.r3corda.core.* +import com.r3corda.core.contracts.* +import com.r3corda.core.crypto.* +import com.r3corda.core.serialization.serialize +import com.r3corda.core.node.services.testing.MockIdentityService +import com.r3corda.core.node.services.testing.MockStorageService import java.net.ServerSocket import java.security.KeyPair import java.security.PublicKey diff --git a/core/src/main/kotlin/core/utilities/Emoji.kt b/core/src/main/kotlin/com/r3corda/core/utilities/Emoji.kt similarity index 97% rename from core/src/main/kotlin/core/utilities/Emoji.kt rename to core/src/main/kotlin/com/r3corda/core/utilities/Emoji.kt index c03eb729bf..98fb29ad68 100644 --- a/core/src/main/kotlin/core/utilities/Emoji.kt +++ b/core/src/main/kotlin/com/r3corda/core/utilities/Emoji.kt @@ -1,4 +1,4 @@ -package core.utilities +package com.r3corda.core.utilities /** * A simple wrapper class that contains icons and support for printing them only when we're connected to a terminal. diff --git a/core/src/main/kotlin/core/utilities/Logging.kt b/core/src/main/kotlin/com/r3corda/core/utilities/Logging.kt similarity index 99% rename from core/src/main/kotlin/core/utilities/Logging.kt rename to core/src/main/kotlin/com/r3corda/core/utilities/Logging.kt index 1060f230c7..ad2c103f48 100644 --- a/core/src/main/kotlin/core/utilities/Logging.kt +++ b/core/src/main/kotlin/com/r3corda/core/utilities/Logging.kt @@ -1,4 +1,4 @@ -package core.utilities +package com.r3corda.core.utilities import org.slf4j.LoggerFactory import java.io.PrintWriter diff --git a/core/src/main/kotlin/core/utilities/ProgressTracker.kt b/core/src/main/kotlin/com/r3corda/core/utilities/ProgressTracker.kt similarity index 99% rename from core/src/main/kotlin/core/utilities/ProgressTracker.kt rename to core/src/main/kotlin/com/r3corda/core/utilities/ProgressTracker.kt index cc7d4b8ae2..6bf110f4b9 100644 --- a/core/src/main/kotlin/core/utilities/ProgressTracker.kt +++ b/core/src/main/kotlin/com/r3corda/core/utilities/ProgressTracker.kt @@ -1,6 +1,6 @@ -package core.utilities +package com.r3corda.core.utilities -import core.TransientProperty +import com.r3corda.core.TransientProperty import rx.Observable import rx.Subscription import rx.subjects.BehaviorSubject diff --git a/core/src/main/kotlin/core/utilities/RecordingMap.kt b/core/src/main/kotlin/com/r3corda/core/utilities/RecordingMap.kt similarity index 97% rename from core/src/main/kotlin/core/utilities/RecordingMap.kt rename to core/src/main/kotlin/com/r3corda/core/utilities/RecordingMap.kt index c443729d6c..4688518656 100644 --- a/core/src/main/kotlin/core/utilities/RecordingMap.kt +++ b/core/src/main/kotlin/com/r3corda/core/utilities/RecordingMap.kt @@ -1,4 +1,4 @@ -package core.utilities +package com.r3corda.core.utilities import org.slf4j.Logger import java.util.* diff --git a/core/src/main/kotlin/core/utilities/UntrustworthyData.kt b/core/src/main/kotlin/com/r3corda/core/utilities/UntrustworthyData.kt similarity index 96% rename from core/src/main/kotlin/core/utilities/UntrustworthyData.kt rename to core/src/main/kotlin/com/r3corda/core/utilities/UntrustworthyData.kt index dbb374ed67..9b94d7722e 100644 --- a/core/src/main/kotlin/core/utilities/UntrustworthyData.kt +++ b/core/src/main/kotlin/com/r3corda/core/utilities/UntrustworthyData.kt @@ -1,4 +1,4 @@ -package core.utilities +package com.r3corda.core.utilities /** * A small utility to approximate taint tracking: if a method gives you back one of these, it means the data came from diff --git a/core/src/main/kotlin/protocols/AbstractRequestMessage.kt b/core/src/main/kotlin/com/r3corda/protocols/AbstractRequestMessage.kt similarity index 64% rename from core/src/main/kotlin/protocols/AbstractRequestMessage.kt rename to core/src/main/kotlin/com/r3corda/protocols/AbstractRequestMessage.kt index a1ceac7675..414df561f5 100644 --- a/core/src/main/kotlin/protocols/AbstractRequestMessage.kt +++ b/core/src/main/kotlin/com/r3corda/protocols/AbstractRequestMessage.kt @@ -1,6 +1,6 @@ -package protocols +package com.r3corda.protocols -import core.messaging.MessageRecipients +import com.r3corda.core.messaging.MessageRecipients /** * Abstract superclass for request messages sent to services, which includes common diff --git a/core/src/main/kotlin/protocols/FetchAttachmentsProtocol.kt b/core/src/main/kotlin/com/r3corda/protocols/FetchAttachmentsProtocol.kt similarity index 85% rename from core/src/main/kotlin/protocols/FetchAttachmentsProtocol.kt rename to core/src/main/kotlin/com/r3corda/protocols/FetchAttachmentsProtocol.kt index 2db2a5cbf2..dd19927281 100644 --- a/core/src/main/kotlin/protocols/FetchAttachmentsProtocol.kt +++ b/core/src/main/kotlin/com/r3corda/protocols/FetchAttachmentsProtocol.kt @@ -1,9 +1,9 @@ -package protocols +package com.r3corda.protocols -import core.contracts.Attachment -import core.crypto.SecureHash -import core.crypto.sha256 -import core.messaging.SingleMessageRecipient +import com.r3corda.core.contracts.Attachment +import com.r3corda.core.crypto.SecureHash +import com.r3corda.core.crypto.sha256 +import com.r3corda.core.messaging.SingleMessageRecipient import java.io.ByteArrayInputStream import java.io.InputStream diff --git a/core/src/main/kotlin/protocols/FetchDataProtocol.kt b/core/src/main/kotlin/com/r3corda/protocols/FetchDataProtocol.kt similarity index 93% rename from core/src/main/kotlin/protocols/FetchDataProtocol.kt rename to core/src/main/kotlin/com/r3corda/protocols/FetchDataProtocol.kt index cfd378079c..2530269bd9 100644 --- a/core/src/main/kotlin/protocols/FetchDataProtocol.kt +++ b/core/src/main/kotlin/com/r3corda/protocols/FetchDataProtocol.kt @@ -1,12 +1,12 @@ -package protocols +package com.r3corda.protocols import co.paralleluniverse.fibers.Suspendable -import core.contracts.NamedByHash -import core.crypto.SecureHash -import core.messaging.SingleMessageRecipient -import core.protocols.ProtocolLogic -import core.random63BitValue -import core.utilities.UntrustworthyData +import com.r3corda.core.contracts.NamedByHash +import com.r3corda.core.crypto.SecureHash +import com.r3corda.core.messaging.SingleMessageRecipient +import com.r3corda.core.protocols.ProtocolLogic +import com.r3corda.core.random63BitValue +import com.r3corda.core.utilities.UntrustworthyData import java.util.* /** diff --git a/core/src/main/kotlin/protocols/FetchTransactionsProtocol.kt b/core/src/main/kotlin/com/r3corda/protocols/FetchTransactionsProtocol.kt similarity index 84% rename from core/src/main/kotlin/protocols/FetchTransactionsProtocol.kt rename to core/src/main/kotlin/com/r3corda/protocols/FetchTransactionsProtocol.kt index 38ece2ed54..864aeb7562 100644 --- a/core/src/main/kotlin/protocols/FetchTransactionsProtocol.kt +++ b/core/src/main/kotlin/com/r3corda/protocols/FetchTransactionsProtocol.kt @@ -1,8 +1,8 @@ -package protocols +package com.r3corda.protocols -import core.contracts.SignedTransaction -import core.crypto.SecureHash -import core.messaging.SingleMessageRecipient +import com.r3corda.core.contracts.SignedTransaction +import com.r3corda.core.crypto.SecureHash +import com.r3corda.core.messaging.SingleMessageRecipient /** * Given a set of tx hashes (IDs), either loads them from local disk or asks the remote peer to provide them. diff --git a/core/src/main/kotlin/protocols/NotaryProtocol.kt b/core/src/main/kotlin/com/r3corda/protocols/NotaryProtocol.kt similarity index 87% rename from core/src/main/kotlin/protocols/NotaryProtocol.kt rename to core/src/main/kotlin/com/r3corda/protocols/NotaryProtocol.kt index c81840ba0f..8fa7138962 100644 --- a/core/src/main/kotlin/protocols/NotaryProtocol.kt +++ b/core/src/main/kotlin/com/r3corda/protocols/NotaryProtocol.kt @@ -1,19 +1,19 @@ -package protocols +package com.r3corda.protocols import co.paralleluniverse.fibers.Suspendable -import core.crypto.Party -import core.contracts.TimestampCommand -import core.contracts.WireTransaction -import core.crypto.DigitalSignature -import core.crypto.SignedData -import core.messaging.SingleMessageRecipient -import core.node.NodeInfo -import core.node.services.UniquenessProvider -import core.protocols.ProtocolLogic -import core.random63BitValue -import core.serialization.SerializedBytes -import core.utilities.ProgressTracker -import core.utilities.UntrustworthyData +import com.r3corda.core.crypto.Party +import com.r3corda.core.contracts.TimestampCommand +import com.r3corda.core.contracts.WireTransaction +import com.r3corda.core.crypto.DigitalSignature +import com.r3corda.core.crypto.SignedData +import com.r3corda.core.messaging.SingleMessageRecipient +import com.r3corda.core.node.NodeInfo +import com.r3corda.core.node.services.UniquenessProvider +import com.r3corda.core.protocols.ProtocolLogic +import com.r3corda.core.random63BitValue +import com.r3corda.core.serialization.SerializedBytes +import com.r3corda.core.utilities.ProgressTracker +import com.r3corda.core.utilities.UntrustworthyData import java.security.PublicKey /** diff --git a/core/src/main/kotlin/protocols/RatesFixProtocol.kt b/core/src/main/kotlin/com/r3corda/protocols/RatesFixProtocol.kt similarity index 89% rename from core/src/main/kotlin/protocols/RatesFixProtocol.kt rename to core/src/main/kotlin/com/r3corda/protocols/RatesFixProtocol.kt index 5f964dd198..62f0e020cc 100644 --- a/core/src/main/kotlin/protocols/RatesFixProtocol.kt +++ b/core/src/main/kotlin/com/r3corda/protocols/RatesFixProtocol.kt @@ -1,16 +1,16 @@ -package protocols +package com.r3corda.protocols import co.paralleluniverse.fibers.Suspendable -import core.* -import core.contracts.Fix -import core.contracts.FixOf -import core.contracts.TransactionBuilder -import core.contracts.WireTransaction -import core.crypto.DigitalSignature -import core.messaging.SingleMessageRecipient -import core.node.NodeInfo -import core.protocols.ProtocolLogic -import core.utilities.ProgressTracker +import com.r3corda.core.* +import com.r3corda.core.contracts.Fix +import com.r3corda.core.contracts.FixOf +import com.r3corda.core.contracts.TransactionBuilder +import com.r3corda.core.contracts.WireTransaction +import com.r3corda.core.crypto.DigitalSignature +import com.r3corda.core.messaging.SingleMessageRecipient +import com.r3corda.core.node.NodeInfo +import com.r3corda.core.protocols.ProtocolLogic +import com.r3corda.core.utilities.ProgressTracker import java.math.BigDecimal import java.util.* diff --git a/core/src/main/kotlin/protocols/ResolveTransactionsProtocol.kt b/core/src/main/kotlin/com/r3corda/protocols/ResolveTransactionsProtocol.kt similarity index 96% rename from core/src/main/kotlin/protocols/ResolveTransactionsProtocol.kt rename to core/src/main/kotlin/com/r3corda/protocols/ResolveTransactionsProtocol.kt index c86ab8743a..181f01bd10 100644 --- a/core/src/main/kotlin/protocols/ResolveTransactionsProtocol.kt +++ b/core/src/main/kotlin/com/r3corda/protocols/ResolveTransactionsProtocol.kt @@ -1,11 +1,11 @@ -package protocols +package com.r3corda.protocols import co.paralleluniverse.fibers.Suspendable -import core.* -import core.contracts.* -import core.crypto.SecureHash -import core.messaging.SingleMessageRecipient -import core.protocols.ProtocolLogic +import com.r3corda.core.* +import com.r3corda.core.contracts.* +import com.r3corda.core.crypto.SecureHash +import com.r3corda.core.messaging.SingleMessageRecipient +import com.r3corda.core.protocols.ProtocolLogic import java.util.* // NB: This code is unit tested by TwoPartyTradeProtocolTests diff --git a/core/src/main/kotlin/protocols/TwoPartyDealProtocol.kt b/core/src/main/kotlin/com/r3corda/protocols/TwoPartyDealProtocol.kt similarity index 97% rename from core/src/main/kotlin/protocols/TwoPartyDealProtocol.kt rename to core/src/main/kotlin/com/r3corda/protocols/TwoPartyDealProtocol.kt index 5e04bbd7ed..a61fd762b2 100644 --- a/core/src/main/kotlin/protocols/TwoPartyDealProtocol.kt +++ b/core/src/main/kotlin/com/r3corda/protocols/TwoPartyDealProtocol.kt @@ -1,18 +1,18 @@ -package protocols +package com.r3corda.protocols import co.paralleluniverse.fibers.Suspendable -import core.contracts.* -import core.crypto.DigitalSignature -import core.crypto.Party -import core.crypto.signWithECDSA -import core.messaging.SingleMessageRecipient -import core.node.NodeInfo -import core.protocols.ProtocolLogic -import core.random63BitValue -import core.seconds -import core.utilities.ProgressTracker -import core.utilities.UntrustworthyData -import core.utilities.trace +import com.r3corda.core.contracts.* +import com.r3corda.core.crypto.DigitalSignature +import com.r3corda.core.crypto.Party +import com.r3corda.core.crypto.signWithECDSA +import com.r3corda.core.messaging.SingleMessageRecipient +import com.r3corda.core.node.NodeInfo +import com.r3corda.core.protocols.ProtocolLogic +import com.r3corda.core.random63BitValue +import com.r3corda.core.seconds +import com.r3corda.core.utilities.ProgressTracker +import com.r3corda.core.utilities.UntrustworthyData +import com.r3corda.core.utilities.trace import java.math.BigDecimal import java.security.KeyPair import java.security.PublicKey diff --git a/core/src/main/resources/core/contracts/LondonHolidayCalendar.txt b/core/src/main/resources/com/r3corda/core/contracts/LondonHolidayCalendar.txt similarity index 100% rename from core/src/main/resources/core/contracts/LondonHolidayCalendar.txt rename to core/src/main/resources/com/r3corda/core/contracts/LondonHolidayCalendar.txt diff --git a/core/src/main/resources/core/contracts/NewYorkHolidayCalendar.txt b/core/src/main/resources/com/r3corda/core/contracts/NewYorkHolidayCalendar.txt similarity index 100% rename from core/src/main/resources/core/contracts/NewYorkHolidayCalendar.txt rename to core/src/main/resources/com/r3corda/core/contracts/NewYorkHolidayCalendar.txt diff --git a/core/src/main/resources/core/node/cities.txt b/core/src/main/resources/com/r3corda/core/node/cities.txt similarity index 100% rename from core/src/main/resources/core/node/cities.txt rename to core/src/main/resources/com/r3corda/core/node/cities.txt diff --git a/core/src/main/resources/com/r3corda/core/node/isolated.jar b/core/src/main/resources/com/r3corda/core/node/isolated.jar new file mode 100644 index 0000000000000000000000000000000000000000..974d8d182fae079e016c163a10c468eace9efa37 GIT binary patch literal 7553 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 D{It2# diff --git a/core/src/test/kotlin/core/FinanceTypesTest.kt b/core/src/test/kotlin/com/r3corda/core/FinanceTypesTest.kt similarity index 98% rename from core/src/test/kotlin/core/FinanceTypesTest.kt rename to core/src/test/kotlin/com/r3corda/core/FinanceTypesTest.kt index a878167efd..30f3b5b788 100644 --- a/core/src/test/kotlin/core/FinanceTypesTest.kt +++ b/core/src/test/kotlin/com/r3corda/core/FinanceTypesTest.kt @@ -1,6 +1,6 @@ -package core +package com.r3corda.core -import core.contracts.* +import com.r3corda.core.contracts.* import org.junit.Test import java.time.LocalDate import java.util.* diff --git a/core/src/test/kotlin/core/contracts/TransactionGroupTests.kt b/core/src/test/kotlin/com/r3corda/core/contracts/TransactionGroupTests.kt similarity index 96% rename from core/src/test/kotlin/core/contracts/TransactionGroupTests.kt rename to core/src/test/kotlin/com/r3corda/core/contracts/TransactionGroupTests.kt index 32694c393d..4a8b18ba67 100644 --- a/core/src/test/kotlin/core/contracts/TransactionGroupTests.kt +++ b/core/src/test/kotlin/com/r3corda/core/contracts/TransactionGroupTests.kt @@ -1,9 +1,9 @@ -package core.contracts +package com.r3corda.core.contracts -import core.crypto.Party -import core.crypto.SecureHash -import core.node.services.testing.MockStorageService -import core.testing.* +import com.r3corda.core.crypto.Party +import com.r3corda.core.crypto.SecureHash +import com.r3corda.core.node.services.testing.MockStorageService +import com.r3corda.core.testing.* import org.junit.Test import java.security.PublicKey import java.security.SecureRandom diff --git a/core/src/test/kotlin/core/crypto/Base58Test.java b/core/src/test/kotlin/com/r3corda/core/crypto/Base58Test.java similarity index 98% rename from core/src/test/kotlin/core/crypto/Base58Test.java rename to core/src/test/kotlin/com/r3corda/core/crypto/Base58Test.java index 2f7259308b..820e605c9d 100644 --- a/core/src/test/kotlin/core/crypto/Base58Test.java +++ b/core/src/test/kotlin/com/r3corda/core/crypto/Base58Test.java @@ -1,4 +1,4 @@ -package core.crypto; +package com.r3corda.core.crypto; import org.junit.*; diff --git a/core/src/test/kotlin/core/crypto/SignedDataTest.kt b/core/src/test/kotlin/com/r3corda/core/crypto/SignedDataTest.kt similarity index 91% rename from core/src/test/kotlin/core/crypto/SignedDataTest.kt rename to core/src/test/kotlin/com/r3corda/core/crypto/SignedDataTest.kt index 0c314c20e6..da99ca16b0 100644 --- a/core/src/test/kotlin/core/crypto/SignedDataTest.kt +++ b/core/src/test/kotlin/com/r3corda/core/crypto/SignedDataTest.kt @@ -1,6 +1,6 @@ -package core.crypto +package com.r3corda.core.crypto -import core.serialization.serialize +import com.r3corda.core.serialization.serialize import org.junit.Test import java.security.SignatureException import kotlin.test.assertEquals diff --git a/core/src/test/kotlin/core/math/InterpolatorsTest.kt b/core/src/test/kotlin/com/r3corda/core/math/InterpolatorsTest.kt similarity index 97% rename from core/src/test/kotlin/core/math/InterpolatorsTest.kt rename to core/src/test/kotlin/com/r3corda/core/math/InterpolatorsTest.kt index 3fc6ac2ef8..6626fbdf7b 100644 --- a/core/src/test/kotlin/core/math/InterpolatorsTest.kt +++ b/core/src/test/kotlin/com/r3corda/core/math/InterpolatorsTest.kt @@ -1,4 +1,4 @@ -package core.math +package com.r3corda.core.math import org.junit.Assert import org.junit.Test @@ -66,7 +66,7 @@ class InterpolatorsTest { val xs = doubleArrayOf(1.0, 2.0, 3.0, 4.0, 5.0) val ys = doubleArrayOf(2.0, 4.0, 5.0, 11.0, 10.0) val toInterpolate = doubleArrayOf(1.5, 2.5, 2.8, 3.3, 3.7, 4.3, 4.7) - // Expected values generated using R's splinefun (package stats v3.2.4), "natural" method + // Expected values generated using R's splinefun (package com.r3corda.stats v3.2.4), "natural" method val expected = doubleArrayOf(3.28, 4.03, 4.37, 6.7, 9.46, 11.5, 10.91) val interpolator = CubicSplineInterpolator(xs, ys) diff --git a/core/src/test/kotlin/core/node/AttachmentClassLoaderTests.kt b/core/src/test/kotlin/com/r3corda/core/node/AttachmentClassLoaderTests.kt similarity index 90% rename from core/src/test/kotlin/core/node/AttachmentClassLoaderTests.kt rename to core/src/test/kotlin/com/r3corda/core/node/AttachmentClassLoaderTests.kt index e24e12ef23..b984c62436 100644 --- a/core/src/test/kotlin/core/node/AttachmentClassLoaderTests.kt +++ b/core/src/test/kotlin/com/r3corda/core/node/AttachmentClassLoaderTests.kt @@ -1,13 +1,13 @@ -package core.node +package com.r3corda.core.node -import core.contracts.* -import core.crypto.Party -import core.crypto.SecureHash -import core.node.services.AttachmentStorage -import core.node.services.testing.MockAttachmentStorage -import core.serialization.* -import core.testing.DUMMY_NOTARY -import core.testing.MEGA_CORP +import com.r3corda.core.contracts.* +import com.r3corda.core.crypto.Party +import com.r3corda.core.crypto.SecureHash +import com.r3corda.core.node.services.AttachmentStorage +import com.r3corda.core.node.services.testing.MockAttachmentStorage +import com.r3corda.core.serialization.* +import com.r3corda.core.testing.DUMMY_NOTARY +import com.r3corda.core.testing.MEGA_CORP import org.apache.commons.io.IOUtils import org.junit.Test import java.io.ByteArrayInputStream @@ -75,7 +75,7 @@ class AttachmentClassLoaderTests { fun `dynamically load AnotherDummyContract from isolated contracts jar`() { val child = ClassLoaderForTests() - val contractClass = Class.forName("contracts.isolated.AnotherDummyContract", true, child) + val contractClass = Class.forName("com.r3corda.contracts.isolated.AnotherDummyContract", true, child) val contract = contractClass.newInstance() as Contract assertEquals(SecureHash.sha256("https://anotherdummy.org"), contract.legalContractReference) @@ -137,7 +137,7 @@ class AttachmentClassLoaderTests { val att2 = storage.importAttachment(ByteArrayInputStream(fakeAttachment("file2.txt", "some other data"))) val cl = AttachmentsClassLoader(arrayOf(att0, att1, att2).map { storage.openAttachment(it)!! }, FilteringClassLoader) - val contractClass = Class.forName("contracts.isolated.AnotherDummyContract", true, cl) + val contractClass = Class.forName("com.r3corda.contracts.isolated.AnotherDummyContract", true, cl) val contract = contractClass.newInstance() as Contract assertEquals(cl, contract.javaClass.classLoader) assertEquals(SecureHash.sha256("https://anotherdummy.org"), contract.legalContractReference) @@ -146,7 +146,7 @@ class AttachmentClassLoaderTests { @Test fun `verify that contract DummyContract is in classPath`() { - val contractClass = Class.forName("core.node.AttachmentClassLoaderTests\$AttachmentDummyContract") + val contractClass = Class.forName("com.r3corda.core.node.AttachmentClassLoaderTests\$AttachmentDummyContract") val contract = contractClass.newInstance() as Contract assertNotNull(contract) @@ -154,7 +154,7 @@ class AttachmentClassLoaderTests { fun createContract2Cash(): Contract { val cl = ClassLoaderForTests() - val contractClass = Class.forName("contracts.isolated.AnotherDummyContract", true, cl) + val contractClass = Class.forName("com.r3corda.contracts.isolated.AnotherDummyContract", true, cl) return contractClass.newInstance() as Contract } @@ -221,7 +221,7 @@ class AttachmentClassLoaderTests { @Test fun `test serialization of WireTransaction with dynamically loaded contract`() { val child = ClassLoaderForTests() - val contractClass = Class.forName("contracts.isolated.AnotherDummyContract", true, child) + val contractClass = Class.forName("com.r3corda.contracts.isolated.AnotherDummyContract", true, child) val contract = contractClass.newInstance() as DummyContractBackdoor val tx = contract.generateInitial(MEGA_CORP.ref(0), 42, DUMMY_NOTARY) val storage = MockAttachmentStorage() @@ -252,7 +252,7 @@ class AttachmentClassLoaderTests { @Test fun `test deserialize of WireTransaction where contract cannot be found`() { val child = ClassLoaderForTests() - val contractClass = Class.forName("contracts.isolated.AnotherDummyContract", true, child) + val contractClass = Class.forName("com.r3corda.contracts.isolated.AnotherDummyContract", true, child) val contract = contractClass.newInstance() as DummyContractBackdoor val tx = contract.generateInitial(MEGA_CORP.ref(0), 42, DUMMY_NOTARY) val storage = MockAttachmentStorage() diff --git a/core/src/test/kotlin/core/serialization/KryoTests.kt b/core/src/test/kotlin/com/r3corda/core/serialization/KryoTests.kt similarity index 95% rename from core/src/test/kotlin/core/serialization/KryoTests.kt rename to core/src/test/kotlin/com/r3corda/core/serialization/KryoTests.kt index ab396f4354..b319b12906 100644 --- a/core/src/test/kotlin/core/serialization/KryoTests.kt +++ b/core/src/test/kotlin/com/r3corda/core/serialization/KryoTests.kt @@ -1,4 +1,4 @@ -package core.serialization +package com.r3corda.core.serialization import com.esotericsoftware.kryo.Kryo import org.junit.Test diff --git a/core/src/test/kotlin/core/serialization/SerializationTokenTest.kt b/core/src/test/kotlin/com/r3corda/core/serialization/SerializationTokenTest.kt similarity index 98% rename from core/src/test/kotlin/core/serialization/SerializationTokenTest.kt rename to core/src/test/kotlin/com/r3corda/core/serialization/SerializationTokenTest.kt index 346364457b..786bc62601 100644 --- a/core/src/test/kotlin/core/serialization/SerializationTokenTest.kt +++ b/core/src/test/kotlin/com/r3corda/core/serialization/SerializationTokenTest.kt @@ -1,4 +1,4 @@ -package core.serialization +package com.r3corda.core.serialization import com.esotericsoftware.kryo.DefaultSerializer import org.assertj.core.api.Assertions.assertThat diff --git a/core/src/test/kotlin/core/serialization/TransactionSerializationTests.kt b/core/src/test/kotlin/com/r3corda/core/serialization/TransactionSerializationTests.kt similarity index 93% rename from core/src/test/kotlin/core/serialization/TransactionSerializationTests.kt rename to core/src/test/kotlin/com/r3corda/core/serialization/TransactionSerializationTests.kt index 5c2fd978ae..6946036829 100644 --- a/core/src/test/kotlin/core/serialization/TransactionSerializationTests.kt +++ b/core/src/test/kotlin/com/r3corda/core/serialization/TransactionSerializationTests.kt @@ -1,11 +1,11 @@ -package core.serialization +package com.r3corda.core.serialization -import core.contracts.* -import core.crypto.Party -import core.crypto.SecureHash -import core.node.services.testing.MockStorageService -import core.seconds -import core.testing.* +import com.r3corda.core.contracts.* +import com.r3corda.core.crypto.Party +import com.r3corda.core.crypto.SecureHash +import com.r3corda.core.node.services.testing.MockStorageService +import com.r3corda.core.seconds +import com.r3corda.core.testing.* import org.junit.Before import org.junit.Test import java.security.PublicKey diff --git a/core/src/test/kotlin/core/utilities/CollectionExtensionTests.kt b/core/src/test/kotlin/com/r3corda/core/utilities/CollectionExtensionTests.kt similarity index 91% rename from core/src/test/kotlin/core/utilities/CollectionExtensionTests.kt rename to core/src/test/kotlin/com/r3corda/core/utilities/CollectionExtensionTests.kt index f40ac1fb22..39f7b4cca3 100644 --- a/core/src/test/kotlin/core/utilities/CollectionExtensionTests.kt +++ b/core/src/test/kotlin/com/r3corda/core/utilities/CollectionExtensionTests.kt @@ -1,7 +1,7 @@ -package core.utilities +package com.r3corda.core.utilities -import core.indexOfOrThrow -import core.noneOrSingle +import com.r3corda.core.indexOfOrThrow +import com.r3corda.core.noneOrSingle import org.junit.Test import kotlin.test.assertEquals import kotlin.test.assertFailsWith diff --git a/core/src/test/kotlin/core/utilities/EmbeddedExpressionsTest.kt b/core/src/test/kotlin/com/r3corda/core/utilities/EmbeddedExpressionsTest.kt similarity index 90% rename from core/src/test/kotlin/core/utilities/EmbeddedExpressionsTest.kt rename to core/src/test/kotlin/com/r3corda/core/utilities/EmbeddedExpressionsTest.kt index e35cd03db8..0ea0f4879a 100644 --- a/core/src/test/kotlin/core/utilities/EmbeddedExpressionsTest.kt +++ b/core/src/test/kotlin/com/r3corda/core/utilities/EmbeddedExpressionsTest.kt @@ -1,4 +1,4 @@ -package core.utilities +package com.r3corda.core.utilities import org.apache.commons.jexl3.JexlBuilder import org.apache.commons.jexl3.MapContext diff --git a/core/src/test/kotlin/core/utilities/ProgressTrackerTest.kt b/core/src/test/kotlin/com/r3corda/core/utilities/ProgressTrackerTest.kt similarity index 98% rename from core/src/test/kotlin/core/utilities/ProgressTrackerTest.kt rename to core/src/test/kotlin/com/r3corda/core/utilities/ProgressTrackerTest.kt index e3985965ab..572a575486 100644 --- a/core/src/test/kotlin/core/utilities/ProgressTrackerTest.kt +++ b/core/src/test/kotlin/com/r3corda/core/utilities/ProgressTrackerTest.kt @@ -1,4 +1,4 @@ -package core.utilities +package com.r3corda.core.utilities import org.junit.Before import org.junit.Test diff --git a/node/src/main/kotlin/node/api/APIServer.kt b/node/src/main/kotlin/com/r3corda/node/api/APIServer.kt similarity index 92% rename from node/src/main/kotlin/node/api/APIServer.kt rename to node/src/main/kotlin/com/r3corda/node/api/APIServer.kt index 8d5a3e052a..0c2331244f 100644 --- a/node/src/main/kotlin/node/api/APIServer.kt +++ b/node/src/main/kotlin/com/r3corda/node/api/APIServer.kt @@ -1,13 +1,13 @@ -package node.api +package com.r3corda.node.api -import node.api.StatesQuery -import core.contracts.ContractState -import core.contracts.SignedTransaction -import core.contracts.StateRef -import core.contracts.WireTransaction -import core.crypto.DigitalSignature -import core.crypto.SecureHash -import core.serialization.SerializedBytes +import com.r3corda.node.api.StatesQuery +import com.r3corda.core.contracts.ContractState +import com.r3corda.core.contracts.SignedTransaction +import com.r3corda.core.contracts.StateRef +import com.r3corda.core.contracts.WireTransaction +import com.r3corda.core.crypto.DigitalSignature +import com.r3corda.core.crypto.SecureHash +import com.r3corda.core.serialization.SerializedBytes import java.time.Instant import java.time.LocalDateTime import javax.ws.rs.GET diff --git a/node/src/main/kotlin/node/api/Query.kt b/node/src/main/kotlin/com/r3corda/node/api/Query.kt similarity index 95% rename from node/src/main/kotlin/node/api/Query.kt rename to node/src/main/kotlin/com/r3corda/node/api/Query.kt index 760203c9d0..92962e18c9 100644 --- a/node/src/main/kotlin/node/api/Query.kt +++ b/node/src/main/kotlin/com/r3corda/node/api/Query.kt @@ -1,4 +1,4 @@ -package node.api +package com.r3corda.node.api /** * Extremely rudimentary query language which should most likely be replaced with a product diff --git a/node/src/main/kotlin/node/internal/APIServerImpl.kt b/node/src/main/kotlin/com/r3corda/node/internal/APIServerImpl.kt similarity index 92% rename from node/src/main/kotlin/node/internal/APIServerImpl.kt rename to node/src/main/kotlin/com/r3corda/node/internal/APIServerImpl.kt index 9b2203c136..602717ca5e 100644 --- a/node/src/main/kotlin/node/internal/APIServerImpl.kt +++ b/node/src/main/kotlin/com/r3corda/node/internal/APIServerImpl.kt @@ -1,14 +1,14 @@ -package node.internal +package com.r3corda.node.internal import com.google.common.util.concurrent.ListenableFuture -import core.contracts.* -import core.crypto.DigitalSignature -import core.crypto.SecureHash -import core.node.services.linearHeadsOfType -import core.protocols.ProtocolLogic -import core.serialization.SerializedBytes -import node.api.* -import node.utilities.* +import com.r3corda.core.contracts.* +import com.r3corda.core.crypto.DigitalSignature +import com.r3corda.core.crypto.SecureHash +import com.r3corda.core.node.services.linearHeadsOfType +import com.r3corda.core.protocols.ProtocolLogic +import com.r3corda.core.serialization.SerializedBytes +import com.r3corda.node.api.* +import com.r3corda.node.utilities.* import java.time.LocalDateTime import java.util.* import kotlin.reflect.KParameter diff --git a/node/src/main/kotlin/node/internal/AbstractNode.kt b/node/src/main/kotlin/com/r3corda/node/internal/AbstractNode.kt similarity index 86% rename from node/src/main/kotlin/node/internal/AbstractNode.kt rename to node/src/main/kotlin/com/r3corda/node/internal/AbstractNode.kt index 960ece9091..6b4bd50153 100644 --- a/node/src/main/kotlin/node/internal/AbstractNode.kt +++ b/node/src/main/kotlin/com/r3corda/node/internal/AbstractNode.kt @@ -1,44 +1,44 @@ -package node.internal +package com.r3corda.node.internal import com.codahale.metrics.MetricRegistry import com.google.common.util.concurrent.ListenableFuture import com.google.common.util.concurrent.SettableFuture -import core.RunOnCallerThread -import core.crypto.Party -import core.messaging.MessagingService -import core.messaging.runOnNextMessage -import core.node.CityDatabase -import core.node.NodeInfo -import core.node.PhysicalLocation -import core.node.services.* -import core.random63BitValue -import core.seconds -import core.serialization.deserialize -import core.serialization.serialize -import node.api.APIServer -import node.services.api.AcceptsFileUpload -import node.services.api.CheckpointStorage -import node.services.api.MonitoringService -import node.services.api.ServiceHubInternal -import node.services.transactions.InMemoryUniquenessProvider -import node.services.transactions.NotaryService -import node.services.transactions.TimestampChecker -import node.services.clientapi.NodeInterestRates -import node.services.config.NodeConfiguration -import node.services.identity.InMemoryIdentityService -import node.services.keys.E2ETestKeyManagementService -import node.services.network.InMemoryNetworkMapCache -import node.services.network.InMemoryNetworkMapService -import node.services.network.NetworkMapService -import node.services.network.NodeRegistration -import node.services.persistence.DataVendingService -import node.services.persistence.NodeAttachmentService -import node.services.persistence.PerFileCheckpointStorage -import node.services.persistence.StorageServiceImpl -import node.services.statemachine.StateMachineManager -import node.services.wallet.NodeWalletService -import node.utilities.AddOrRemove -import node.utilities.AffinityExecutor +import com.r3corda.core.RunOnCallerThread +import com.r3corda.core.crypto.Party +import com.r3corda.core.messaging.MessagingService +import com.r3corda.core.messaging.runOnNextMessage +import com.r3corda.core.node.CityDatabase +import com.r3corda.core.node.NodeInfo +import com.r3corda.core.node.PhysicalLocation +import com.r3corda.core.node.services.* +import com.r3corda.core.random63BitValue +import com.r3corda.core.seconds +import com.r3corda.core.serialization.deserialize +import com.r3corda.core.serialization.serialize +import com.r3corda.node.api.APIServer +import com.r3corda.node.services.api.AcceptsFileUpload +import com.r3corda.node.services.api.CheckpointStorage +import com.r3corda.node.services.api.MonitoringService +import com.r3corda.node.services.api.ServiceHubInternal +import com.r3corda.node.services.transactions.InMemoryUniquenessProvider +import com.r3corda.node.services.transactions.NotaryService +import com.r3corda.node.services.transactions.TimestampChecker +import com.r3corda.node.services.clientapi.NodeInterestRates +import com.r3corda.node.services.config.NodeConfiguration +import com.r3corda.node.services.identity.InMemoryIdentityService +import com.r3corda.node.services.keys.E2ETestKeyManagementService +import com.r3corda.node.services.network.InMemoryNetworkMapCache +import com.r3corda.node.services.network.InMemoryNetworkMapService +import com.r3corda.node.services.network.NetworkMapService +import com.r3corda.node.services.network.NodeRegistration +import com.r3corda.node.services.persistence.DataVendingService +import com.r3corda.node.services.persistence.NodeAttachmentService +import com.r3corda.node.services.persistence.PerFileCheckpointStorage +import com.r3corda.node.services.persistence.StorageServiceImpl +import com.r3corda.node.services.statemachine.StateMachineManager +import com.r3corda.node.services.wallet.NodeWalletService +import com.r3corda.node.utilities.AddOrRemove +import com.r3corda.node.utilities.AffinityExecutor import org.slf4j.Logger import java.nio.file.FileAlreadyExistsException import java.nio.file.Files @@ -281,7 +281,7 @@ abstract class AbstractNode(val dir: Path, val configuration: NodeConfiguration, } } - protected open fun generateKeyPair() = core.crypto.generateKeyPair() + protected open fun generateKeyPair() = com.r3corda.core.crypto.generateKeyPair() protected fun makeAttachmentStorage(dir: Path): NodeAttachmentService { val attachmentsDir = dir.resolve("attachments") diff --git a/node/src/main/kotlin/node/internal/Node.kt b/node/src/main/kotlin/com/r3corda/node/internal/Node.kt similarity index 92% rename from node/src/main/kotlin/node/internal/Node.kt rename to node/src/main/kotlin/com/r3corda/node/internal/Node.kt index 7bb63541e3..0c51a7470a 100644 --- a/node/src/main/kotlin/node/internal/Node.kt +++ b/node/src/main/kotlin/com/r3corda/node/internal/Node.kt @@ -1,19 +1,19 @@ -package node.internal +package com.r3corda.node.internal import com.codahale.metrics.JmxReporter import com.google.common.net.HostAndPort -import core.messaging.MessagingService -import core.node.NodeInfo -import core.node.services.ServiceType -import core.utilities.loggerFor -import node.api.APIServer -import node.services.config.NodeConfiguration -import node.services.messaging.ArtemisMessagingService -import node.servlets.AttachmentDownloadServlet -import node.servlets.Config -import node.servlets.DataUploadServlet -import node.servlets.ResponseFilter -import node.utilities.AffinityExecutor +import com.r3corda.core.messaging.MessagingService +import com.r3corda.core.node.NodeInfo +import com.r3corda.core.node.services.ServiceType +import com.r3corda.core.utilities.loggerFor +import com.r3corda.node.api.APIServer +import com.r3corda.node.services.config.NodeConfiguration +import com.r3corda.node.services.messaging.ArtemisMessagingService +import com.r3corda.node.servlets.AttachmentDownloadServlet +import com.r3corda.node.servlets.Config +import com.r3corda.node.servlets.DataUploadServlet +import com.r3corda.node.servlets.ResponseFilter +import com.r3corda.node.utilities.AffinityExecutor import org.eclipse.jetty.server.Server import org.eclipse.jetty.server.handler.HandlerCollection import org.eclipse.jetty.servlet.ServletContextHandler diff --git a/node/src/main/kotlin/node/internal/testing/IRSSimulation.kt b/node/src/main/kotlin/com/r3corda/node/internal/testing/IRSSimulation.kt similarity index 90% rename from node/src/main/kotlin/node/internal/testing/IRSSimulation.kt rename to node/src/main/kotlin/com/r3corda/node/internal/testing/IRSSimulation.kt index fb260dc04a..225f1a5d16 100644 --- a/node/src/main/kotlin/node/internal/testing/IRSSimulation.kt +++ b/node/src/main/kotlin/com/r3corda/node/internal/testing/IRSSimulation.kt @@ -1,23 +1,23 @@ -package node.internal.testing +package com.r3corda.node.internal.testing import com.fasterxml.jackson.module.kotlin.readValue import com.google.common.util.concurrent.FutureCallback import com.google.common.util.concurrent.Futures import com.google.common.util.concurrent.ListenableFuture import com.google.common.util.concurrent.SettableFuture -import contracts.InterestRateSwap -import core.RunOnCallerThread -import core.contracts.SignedTransaction -import core.contracts.StateAndRef -import core.crypto.SecureHash -import core.failure -import core.node.services.linearHeadsOfType -import core.node.services.testing.MockIdentityService -import core.random63BitValue -import core.success -import node.services.network.InMemoryMessagingNetwork -import node.utilities.JsonSupport -import protocols.TwoPartyDealProtocol +import com.r3corda.contracts.InterestRateSwap +import com.r3corda.core.RunOnCallerThread +import com.r3corda.core.contracts.SignedTransaction +import com.r3corda.core.contracts.StateAndRef +import com.r3corda.core.crypto.SecureHash +import com.r3corda.core.failure +import com.r3corda.core.node.services.linearHeadsOfType +import com.r3corda.core.node.services.testing.MockIdentityService +import com.r3corda.core.random63BitValue +import com.r3corda.core.success +import com.r3corda.node.services.network.InMemoryMessagingNetwork +import com.r3corda.node.utilities.JsonSupport +import com.r3corda.protocols.TwoPartyDealProtocol import java.security.KeyPair import java.time.LocalDate import java.util.* diff --git a/node/src/main/kotlin/node/internal/testing/MockNode.kt b/node/src/main/kotlin/com/r3corda/node/internal/testing/MockNode.kt similarity index 90% rename from node/src/main/kotlin/node/internal/testing/MockNode.kt rename to node/src/main/kotlin/com/r3corda/node/internal/testing/MockNode.kt index 897e3bfe59..be3f5d3287 100644 --- a/node/src/main/kotlin/node/internal/testing/MockNode.kt +++ b/node/src/main/kotlin/com/r3corda/node/internal/testing/MockNode.kt @@ -1,22 +1,22 @@ -package node.internal.testing +package com.r3corda.node.internal.testing import com.google.common.jimfs.Configuration import com.google.common.jimfs.Jimfs import com.google.common.util.concurrent.Futures -import core.crypto.Party -import core.messaging.MessagingService -import core.messaging.SingleMessageRecipient -import core.node.NodeInfo -import core.node.PhysicalLocation -import core.node.services.ServiceType -import core.node.services.testing.MockIdentityService -import core.utilities.loggerFor -import node.internal.AbstractNode -import node.services.config.NodeConfiguration -import node.services.network.InMemoryMessagingNetwork -import node.services.network.NetworkMapService -import node.services.transactions.NotaryService -import node.utilities.AffinityExecutor +import com.r3corda.core.crypto.Party +import com.r3corda.core.messaging.MessagingService +import com.r3corda.core.messaging.SingleMessageRecipient +import com.r3corda.core.node.NodeInfo +import com.r3corda.core.node.PhysicalLocation +import com.r3corda.core.node.services.ServiceType +import com.r3corda.core.node.services.testing.MockIdentityService +import com.r3corda.core.utilities.loggerFor +import com.r3corda.node.internal.AbstractNode +import com.r3corda.node.services.config.NodeConfiguration +import com.r3corda.node.services.network.InMemoryMessagingNetwork +import com.r3corda.node.services.network.NetworkMapService +import com.r3corda.node.services.transactions.NotaryService +import com.r3corda.node.utilities.AffinityExecutor import org.slf4j.Logger import java.nio.file.Files import java.nio.file.Path diff --git a/node/src/main/kotlin/node/internal/testing/Simulation.kt b/node/src/main/kotlin/com/r3corda/node/internal/testing/Simulation.kt similarity index 94% rename from node/src/main/kotlin/node/internal/testing/Simulation.kt rename to node/src/main/kotlin/com/r3corda/node/internal/testing/Simulation.kt index d390dd5462..c7339f5dda 100644 --- a/node/src/main/kotlin/node/internal/testing/Simulation.kt +++ b/node/src/main/kotlin/com/r3corda/node/internal/testing/Simulation.kt @@ -1,19 +1,19 @@ -package node.internal.testing +package com.r3corda.node.internal.testing import com.google.common.util.concurrent.Futures import com.google.common.util.concurrent.ListenableFuture -import core.node.CityDatabase -import core.node.NodeInfo -import core.node.PhysicalLocation -import core.node.services.ServiceType -import core.protocols.ProtocolLogic -import core.then -import core.utilities.ProgressTracker -import node.services.transactions.NotaryService -import node.services.clientapi.NodeInterestRates -import node.services.config.NodeConfiguration -import node.services.network.InMemoryMessagingNetwork -import node.services.network.NetworkMapService +import com.r3corda.core.node.CityDatabase +import com.r3corda.core.node.NodeInfo +import com.r3corda.core.node.PhysicalLocation +import com.r3corda.core.node.services.ServiceType +import com.r3corda.core.protocols.ProtocolLogic +import com.r3corda.core.then +import com.r3corda.core.utilities.ProgressTracker +import com.r3corda.node.services.transactions.NotaryService +import com.r3corda.node.services.clientapi.NodeInterestRates +import com.r3corda.node.services.config.NodeConfiguration +import com.r3corda.node.services.network.InMemoryMessagingNetwork +import com.r3corda.node.services.network.NetworkMapService import rx.Observable import rx.subjects.PublishSubject import java.nio.file.Path diff --git a/node/src/main/kotlin/node/internal/testing/TestUtils.kt b/node/src/main/kotlin/com/r3corda/node/internal/testing/TestUtils.kt similarity index 59% rename from node/src/main/kotlin/node/internal/testing/TestUtils.kt rename to node/src/main/kotlin/com/r3corda/node/internal/testing/TestUtils.kt index dc8ef50e23..a2530d602a 100644 --- a/node/src/main/kotlin/node/internal/testing/TestUtils.kt +++ b/node/src/main/kotlin/com/r3corda/node/internal/testing/TestUtils.kt @@ -1,13 +1,13 @@ @file:Suppress("UNUSED_PARAMETER") -package node.testutils +package com.r3corda.node.testutils -import contracts.DummyContract -import core.contracts.StateRef -import core.crypto.Party -import core.testing.DUMMY_NOTARY -import core.testing.DUMMY_NOTARY_KEY -import node.internal.AbstractNode +import com.r3corda.contracts.DummyContract +import com.r3corda.core.contracts.StateRef +import com.r3corda.core.crypto.Party +import com.r3corda.core.testing.DUMMY_NOTARY +import com.r3corda.core.testing.DUMMY_NOTARY_KEY +import com.r3corda.node.internal.AbstractNode import java.util.* fun issueState(node: AbstractNode, notary: Party = DUMMY_NOTARY): StateRef { diff --git a/node/src/main/kotlin/node/internal/testing/TradeSimulation.kt b/node/src/main/kotlin/com/r3corda/node/internal/testing/TradeSimulation.kt similarity index 84% rename from node/src/main/kotlin/node/internal/testing/TradeSimulation.kt rename to node/src/main/kotlin/com/r3corda/node/internal/testing/TradeSimulation.kt index c2def3724d..c8b209db25 100644 --- a/node/src/main/kotlin/node/internal/testing/TradeSimulation.kt +++ b/node/src/main/kotlin/com/r3corda/node/internal/testing/TradeSimulation.kt @@ -1,16 +1,16 @@ -package node.internal.testing +package com.r3corda.node.internal.testing import com.google.common.util.concurrent.Futures import com.google.common.util.concurrent.ListenableFuture -import contracts.CommercialPaper -import core.contracts.DOLLARS -import core.contracts.SignedTransaction -import core.days -import core.random63BitValue -import core.seconds -import node.services.network.InMemoryMessagingNetwork -import node.services.wallet.NodeWalletService -import protocols.TwoPartyTradeProtocol +import com.r3corda.contracts.CommercialPaper +import com.r3corda.core.contracts.DOLLARS +import com.r3corda.core.contracts.SignedTransaction +import com.r3corda.core.days +import com.r3corda.core.random63BitValue +import com.r3corda.core.seconds +import com.r3corda.node.services.network.InMemoryMessagingNetwork +import com.r3corda.node.services.wallet.NodeWalletService +import com.r3corda.protocols.TwoPartyTradeProtocol import java.time.Instant /** diff --git a/node/src/main/kotlin/node/services/api/AbstractNodeService.kt b/node/src/main/kotlin/com/r3corda/node/services/api/AbstractNodeService.kt similarity index 87% rename from node/src/main/kotlin/node/services/api/AbstractNodeService.kt rename to node/src/main/kotlin/com/r3corda/node/services/api/AbstractNodeService.kt index 4e174a8d54..10e0379643 100644 --- a/node/src/main/kotlin/node/services/api/AbstractNodeService.kt +++ b/node/src/main/kotlin/com/r3corda/node/services/api/AbstractNodeService.kt @@ -1,11 +1,11 @@ -package node.services.api +package com.r3corda.node.services.api -import core.messaging.Message -import core.messaging.MessagingService -import core.node.services.TOPIC_DEFAULT_POSTFIX -import core.serialization.deserialize -import core.serialization.serialize -import protocols.AbstractRequestMessage +import com.r3corda.core.messaging.Message +import com.r3corda.core.messaging.MessagingService +import com.r3corda.core.node.services.TOPIC_DEFAULT_POSTFIX +import com.r3corda.core.serialization.deserialize +import com.r3corda.core.serialization.serialize +import com.r3corda.protocols.AbstractRequestMessage import javax.annotation.concurrent.ThreadSafe /** diff --git a/node/src/main/kotlin/node/services/api/AcceptsFileUpload.kt b/node/src/main/kotlin/com/r3corda/node/services/api/AcceptsFileUpload.kt similarity index 94% rename from node/src/main/kotlin/node/services/api/AcceptsFileUpload.kt rename to node/src/main/kotlin/com/r3corda/node/services/api/AcceptsFileUpload.kt index b9507a2c38..df4cdaa93e 100644 --- a/node/src/main/kotlin/node/services/api/AcceptsFileUpload.kt +++ b/node/src/main/kotlin/com/r3corda/node/services/api/AcceptsFileUpload.kt @@ -1,4 +1,4 @@ -package node.services.api +package com.r3corda.node.services.api import java.io.InputStream diff --git a/node/src/main/kotlin/node/services/api/CheckpointStorage.kt b/node/src/main/kotlin/com/r3corda/node/services/api/CheckpointStorage.kt similarity index 87% rename from node/src/main/kotlin/node/services/api/CheckpointStorage.kt rename to node/src/main/kotlin/com/r3corda/node/services/api/CheckpointStorage.kt index 7bf6c56a5b..a4745abc37 100644 --- a/node/src/main/kotlin/node/services/api/CheckpointStorage.kt +++ b/node/src/main/kotlin/com/r3corda/node/services/api/CheckpointStorage.kt @@ -1,8 +1,8 @@ -package node.services.api +package com.r3corda.node.services.api -import core.crypto.sha256 -import core.protocols.ProtocolStateMachine -import core.serialization.SerializedBytes +import com.r3corda.core.crypto.sha256 +import com.r3corda.core.protocols.ProtocolStateMachine +import com.r3corda.core.serialization.SerializedBytes /** * Thread-safe storage of fiber checkpoints. diff --git a/node/src/main/kotlin/node/services/api/MonitoringService.kt b/node/src/main/kotlin/com/r3corda/node/services/api/MonitoringService.kt similarity index 73% rename from node/src/main/kotlin/node/services/api/MonitoringService.kt rename to node/src/main/kotlin/com/r3corda/node/services/api/MonitoringService.kt index 947df40ea9..3b7fd2a2dc 100644 --- a/node/src/main/kotlin/node/services/api/MonitoringService.kt +++ b/node/src/main/kotlin/com/r3corda/node/services/api/MonitoringService.kt @@ -1,4 +1,4 @@ -package node.services.api +package com.r3corda.node.services.api import com.codahale.metrics.MetricRegistry diff --git a/node/src/main/kotlin/node/services/api/RegulatorService.kt b/node/src/main/kotlin/com/r3corda/node/services/api/RegulatorService.kt similarity index 60% rename from node/src/main/kotlin/node/services/api/RegulatorService.kt rename to node/src/main/kotlin/com/r3corda/node/services/api/RegulatorService.kt index 683850260f..12aeb5023f 100644 --- a/node/src/main/kotlin/node/services/api/RegulatorService.kt +++ b/node/src/main/kotlin/com/r3corda/node/services/api/RegulatorService.kt @@ -1,6 +1,6 @@ -package node.services.api +package com.r3corda.node.services.api -import core.node.services.ServiceType +import com.r3corda.core.node.services.ServiceType /** * Placeholder interface for regulator services. diff --git a/node/src/main/kotlin/node/services/api/ServiceHubInternal.kt b/node/src/main/kotlin/com/r3corda/node/services/api/ServiceHubInternal.kt similarity index 53% rename from node/src/main/kotlin/node/services/api/ServiceHubInternal.kt rename to node/src/main/kotlin/com/r3corda/node/services/api/ServiceHubInternal.kt index 4170ff3ea7..169870d120 100644 --- a/node/src/main/kotlin/node/services/api/ServiceHubInternal.kt +++ b/node/src/main/kotlin/com/r3corda/node/services/api/ServiceHubInternal.kt @@ -1,6 +1,6 @@ -package node.services.api +package com.r3corda.node.services.api -import core.node.ServiceHub +import com.r3corda.core.node.ServiceHub interface ServiceHubInternal : ServiceHub { val monitoringService: MonitoringService diff --git a/node/src/main/kotlin/node/services/clientapi/NodeInterestRates.kt b/node/src/main/kotlin/com/r3corda/node/services/clientapi/NodeInterestRates.kt similarity index 93% rename from node/src/main/kotlin/node/services/clientapi/NodeInterestRates.kt rename to node/src/main/kotlin/com/r3corda/node/services/clientapi/NodeInterestRates.kt index 4c76f7b8a4..19f7b9449b 100644 --- a/node/src/main/kotlin/node/services/clientapi/NodeInterestRates.kt +++ b/node/src/main/kotlin/com/r3corda/node/services/clientapi/NodeInterestRates.kt @@ -1,18 +1,18 @@ -package node.services.clientapi +package com.r3corda.node.services.clientapi -import core.contracts.* -import core.crypto.DigitalSignature -import core.crypto.Party -import core.crypto.signWithECDSA -import core.math.CubicSplineInterpolator -import core.math.Interpolator -import core.math.InterpolatorFactory -import core.node.services.ServiceType -import node.internal.AbstractNode -import node.services.api.AbstractNodeService -import node.services.api.AcceptsFileUpload +import com.r3corda.core.contracts.* +import com.r3corda.core.crypto.DigitalSignature +import com.r3corda.core.crypto.Party +import com.r3corda.core.crypto.signWithECDSA +import com.r3corda.core.math.CubicSplineInterpolator +import com.r3corda.core.math.Interpolator +import com.r3corda.core.math.InterpolatorFactory +import com.r3corda.core.node.services.ServiceType +import com.r3corda.node.internal.AbstractNode +import com.r3corda.node.services.api.AbstractNodeService +import com.r3corda.node.services.api.AcceptsFileUpload import org.slf4j.LoggerFactory -import protocols.RatesFixProtocol +import com.r3corda.protocols.RatesFixProtocol import java.io.InputStream import java.math.BigDecimal import java.security.KeyPair diff --git a/node/src/main/kotlin/node/services/config/NodeConfiguration.kt b/node/src/main/kotlin/com/r3corda/node/services/config/NodeConfiguration.kt similarity index 94% rename from node/src/main/kotlin/node/services/config/NodeConfiguration.kt rename to node/src/main/kotlin/com/r3corda/node/services/config/NodeConfiguration.kt index 29086f2ff1..3cd30b29a8 100644 --- a/node/src/main/kotlin/node/services/config/NodeConfiguration.kt +++ b/node/src/main/kotlin/com/r3corda/node/services/config/NodeConfiguration.kt @@ -1,4 +1,4 @@ -package node.services.config +package com.r3corda.node.services.config import com.typesafe.config.Config import com.typesafe.config.ConfigFactory diff --git a/node/src/main/kotlin/node/services/identity/InMemoryIdentityService.kt b/node/src/main/kotlin/com/r3corda/node/services/identity/InMemoryIdentityService.kt similarity index 84% rename from node/src/main/kotlin/node/services/identity/InMemoryIdentityService.kt rename to node/src/main/kotlin/com/r3corda/node/services/identity/InMemoryIdentityService.kt index a7e903074a..d245b9f5b9 100644 --- a/node/src/main/kotlin/node/services/identity/InMemoryIdentityService.kt +++ b/node/src/main/kotlin/com/r3corda/node/services/identity/InMemoryIdentityService.kt @@ -1,7 +1,7 @@ -package node.services.identity +package com.r3corda.node.services.identity -import core.crypto.Party -import core.node.services.IdentityService +import com.r3corda.core.crypto.Party +import com.r3corda.core.node.services.IdentityService import java.security.PublicKey import java.util.concurrent.ConcurrentHashMap import javax.annotation.concurrent.ThreadSafe diff --git a/node/src/main/kotlin/node/services/keys/E2ETestKeyManagementService.kt b/node/src/main/kotlin/com/r3corda/node/services/keys/E2ETestKeyManagementService.kt similarity index 86% rename from node/src/main/kotlin/node/services/keys/E2ETestKeyManagementService.kt rename to node/src/main/kotlin/com/r3corda/node/services/keys/E2ETestKeyManagementService.kt index 8473502023..b3528b4138 100644 --- a/node/src/main/kotlin/node/services/keys/E2ETestKeyManagementService.kt +++ b/node/src/main/kotlin/com/r3corda/node/services/keys/E2ETestKeyManagementService.kt @@ -1,8 +1,8 @@ -package node.services.keys +package com.r3corda.node.services.keys -import core.ThreadBox -import core.crypto.generateKeyPair -import core.node.services.KeyManagementService +import com.r3corda.core.ThreadBox +import com.r3corda.core.crypto.generateKeyPair +import com.r3corda.core.node.services.KeyManagementService import java.security.KeyPair import java.security.PrivateKey import java.security.PublicKey diff --git a/node/src/main/kotlin/node/services/messaging/ArtemisMessagingService.kt b/node/src/main/kotlin/com/r3corda/node/services/messaging/ArtemisMessagingService.kt similarity index 98% rename from node/src/main/kotlin/node/services/messaging/ArtemisMessagingService.kt rename to node/src/main/kotlin/com/r3corda/node/services/messaging/ArtemisMessagingService.kt index ba4da3b8f7..d99485fe91 100644 --- a/node/src/main/kotlin/node/services/messaging/ArtemisMessagingService.kt +++ b/node/src/main/kotlin/com/r3corda/node/services/messaging/ArtemisMessagingService.kt @@ -1,11 +1,11 @@ -package node.services.messaging +package com.r3corda.node.services.messaging import com.google.common.net.HostAndPort -import core.RunOnCallerThread -import core.ThreadBox -import core.messaging.* -import node.internal.Node -import core.utilities.loggerFor +import com.r3corda.core.RunOnCallerThread +import com.r3corda.core.ThreadBox +import com.r3corda.core.messaging.* +import com.r3corda.node.internal.Node +import com.r3corda.core.utilities.loggerFor import org.apache.activemq.artemis.api.core.SimpleString import org.apache.activemq.artemis.api.core.TransportConfiguration import org.apache.activemq.artemis.api.core.client.* diff --git a/node/src/main/kotlin/node/services/network/InMemoryMessagingNetwork.kt b/node/src/main/kotlin/com/r3corda/node/services/network/InMemoryMessagingNetwork.kt similarity index 98% rename from node/src/main/kotlin/node/services/network/InMemoryMessagingNetwork.kt rename to node/src/main/kotlin/com/r3corda/node/services/network/InMemoryMessagingNetwork.kt index b6e9a66894..03192a4b53 100644 --- a/node/src/main/kotlin/node/services/network/InMemoryMessagingNetwork.kt +++ b/node/src/main/kotlin/com/r3corda/node/services/network/InMemoryMessagingNetwork.kt @@ -1,13 +1,13 @@ -package node.services.network +package com.r3corda.node.services.network import com.google.common.util.concurrent.Futures import com.google.common.util.concurrent.ListenableFuture import com.google.common.util.concurrent.MoreExecutors -import core.ThreadBox -import core.crypto.sha256 -import core.messaging.* -import core.utilities.loggerFor -import core.utilities.trace +import com.r3corda.core.ThreadBox +import com.r3corda.core.crypto.sha256 +import com.r3corda.core.messaging.* +import com.r3corda.core.utilities.loggerFor +import com.r3corda.core.utilities.trace import org.slf4j.LoggerFactory import rx.Observable import rx.subjects.PublishSubject diff --git a/node/src/main/kotlin/node/services/network/InMemoryNetworkMapCache.kt b/node/src/main/kotlin/com/r3corda/node/services/network/InMemoryNetworkMapCache.kt similarity index 86% rename from node/src/main/kotlin/node/services/network/InMemoryNetworkMapCache.kt rename to node/src/main/kotlin/com/r3corda/node/services/network/InMemoryNetworkMapCache.kt index 964a44a51a..8fb9f2ae74 100644 --- a/node/src/main/kotlin/node/services/network/InMemoryNetworkMapCache.kt +++ b/node/src/main/kotlin/com/r3corda/node/services/network/InMemoryNetworkMapCache.kt @@ -1,26 +1,26 @@ -package node.services.network +package com.r3corda.node.services.network import com.google.common.util.concurrent.ListenableFuture import com.google.common.util.concurrent.MoreExecutors import com.google.common.util.concurrent.SettableFuture -import core.contracts.Contract -import core.crypto.Party -import core.crypto.SecureHash -import core.messaging.MessagingService -import core.messaging.runOnNextMessage -import core.messaging.send -import core.node.NodeInfo -import core.node.services.NetworkCacheError -import core.node.services.NetworkMapCache -import core.node.services.ServiceType -import core.node.services.TOPIC_DEFAULT_POSTFIX -import core.random63BitValue -import core.serialization.deserialize -import core.serialization.serialize -import node.services.api.RegulatorService -import node.services.clientapi.NodeInterestRates -import node.services.transactions.NotaryService -import node.utilities.AddOrRemove +import com.r3corda.core.contracts.Contract +import com.r3corda.core.crypto.Party +import com.r3corda.core.crypto.SecureHash +import com.r3corda.core.messaging.MessagingService +import com.r3corda.core.messaging.runOnNextMessage +import com.r3corda.core.messaging.send +import com.r3corda.core.node.NodeInfo +import com.r3corda.core.node.services.NetworkCacheError +import com.r3corda.core.node.services.NetworkMapCache +import com.r3corda.core.node.services.ServiceType +import com.r3corda.core.node.services.TOPIC_DEFAULT_POSTFIX +import com.r3corda.core.random63BitValue +import com.r3corda.core.serialization.deserialize +import com.r3corda.core.serialization.serialize +import com.r3corda.node.services.api.RegulatorService +import com.r3corda.node.services.clientapi.NodeInterestRates +import com.r3corda.node.services.transactions.NotaryService +import com.r3corda.node.utilities.AddOrRemove import java.security.PublicKey import java.security.SignatureException import java.util.* diff --git a/node/src/main/kotlin/node/services/network/MockNetworkMapCache.kt b/node/src/main/kotlin/com/r3corda/node/services/network/MockNetworkMapCache.kt similarity index 86% rename from node/src/main/kotlin/node/services/network/MockNetworkMapCache.kt rename to node/src/main/kotlin/com/r3corda/node/services/network/MockNetworkMapCache.kt index 1636f60121..4c9e1751c8 100644 --- a/node/src/main/kotlin/node/services/network/MockNetworkMapCache.kt +++ b/node/src/main/kotlin/com/r3corda/node/services/network/MockNetworkMapCache.kt @@ -5,13 +5,13 @@ * * All other rights reserved. */ -package node.services.network +package com.r3corda.node.services.network import co.paralleluniverse.common.util.VisibleForTesting -import core.crypto.Party -import core.crypto.DummyPublicKey -import core.messaging.SingleMessageRecipient -import core.node.NodeInfo +import com.r3corda.core.crypto.Party +import com.r3corda.core.crypto.DummyPublicKey +import com.r3corda.core.messaging.SingleMessageRecipient +import com.r3corda.core.node.NodeInfo /** * Network map cache with no backing map service. diff --git a/node/src/main/kotlin/node/services/network/NetworkMapService.kt b/node/src/main/kotlin/com/r3corda/node/services/network/NetworkMapService.kt similarity index 94% rename from node/src/main/kotlin/node/services/network/NetworkMapService.kt rename to node/src/main/kotlin/com/r3corda/node/services/network/NetworkMapService.kt index c3028b1503..ede0a51205 100644 --- a/node/src/main/kotlin/node/services/network/NetworkMapService.kt +++ b/node/src/main/kotlin/com/r3corda/node/services/network/NetworkMapService.kt @@ -1,22 +1,22 @@ -package node.services.network +package com.r3corda.node.services.network import co.paralleluniverse.common.util.VisibleForTesting -import core.ThreadBox -import core.crypto.* -import core.messaging.MessageRecipients -import core.messaging.MessagingService -import core.messaging.SingleMessageRecipient -import core.node.NodeInfo -import core.node.services.ServiceType -import core.node.services.NetworkMapCache -import core.node.services.TOPIC_DEFAULT_POSTFIX -import core.serialization.SerializedBytes -import core.serialization.deserialize -import core.serialization.serialize -import node.services.api.AbstractNodeService -import node.utilities.AddOrRemove +import com.r3corda.core.ThreadBox +import com.r3corda.core.crypto.* +import com.r3corda.core.messaging.MessageRecipients +import com.r3corda.core.messaging.MessagingService +import com.r3corda.core.messaging.SingleMessageRecipient +import com.r3corda.core.node.NodeInfo +import com.r3corda.core.node.services.ServiceType +import com.r3corda.core.node.services.NetworkMapCache +import com.r3corda.core.node.services.TOPIC_DEFAULT_POSTFIX +import com.r3corda.core.serialization.SerializedBytes +import com.r3corda.core.serialization.deserialize +import com.r3corda.core.serialization.serialize +import com.r3corda.node.services.api.AbstractNodeService +import com.r3corda.node.utilities.AddOrRemove import org.slf4j.LoggerFactory -import protocols.AbstractRequestMessage +import com.r3corda.protocols.AbstractRequestMessage import java.security.PrivateKey import java.security.SignatureException import java.time.Instant diff --git a/node/src/main/kotlin/node/services/persistence/DataVendingService.kt b/node/src/main/kotlin/com/r3corda/node/services/persistence/DataVendingService.kt similarity index 84% rename from node/src/main/kotlin/node/services/persistence/DataVendingService.kt rename to node/src/main/kotlin/com/r3corda/node/services/persistence/DataVendingService.kt index 5679c910a7..47265b5994 100644 --- a/node/src/main/kotlin/node/services/persistence/DataVendingService.kt +++ b/node/src/main/kotlin/com/r3corda/node/services/persistence/DataVendingService.kt @@ -1,13 +1,13 @@ -package node.services.persistence +package com.r3corda.node.services.persistence -import core.contracts.SignedTransaction -import core.messaging.MessagingService -import core.node.services.StorageService -import node.services.api.AbstractNodeService -import core.utilities.loggerFor -import protocols.FetchAttachmentsProtocol -import protocols.FetchDataProtocol -import protocols.FetchTransactionsProtocol +import com.r3corda.core.contracts.SignedTransaction +import com.r3corda.core.messaging.MessagingService +import com.r3corda.core.node.services.StorageService +import com.r3corda.node.services.api.AbstractNodeService +import com.r3corda.core.utilities.loggerFor +import com.r3corda.protocols.FetchAttachmentsProtocol +import com.r3corda.protocols.FetchDataProtocol +import com.r3corda.protocols.FetchTransactionsProtocol import java.io.InputStream import javax.annotation.concurrent.ThreadSafe diff --git a/node/src/main/kotlin/node/services/persistence/NodeAttachmentService.kt b/node/src/main/kotlin/com/r3corda/node/services/persistence/NodeAttachmentService.kt similarity index 95% rename from node/src/main/kotlin/node/services/persistence/NodeAttachmentService.kt rename to node/src/main/kotlin/com/r3corda/node/services/persistence/NodeAttachmentService.kt index 25882f844d..74c7182fe2 100644 --- a/node/src/main/kotlin/node/services/persistence/NodeAttachmentService.kt +++ b/node/src/main/kotlin/com/r3corda/node/services/persistence/NodeAttachmentService.kt @@ -1,16 +1,16 @@ -package node.services.persistence +package com.r3corda.node.services.persistence import com.codahale.metrics.MetricRegistry 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.contracts.Attachment -import core.crypto.SecureHash -import core.extractZipFile -import node.services.api.AcceptsFileUpload -import core.node.services.AttachmentStorage -import core.utilities.loggerFor +import com.r3corda.core.contracts.Attachment +import com.r3corda.core.crypto.SecureHash +import com.r3corda.core.extractZipFile +import com.r3corda.node.services.api.AcceptsFileUpload +import com.r3corda.core.node.services.AttachmentStorage +import com.r3corda.core.utilities.loggerFor import java.io.FilterInputStream import java.io.InputStream import java.nio.file.FileAlreadyExistsException diff --git a/node/src/main/kotlin/node/services/persistence/PerFileCheckpointStorage.kt b/node/src/main/kotlin/com/r3corda/node/services/persistence/PerFileCheckpointStorage.kt similarity index 85% rename from node/src/main/kotlin/node/services/persistence/PerFileCheckpointStorage.kt rename to node/src/main/kotlin/com/r3corda/node/services/persistence/PerFileCheckpointStorage.kt index 69f3e51a80..1ef9e93ace 100644 --- a/node/src/main/kotlin/node/services/persistence/PerFileCheckpointStorage.kt +++ b/node/src/main/kotlin/com/r3corda/node/services/persistence/PerFileCheckpointStorage.kt @@ -1,12 +1,12 @@ -package node.services.persistence +package com.r3corda.node.services.persistence -import core.serialization.SerializedBytes -import core.serialization.deserialize -import core.serialization.serialize -import core.utilities.loggerFor -import core.utilities.trace -import node.services.api.Checkpoint -import node.services.api.CheckpointStorage +import com.r3corda.core.serialization.SerializedBytes +import com.r3corda.core.serialization.deserialize +import com.r3corda.core.serialization.serialize +import com.r3corda.core.utilities.loggerFor +import com.r3corda.core.utilities.trace +import com.r3corda.node.services.api.Checkpoint +import com.r3corda.node.services.api.CheckpointStorage import java.nio.file.Files import java.nio.file.Path import java.nio.file.StandardCopyOption diff --git a/node/src/main/kotlin/node/services/persistence/StorageServiceImpl.kt b/node/src/main/kotlin/com/r3corda/node/services/persistence/StorageServiceImpl.kt similarity index 80% rename from node/src/main/kotlin/node/services/persistence/StorageServiceImpl.kt rename to node/src/main/kotlin/com/r3corda/node/services/persistence/StorageServiceImpl.kt index 5cdbb3504d..3c81f85ae8 100644 --- a/node/src/main/kotlin/node/services/persistence/StorageServiceImpl.kt +++ b/node/src/main/kotlin/com/r3corda/node/services/persistence/StorageServiceImpl.kt @@ -1,11 +1,11 @@ -package node.services.persistence +package com.r3corda.node.services.persistence -import core.crypto.Party -import core.contracts.SignedTransaction -import core.crypto.SecureHash -import core.node.services.AttachmentStorage -import core.node.services.StorageService -import core.utilities.RecordingMap +import com.r3corda.core.crypto.Party +import com.r3corda.core.contracts.SignedTransaction +import com.r3corda.core.crypto.SecureHash +import com.r3corda.core.node.services.AttachmentStorage +import com.r3corda.core.node.services.StorageService +import com.r3corda.core.utilities.RecordingMap import org.slf4j.LoggerFactory import java.security.KeyPair import java.util.* diff --git a/node/src/main/kotlin/node/services/statemachine/ProtocolStateMachineImpl.kt b/node/src/main/kotlin/com/r3corda/node/services/statemachine/ProtocolStateMachineImpl.kt similarity index 89% rename from node/src/main/kotlin/node/services/statemachine/ProtocolStateMachineImpl.kt rename to node/src/main/kotlin/com/r3corda/node/services/statemachine/ProtocolStateMachineImpl.kt index 741bc3bdaf..3233daf20f 100644 --- a/node/src/main/kotlin/node/services/statemachine/ProtocolStateMachineImpl.kt +++ b/node/src/main/kotlin/com/r3corda/node/services/statemachine/ProtocolStateMachineImpl.kt @@ -1,4 +1,4 @@ -package node.services.statemachine +package com.r3corda.node.services.statemachine import co.paralleluniverse.fibers.Fiber import co.paralleluniverse.fibers.FiberScheduler @@ -6,16 +6,16 @@ import co.paralleluniverse.fibers.Suspendable import co.paralleluniverse.io.serialization.kryo.KryoSerializer import com.google.common.util.concurrent.ListenableFuture import com.google.common.util.concurrent.SettableFuture -import core.messaging.MessageRecipients -import node.services.statemachine.StateMachineManager -import core.node.ServiceHub -import core.protocols.ProtocolLogic -import core.protocols.ProtocolStateMachine -import core.serialization.SerializedBytes -import core.serialization.createKryo -import core.serialization.serialize -import core.utilities.UntrustworthyData -import node.services.api.ServiceHubInternal +import com.r3corda.core.messaging.MessageRecipients +import com.r3corda.node.services.statemachine.StateMachineManager +import com.r3corda.core.node.ServiceHub +import com.r3corda.core.protocols.ProtocolLogic +import com.r3corda.core.protocols.ProtocolStateMachine +import com.r3corda.core.serialization.SerializedBytes +import com.r3corda.core.serialization.createKryo +import com.r3corda.core.serialization.serialize +import com.r3corda.core.utilities.UntrustworthyData +import com.r3corda.node.services.api.ServiceHubInternal import org.slf4j.Logger import org.slf4j.LoggerFactory diff --git a/node/src/main/kotlin/node/services/statemachine/StateMachineManager.kt b/node/src/main/kotlin/com/r3corda/node/services/statemachine/StateMachineManager.kt similarity index 94% rename from node/src/main/kotlin/node/services/statemachine/StateMachineManager.kt rename to node/src/main/kotlin/com/r3corda/node/services/statemachine/StateMachineManager.kt index 90779e679e..506d8a038a 100644 --- a/node/src/main/kotlin/node/services/statemachine/StateMachineManager.kt +++ b/node/src/main/kotlin/com/r3corda/node/services/statemachine/StateMachineManager.kt @@ -1,4 +1,4 @@ -package node.services.statemachine +package com.r3corda.node.services.statemachine import co.paralleluniverse.fibers.Fiber import co.paralleluniverse.fibers.FiberExecutorScheduler @@ -7,22 +7,22 @@ import com.codahale.metrics.Gauge import com.esotericsoftware.kryo.io.Input import com.google.common.base.Throwables import com.google.common.util.concurrent.ListenableFuture -import core.messaging.MessageRecipients -import core.messaging.runOnNextMessage -import core.messaging.send -import core.protocols.ProtocolLogic -import core.protocols.ProtocolStateMachine -import core.serialization.SerializedBytes -import core.serialization.THREAD_LOCAL_KRYO -import core.serialization.createKryo -import core.serialization.deserialize -import core.then -import core.utilities.ProgressTracker -import core.utilities.trace -import node.services.api.Checkpoint -import node.services.api.CheckpointStorage -import node.services.api.ServiceHubInternal -import node.utilities.AffinityExecutor +import com.r3corda.core.messaging.MessageRecipients +import com.r3corda.core.messaging.runOnNextMessage +import com.r3corda.core.messaging.send +import com.r3corda.core.protocols.ProtocolLogic +import com.r3corda.core.protocols.ProtocolStateMachine +import com.r3corda.core.serialization.SerializedBytes +import com.r3corda.core.serialization.THREAD_LOCAL_KRYO +import com.r3corda.core.serialization.createKryo +import com.r3corda.core.serialization.deserialize +import com.r3corda.core.then +import com.r3corda.core.utilities.ProgressTracker +import com.r3corda.core.utilities.trace +import com.r3corda.node.services.api.Checkpoint +import com.r3corda.node.services.api.CheckpointStorage +import com.r3corda.node.services.api.ServiceHubInternal +import com.r3corda.node.utilities.AffinityExecutor import java.io.PrintWriter import java.io.StringWriter import java.util.* diff --git a/node/src/main/kotlin/node/services/transactions/InMemoryUniquenessProvider.kt b/node/src/main/kotlin/com/r3corda/node/services/transactions/InMemoryUniquenessProvider.kt similarity index 80% rename from node/src/main/kotlin/node/services/transactions/InMemoryUniquenessProvider.kt rename to node/src/main/kotlin/com/r3corda/node/services/transactions/InMemoryUniquenessProvider.kt index 6465fbb56b..faa447b7b2 100644 --- a/node/src/main/kotlin/node/services/transactions/InMemoryUniquenessProvider.kt +++ b/node/src/main/kotlin/com/r3corda/node/services/transactions/InMemoryUniquenessProvider.kt @@ -1,11 +1,11 @@ -package node.services.transactions +package com.r3corda.node.services.transactions -import core.ThreadBox -import core.contracts.StateRef -import core.contracts.WireTransaction -import core.crypto.Party -import core.node.services.UniquenessException -import core.node.services.UniquenessProvider +import com.r3corda.core.ThreadBox +import com.r3corda.core.contracts.StateRef +import com.r3corda.core.contracts.WireTransaction +import com.r3corda.core.crypto.Party +import com.r3corda.core.node.services.UniquenessException +import com.r3corda.core.node.services.UniquenessProvider import java.util.* import javax.annotation.concurrent.ThreadSafe diff --git a/node/src/main/kotlin/node/services/transactions/NotaryService.kt b/node/src/main/kotlin/com/r3corda/node/services/transactions/NotaryService.kt similarity index 78% rename from node/src/main/kotlin/node/services/transactions/NotaryService.kt rename to node/src/main/kotlin/com/r3corda/node/services/transactions/NotaryService.kt index ee14955b80..8e9f15d7e2 100644 --- a/node/src/main/kotlin/node/services/transactions/NotaryService.kt +++ b/node/src/main/kotlin/com/r3corda/node/services/transactions/NotaryService.kt @@ -1,24 +1,24 @@ -package node.services.transactions +package com.r3corda.node.services.transactions -import core.contracts.TimestampCommand -import core.contracts.WireTransaction -import core.crypto.DigitalSignature -import core.crypto.Party -import core.crypto.SignedData -import core.crypto.signWithECDSA -import core.messaging.MessagingService -import core.node.services.ServiceType -import core.node.services.UniquenessException -import core.node.services.UniquenessProvider -import core.noneOrSingle -import core.serialization.SerializedBytes -import core.serialization.deserialize -import core.serialization.serialize -import core.utilities.loggerFor -import node.services.api.AbstractNodeService -import protocols.NotaryError -import protocols.NotaryException -import protocols.NotaryProtocol +import com.r3corda.core.contracts.TimestampCommand +import com.r3corda.core.contracts.WireTransaction +import com.r3corda.core.crypto.DigitalSignature +import com.r3corda.core.crypto.Party +import com.r3corda.core.crypto.SignedData +import com.r3corda.core.crypto.signWithECDSA +import com.r3corda.core.messaging.MessagingService +import com.r3corda.core.node.services.ServiceType +import com.r3corda.core.node.services.UniquenessException +import com.r3corda.core.node.services.UniquenessProvider +import com.r3corda.core.noneOrSingle +import com.r3corda.core.serialization.SerializedBytes +import com.r3corda.core.serialization.deserialize +import com.r3corda.core.serialization.serialize +import com.r3corda.core.utilities.loggerFor +import com.r3corda.node.services.api.AbstractNodeService +import com.r3corda.protocols.NotaryError +import com.r3corda.protocols.NotaryException +import com.r3corda.protocols.NotaryProtocol import java.security.KeyPair /** diff --git a/node/src/main/kotlin/node/services/transactions/TimestampChecker.kt b/node/src/main/kotlin/com/r3corda/node/services/transactions/TimestampChecker.kt similarity index 83% rename from node/src/main/kotlin/node/services/transactions/TimestampChecker.kt rename to node/src/main/kotlin/com/r3corda/node/services/transactions/TimestampChecker.kt index ae55b5fde8..861702942e 100644 --- a/node/src/main/kotlin/node/services/transactions/TimestampChecker.kt +++ b/node/src/main/kotlin/com/r3corda/node/services/transactions/TimestampChecker.kt @@ -1,8 +1,8 @@ -package node.services.transactions +package com.r3corda.node.services.transactions -import core.contracts.TimestampCommand -import core.seconds -import core.until +import com.r3corda.core.contracts.TimestampCommand +import com.r3corda.core.seconds +import com.r3corda.core.until import java.time.Clock import java.time.Duration diff --git a/node/src/main/kotlin/node/services/wallet/NodeWalletService.kt b/node/src/main/kotlin/com/r3corda/node/services/wallet/NodeWalletService.kt similarity index 94% rename from node/src/main/kotlin/node/services/wallet/NodeWalletService.kt rename to node/src/main/kotlin/com/r3corda/node/services/wallet/NodeWalletService.kt index f4f6481374..91d59c88b4 100644 --- a/node/src/main/kotlin/node/services/wallet/NodeWalletService.kt +++ b/node/src/main/kotlin/com/r3corda/node/services/wallet/NodeWalletService.kt @@ -1,16 +1,16 @@ -package node.services.wallet +package com.r3corda.node.services.wallet import com.codahale.metrics.Gauge -import contracts.Cash -import core.ThreadBox -import core.contracts.* -import core.crypto.Party -import core.crypto.SecureHash -import core.node.services.Wallet -import core.node.services.WalletService -import core.utilities.loggerFor -import core.utilities.trace -import node.services.api.ServiceHubInternal +import com.r3corda.contracts.Cash +import com.r3corda.core.ThreadBox +import com.r3corda.core.contracts.* +import com.r3corda.core.crypto.Party +import com.r3corda.core.crypto.SecureHash +import com.r3corda.core.node.services.Wallet +import com.r3corda.core.node.services.WalletService +import com.r3corda.core.utilities.loggerFor +import com.r3corda.core.utilities.trace +import com.r3corda.node.services.api.ServiceHubInternal import java.security.PublicKey import java.util.* import javax.annotation.concurrent.ThreadSafe diff --git a/node/src/main/kotlin/node/services/wallet/WalletImpl.kt b/node/src/main/kotlin/com/r3corda/node/services/wallet/WalletImpl.kt similarity index 81% rename from node/src/main/kotlin/node/services/wallet/WalletImpl.kt rename to node/src/main/kotlin/com/r3corda/node/services/wallet/WalletImpl.kt index f5e3b16569..e3d5cb5cec 100644 --- a/node/src/main/kotlin/node/services/wallet/WalletImpl.kt +++ b/node/src/main/kotlin/com/r3corda/node/services/wallet/WalletImpl.kt @@ -1,11 +1,11 @@ -package node.services.wallet +package com.r3corda.node.services.wallet -import contracts.Cash -import core.contracts.Amount -import core.contracts.ContractState -import core.contracts.StateAndRef -import core.contracts.sumOrThrow -import core.node.services.Wallet +import com.r3corda.contracts.Cash +import com.r3corda.core.contracts.Amount +import com.r3corda.core.contracts.ContractState +import com.r3corda.core.contracts.StateAndRef +import com.r3corda.core.contracts.sumOrThrow +import com.r3corda.core.node.services.Wallet import java.util.* /** diff --git a/node/src/main/kotlin/node/servlets/AttachmentDownloadServlet.kt b/node/src/main/kotlin/com/r3corda/node/servlets/AttachmentDownloadServlet.kt similarity index 93% rename from node/src/main/kotlin/node/servlets/AttachmentDownloadServlet.kt rename to node/src/main/kotlin/com/r3corda/node/servlets/AttachmentDownloadServlet.kt index 4b5987239c..cfbef83f31 100644 --- a/node/src/main/kotlin/node/servlets/AttachmentDownloadServlet.kt +++ b/node/src/main/kotlin/com/r3corda/node/servlets/AttachmentDownloadServlet.kt @@ -1,8 +1,8 @@ -package node.servlets +package com.r3corda.node.servlets -import core.crypto.SecureHash -import core.node.services.StorageService -import core.utilities.loggerFor +import com.r3corda.core.crypto.SecureHash +import com.r3corda.core.node.services.StorageService +import com.r3corda.core.utilities.loggerFor import java.io.FileNotFoundException import javax.servlet.http.HttpServlet import javax.servlet.http.HttpServletRequest diff --git a/node/src/main/kotlin/node/servlets/Config.kt b/node/src/main/kotlin/com/r3corda/node/servlets/Config.kt similarity index 81% rename from node/src/main/kotlin/node/servlets/Config.kt rename to node/src/main/kotlin/com/r3corda/node/servlets/Config.kt index 4b5a4285ac..3fb1a37bad 100644 --- a/node/src/main/kotlin/node/servlets/Config.kt +++ b/node/src/main/kotlin/com/r3corda/node/servlets/Config.kt @@ -1,8 +1,8 @@ -package node.servlets +package com.r3corda.node.servlets import com.fasterxml.jackson.databind.ObjectMapper -import core.node.ServiceHub -import node.utilities.JsonSupport +import com.r3corda.core.node.ServiceHub +import com.r3corda.node.utilities.JsonSupport import javax.ws.rs.ext.ContextResolver import javax.ws.rs.ext.Provider diff --git a/node/src/main/kotlin/node/servlets/DataUploadServlet.kt b/node/src/main/kotlin/com/r3corda/node/servlets/DataUploadServlet.kt similarity index 93% rename from node/src/main/kotlin/node/servlets/DataUploadServlet.kt rename to node/src/main/kotlin/com/r3corda/node/servlets/DataUploadServlet.kt index 96efe41e82..e8551d2b98 100644 --- a/node/src/main/kotlin/node/servlets/DataUploadServlet.kt +++ b/node/src/main/kotlin/com/r3corda/node/servlets/DataUploadServlet.kt @@ -1,8 +1,8 @@ -package node.servlets +package com.r3corda.node.servlets -import node.services.api.AcceptsFileUpload -import node.internal.Node -import core.utilities.loggerFor +import com.r3corda.node.services.api.AcceptsFileUpload +import com.r3corda.node.internal.Node +import com.r3corda.core.utilities.loggerFor import org.apache.commons.fileupload.servlet.ServletFileUpload import java.util.* import javax.servlet.http.HttpServlet diff --git a/node/src/main/kotlin/node/servlets/ResponseFilter.kt b/node/src/main/kotlin/com/r3corda/node/servlets/ResponseFilter.kt similarity index 97% rename from node/src/main/kotlin/node/servlets/ResponseFilter.kt rename to node/src/main/kotlin/com/r3corda/node/servlets/ResponseFilter.kt index c0aad621b5..9dbb25413a 100644 --- a/node/src/main/kotlin/node/servlets/ResponseFilter.kt +++ b/node/src/main/kotlin/com/r3corda/node/servlets/ResponseFilter.kt @@ -1,4 +1,4 @@ -package node.servlets +package com.r3corda.node.servlets import javax.ws.rs.container.ContainerRequestContext import javax.ws.rs.container.ContainerResponseContext diff --git a/node/src/main/kotlin/node/utilities/ANSIProgressRenderer.kt b/node/src/main/kotlin/com/r3corda/node/utilities/ANSIProgressRenderer.kt similarity index 96% rename from node/src/main/kotlin/node/utilities/ANSIProgressRenderer.kt rename to node/src/main/kotlin/com/r3corda/node/utilities/ANSIProgressRenderer.kt index 5c4d182b4f..5d51ffe4c7 100644 --- a/node/src/main/kotlin/node/utilities/ANSIProgressRenderer.kt +++ b/node/src/main/kotlin/com/r3corda/node/utilities/ANSIProgressRenderer.kt @@ -1,8 +1,8 @@ -package node.utilities +package com.r3corda.node.utilities -import core.utilities.BriefLogFormatter -import core.utilities.Emoji -import core.utilities.ProgressTracker +import com.r3corda.core.utilities.BriefLogFormatter +import com.r3corda.core.utilities.Emoji +import com.r3corda.core.utilities.ProgressTracker import org.fusesource.jansi.Ansi import org.fusesource.jansi.AnsiConsole import org.fusesource.jansi.AnsiOutputStream diff --git a/node/src/main/kotlin/node/utilities/AddOrRemove.kt b/node/src/main/kotlin/com/r3corda/node/utilities/AddOrRemove.kt similarity index 81% rename from node/src/main/kotlin/node/utilities/AddOrRemove.kt rename to node/src/main/kotlin/com/r3corda/node/utilities/AddOrRemove.kt index 8ac1c1c9be..a400ae2091 100644 --- a/node/src/main/kotlin/node/utilities/AddOrRemove.kt +++ b/node/src/main/kotlin/com/r3corda/node/utilities/AddOrRemove.kt @@ -1,4 +1,4 @@ -package node.utilities +package com.r3corda.node.utilities /** * Enum for when adding/removing something, for example adding or removing an entry in a directory. diff --git a/node/src/main/kotlin/node/utilities/AffinityExecutor.kt b/node/src/main/kotlin/com/r3corda/node/utilities/AffinityExecutor.kt similarity index 98% rename from node/src/main/kotlin/node/utilities/AffinityExecutor.kt rename to node/src/main/kotlin/com/r3corda/node/utilities/AffinityExecutor.kt index bec6aafb87..d1141acfbb 100644 --- a/node/src/main/kotlin/node/utilities/AffinityExecutor.kt +++ b/node/src/main/kotlin/com/r3corda/node/utilities/AffinityExecutor.kt @@ -1,7 +1,7 @@ -package node.utilities +package com.r3corda.node.utilities import com.google.common.util.concurrent.Uninterruptibles -import core.utilities.loggerFor +import com.r3corda.core.utilities.loggerFor import java.util.* import java.util.concurrent.* import java.util.function.Supplier diff --git a/node/src/main/kotlin/node/utilities/JsonSupport.kt b/node/src/main/kotlin/com/r3corda/node/utilities/JsonSupport.kt similarity index 96% rename from node/src/main/kotlin/node/utilities/JsonSupport.kt rename to node/src/main/kotlin/com/r3corda/node/utilities/JsonSupport.kt index 17b0cf0eec..e9e14c35bc 100644 --- a/node/src/main/kotlin/node/utilities/JsonSupport.kt +++ b/node/src/main/kotlin/com/r3corda/node/utilities/JsonSupport.kt @@ -1,4 +1,4 @@ -package node.utilities +package com.r3corda.node.utilities import com.fasterxml.jackson.core.JsonGenerator import com.fasterxml.jackson.core.JsonParseException @@ -9,10 +9,10 @@ import com.fasterxml.jackson.databind.deser.std.NumberDeserializers import com.fasterxml.jackson.databind.deser.std.StringArrayDeserializer import com.fasterxml.jackson.databind.module.SimpleModule import com.fasterxml.jackson.module.kotlin.KotlinModule -import core.contracts.BusinessCalendar -import core.crypto.Party -import core.crypto.SecureHash -import core.node.services.IdentityService +import com.r3corda.core.contracts.BusinessCalendar +import com.r3corda.core.crypto.Party +import com.r3corda.core.crypto.SecureHash +import com.r3corda.core.node.services.IdentityService import java.math.BigDecimal import java.time.LocalDate import java.time.LocalDateTime diff --git a/node/src/main/resources/node/internal/testing/example.rates.txt b/node/src/main/resources/com/r3corda/node/internal/testing/example.rates.txt similarity index 100% rename from node/src/main/resources/node/internal/testing/example.rates.txt rename to node/src/main/resources/com/r3corda/node/internal/testing/example.rates.txt diff --git a/node/src/main/resources/node/internal/testing/trade.json b/node/src/main/resources/com/r3corda/node/internal/testing/trade.json similarity index 100% rename from node/src/main/resources/node/internal/testing/trade.json rename to node/src/main/resources/com/r3corda/node/internal/testing/trade.json diff --git a/node/src/test/kotlin/node/messaging/AttachmentTests.kt b/node/src/test/kotlin/com/r3corda/node/messaging/AttachmentTests.kt similarity index 83% rename from node/src/test/kotlin/node/messaging/AttachmentTests.kt rename to node/src/test/kotlin/com/r3corda/node/messaging/AttachmentTests.kt index be1d2dd8c6..368573e24d 100644 --- a/node/src/test/kotlin/node/messaging/AttachmentTests.kt +++ b/node/src/test/kotlin/com/r3corda/node/messaging/AttachmentTests.kt @@ -1,22 +1,22 @@ -package node.messaging +package com.r3corda.node.messaging -import core.contracts.Attachment -import core.crypto.SecureHash -import core.crypto.sha256 -import core.node.NodeInfo -import core.node.services.ServiceType -import core.serialization.OpaqueBytes -import core.testing.rootCauseExceptions -import core.utilities.BriefLogFormatter -import node.internal.testing.MockNetwork -import node.services.config.NodeConfiguration -import node.services.network.NetworkMapService -import node.services.persistence.NodeAttachmentService -import node.services.transactions.NotaryService +import com.r3corda.core.contracts.Attachment +import com.r3corda.core.crypto.SecureHash +import com.r3corda.core.crypto.sha256 +import com.r3corda.core.node.NodeInfo +import com.r3corda.core.node.services.ServiceType +import com.r3corda.core.serialization.OpaqueBytes +import com.r3corda.core.testing.rootCauseExceptions +import com.r3corda.core.utilities.BriefLogFormatter +import com.r3corda.node.internal.testing.MockNetwork +import com.r3corda.node.services.config.NodeConfiguration +import com.r3corda.node.services.network.NetworkMapService +import com.r3corda.node.services.persistence.NodeAttachmentService +import com.r3corda.node.services.transactions.NotaryService import org.junit.Before import org.junit.Test -import protocols.FetchAttachmentsProtocol -import protocols.FetchDataProtocol +import com.r3corda.protocols.FetchAttachmentsProtocol +import com.r3corda.protocols.FetchDataProtocol import java.io.ByteArrayInputStream import java.io.ByteArrayOutputStream import java.nio.ByteBuffer diff --git a/node/src/test/kotlin/node/messaging/InMemoryMessagingTests.kt b/node/src/test/kotlin/com/r3corda/node/messaging/InMemoryMessagingTests.kt similarity index 93% rename from node/src/test/kotlin/node/messaging/InMemoryMessagingTests.kt rename to node/src/test/kotlin/com/r3corda/node/messaging/InMemoryMessagingTests.kt index 0c91995f74..70c15f1d61 100644 --- a/node/src/test/kotlin/node/messaging/InMemoryMessagingTests.kt +++ b/node/src/test/kotlin/com/r3corda/node/messaging/InMemoryMessagingTests.kt @@ -1,12 +1,12 @@ @file:Suppress("UNUSED_VARIABLE") -package node.messaging +package com.r3corda.node.messaging -import core.messaging.Message -import core.messaging.TopicStringValidator -import core.messaging.send -import core.serialization.deserialize -import node.internal.testing.MockNetwork +import com.r3corda.core.messaging.Message +import com.r3corda.core.messaging.TopicStringValidator +import com.r3corda.core.messaging.send +import com.r3corda.core.serialization.deserialize +import com.r3corda.node.internal.testing.MockNetwork import org.junit.Before import org.junit.Test import java.util.* diff --git a/node/src/test/kotlin/node/messaging/TwoPartyTradeProtocolTests.kt b/node/src/test/kotlin/com/r3corda/node/messaging/TwoPartyTradeProtocolTests.kt similarity index 93% rename from node/src/test/kotlin/node/messaging/TwoPartyTradeProtocolTests.kt rename to node/src/test/kotlin/com/r3corda/node/messaging/TwoPartyTradeProtocolTests.kt index a8e483ee20..179f706a25 100644 --- a/node/src/test/kotlin/node/messaging/TwoPartyTradeProtocolTests.kt +++ b/node/src/test/kotlin/com/r3corda/node/messaging/TwoPartyTradeProtocolTests.kt @@ -1,38 +1,38 @@ -package node.messaging +package com.r3corda.node.messaging import com.google.common.util.concurrent.ListenableFuture -import contracts.Cash -import contracts.CommercialPaper -import contracts.testing.CASH -import contracts.testing.`issued by` -import contracts.testing.`owned by` -import core.contracts.* -import core.crypto.Party -import core.crypto.SecureHash -import core.days -import core.messaging.SingleMessageRecipient -import core.node.NodeInfo -import core.node.ServiceHub -import core.node.services.ServiceType -import core.node.services.Wallet -import core.random63BitValue -import core.seconds -import core.testing.* -import core.utilities.BriefLogFormatter -import core.utilities.RecordingMap -import node.internal.testing.MockNetwork -import node.services.config.NodeConfiguration -import node.services.network.InMemoryMessagingNetwork -import node.services.persistence.NodeAttachmentService -import node.services.persistence.StorageServiceImpl -import node.services.statemachine.StateMachineManager -import node.services.wallet.NodeWalletService -import node.services.wallet.WalletImpl +import com.r3corda.contracts.Cash +import com.r3corda.contracts.CommercialPaper +import com.r3corda.contracts.testing.CASH +import com.r3corda.contracts.testing.`issued by` +import com.r3corda.contracts.testing.`owned by` +import com.r3corda.core.contracts.* +import com.r3corda.core.crypto.Party +import com.r3corda.core.crypto.SecureHash +import com.r3corda.core.days +import com.r3corda.core.messaging.SingleMessageRecipient +import com.r3corda.core.node.NodeInfo +import com.r3corda.core.node.ServiceHub +import com.r3corda.core.node.services.ServiceType +import com.r3corda.core.node.services.Wallet +import com.r3corda.core.random63BitValue +import com.r3corda.core.seconds +import com.r3corda.core.testing.* +import com.r3corda.core.utilities.BriefLogFormatter +import com.r3corda.core.utilities.RecordingMap +import com.r3corda.node.internal.testing.MockNetwork +import com.r3corda.node.services.config.NodeConfiguration +import com.r3corda.node.services.network.InMemoryMessagingNetwork +import com.r3corda.node.services.persistence.NodeAttachmentService +import com.r3corda.node.services.persistence.StorageServiceImpl +import com.r3corda.node.services.statemachine.StateMachineManager +import com.r3corda.node.services.wallet.NodeWalletService +import com.r3corda.node.services.wallet.WalletImpl import org.assertj.core.api.Assertions.assertThat import org.junit.After import org.junit.Before import org.junit.Test -import protocols.TwoPartyTradeProtocol +import com.r3corda.protocols.TwoPartyTradeProtocol import java.io.ByteArrayInputStream import java.io.ByteArrayOutputStream import java.nio.file.Path @@ -132,7 +132,7 @@ class TwoPartyTradeProtocolTests { @Test fun `shutdown and restore`() { - core.testing.transactionGroupFor { + transactionGroupFor { val notaryNode = net.createNotaryNode(DUMMY_NOTARY.name, DUMMY_NOTARY_KEY) val aliceNode = net.createPartyNode(notaryNode.info, ALICE.name, ALICE_KEY) var bobNode = net.createPartyNode(notaryNode.info, BOB.name, BOB_KEY) diff --git a/node/src/test/kotlin/node/services/ArtemisMessagingServiceTests.kt b/node/src/test/kotlin/com/r3corda/node/services/ArtemisMessagingServiceTests.kt similarity index 84% rename from node/src/test/kotlin/node/services/ArtemisMessagingServiceTests.kt rename to node/src/test/kotlin/com/r3corda/node/services/ArtemisMessagingServiceTests.kt index cfdb13c45e..25eb9d69f9 100644 --- a/node/src/test/kotlin/node/services/ArtemisMessagingServiceTests.kt +++ b/node/src/test/kotlin/com/r3corda/node/services/ArtemisMessagingServiceTests.kt @@ -1,9 +1,9 @@ -package node.services +package com.r3corda.node.services -import core.messaging.Message -import core.messaging.MessageRecipients -import core.testing.freeLocalHostAndPort -import node.services.messaging.ArtemisMessagingService +import com.r3corda.core.messaging.Message +import com.r3corda.core.messaging.MessageRecipients +import com.r3corda.core.testing.freeLocalHostAndPort +import com.r3corda.node.services.messaging.ArtemisMessagingService import org.assertj.core.api.Assertions.assertThat import org.junit.After import org.junit.Before diff --git a/node/src/test/kotlin/node/services/InMemoryNetworkMapCacheTest.kt b/node/src/test/kotlin/com/r3corda/node/services/InMemoryNetworkMapCacheTest.kt similarity index 83% rename from node/src/test/kotlin/node/services/InMemoryNetworkMapCacheTest.kt rename to node/src/test/kotlin/com/r3corda/node/services/InMemoryNetworkMapCacheTest.kt index fdf5e2da47..f1f5d9f238 100644 --- a/node/src/test/kotlin/node/services/InMemoryNetworkMapCacheTest.kt +++ b/node/src/test/kotlin/com/r3corda/node/services/InMemoryNetworkMapCacheTest.kt @@ -1,6 +1,6 @@ -package node.services +package com.r3corda.node.services -import node.internal.testing.MockNetwork +import com.r3corda.node.internal.testing.MockNetwork import org.junit.Before import org.junit.Test diff --git a/node/src/test/kotlin/node/services/InMemoryNetworkMapServiceTest.kt b/node/src/test/kotlin/com/r3corda/node/services/InMemoryNetworkMapServiceTest.kt similarity index 94% rename from node/src/test/kotlin/node/services/InMemoryNetworkMapServiceTest.kt rename to node/src/test/kotlin/com/r3corda/node/services/InMemoryNetworkMapServiceTest.kt index 5773ac0add..cbfabb5bfe 100644 --- a/node/src/test/kotlin/node/services/InMemoryNetworkMapServiceTest.kt +++ b/node/src/test/kotlin/com/r3corda/node/services/InMemoryNetworkMapServiceTest.kt @@ -1,16 +1,16 @@ -package node.services +package com.r3corda.node.services import co.paralleluniverse.fibers.Suspendable -import core.crypto.SecureHash -import core.node.NodeInfo -import core.protocols.ProtocolLogic -import core.random63BitValue -import core.utilities.BriefLogFormatter -import node.internal.testing.MockNetwork -import node.services.network.InMemoryNetworkMapService -import node.services.network.NetworkMapService -import node.services.network.NodeRegistration -import node.utilities.AddOrRemove +import com.r3corda.core.crypto.SecureHash +import com.r3corda.core.node.NodeInfo +import com.r3corda.core.protocols.ProtocolLogic +import com.r3corda.core.random63BitValue +import com.r3corda.core.utilities.BriefLogFormatter +import com.r3corda.node.internal.testing.MockNetwork +import com.r3corda.node.services.network.InMemoryNetworkMapService +import com.r3corda.node.services.network.NetworkMapService +import com.r3corda.node.services.network.NodeRegistration +import com.r3corda.node.utilities.AddOrRemove import org.junit.Before import org.junit.Test import java.security.PrivateKey diff --git a/node/src/test/kotlin/node/services/MockServices.kt b/node/src/test/kotlin/com/r3corda/node/services/MockServices.kt similarity index 76% rename from node/src/test/kotlin/node/services/MockServices.kt rename to node/src/test/kotlin/com/r3corda/node/services/MockServices.kt index 5d79b5f7ad..bc24e12c91 100644 --- a/node/src/test/kotlin/node/services/MockServices.kt +++ b/node/src/test/kotlin/com/r3corda/node/services/MockServices.kt @@ -1,18 +1,18 @@ -package node.services +package com.r3corda.node.services import com.codahale.metrics.MetricRegistry -import core.messaging.MessagingService -import core.node.services.* -import core.node.services.testing.MockStorageService -import core.testing.MOCK_IDENTITY_SERVICE -import node.services.api.Checkpoint -import node.services.api.CheckpointStorage -import node.services.api.MonitoringService -import node.services.api.ServiceHubInternal -import node.services.network.MockNetworkMapCache -import node.services.network.NetworkMapService -import node.services.persistence.DataVendingService -import node.services.wallet.NodeWalletService +import com.r3corda.core.messaging.MessagingService +import com.r3corda.core.node.services.* +import com.r3corda.core.node.services.testing.MockStorageService +import com.r3corda.core.testing.MOCK_IDENTITY_SERVICE +import com.r3corda.node.services.api.Checkpoint +import com.r3corda.node.services.api.CheckpointStorage +import com.r3corda.node.services.api.MonitoringService +import com.r3corda.node.services.api.ServiceHubInternal +import com.r3corda.node.services.network.MockNetworkMapCache +import com.r3corda.node.services.network.NetworkMapService +import com.r3corda.node.services.persistence.DataVendingService +import com.r3corda.node.services.wallet.NodeWalletService import java.time.Clock import java.util.concurrent.ConcurrentLinkedQueue diff --git a/node/src/test/kotlin/node/services/NodeAttachmentStorageTest.kt b/node/src/test/kotlin/com/r3corda/node/services/NodeAttachmentStorageTest.kt similarity index 95% rename from node/src/test/kotlin/node/services/NodeAttachmentStorageTest.kt rename to node/src/test/kotlin/com/r3corda/node/services/NodeAttachmentStorageTest.kt index 12a05affb6..45e06a6049 100644 --- a/node/src/test/kotlin/node/services/NodeAttachmentStorageTest.kt +++ b/node/src/test/kotlin/com/r3corda/node/services/NodeAttachmentStorageTest.kt @@ -1,11 +1,11 @@ -package node.services +package com.r3corda.node.services import com.codahale.metrics.MetricRegistry import com.google.common.jimfs.Configuration import com.google.common.jimfs.Jimfs -import core.crypto.SecureHash -import core.use -import node.services.persistence.NodeAttachmentService +import com.r3corda.core.crypto.SecureHash +import com.r3corda.core.use +import com.r3corda.node.services.persistence.NodeAttachmentService import org.junit.Before import org.junit.Test import java.nio.charset.Charset diff --git a/node/src/test/kotlin/node/services/NodeInterestRatesTest.kt b/node/src/test/kotlin/com/r3corda/node/services/NodeInterestRatesTest.kt similarity index 85% rename from node/src/test/kotlin/node/services/NodeInterestRatesTest.kt rename to node/src/test/kotlin/com/r3corda/node/services/NodeInterestRatesTest.kt index 59592f03c4..fdcc3fa3a1 100644 --- a/node/src/test/kotlin/node/services/NodeInterestRatesTest.kt +++ b/node/src/test/kotlin/com/r3corda/node/services/NodeInterestRatesTest.kt @@ -1,21 +1,21 @@ -package node.services +package com.r3corda.node.services -import contracts.Cash -import contracts.testing.CASH -import contracts.testing.`owned by` -import core.bd -import core.contracts.DOLLARS -import core.contracts.Fix -import core.contracts.TransactionBuilder -import core.testing.ALICE_PUBKEY -import core.testing.MEGA_CORP -import core.testing.MEGA_CORP_KEY -import core.utilities.BriefLogFormatter -import node.internal.testing.MockNetwork -import node.services.clientapi.NodeInterestRates +import com.r3corda.contracts.Cash +import com.r3corda.contracts.testing.CASH +import com.r3corda.contracts.testing.`owned by` +import com.r3corda.core.bd +import com.r3corda.core.contracts.DOLLARS +import com.r3corda.core.contracts.Fix +import com.r3corda.core.contracts.TransactionBuilder +import com.r3corda.core.testing.ALICE_PUBKEY +import com.r3corda.core.testing.MEGA_CORP +import com.r3corda.core.testing.MEGA_CORP_KEY +import com.r3corda.core.utilities.BriefLogFormatter +import com.r3corda.node.internal.testing.MockNetwork +import com.r3corda.node.services.clientapi.NodeInterestRates import org.junit.Assert import org.junit.Test -import protocols.RatesFixProtocol +import com.r3corda.protocols.RatesFixProtocol import kotlin.test.assertEquals import kotlin.test.assertFailsWith diff --git a/node/src/test/kotlin/node/services/NodeWalletServiceTest.kt b/node/src/test/kotlin/com/r3corda/node/services/NodeWalletServiceTest.kt similarity index 83% rename from node/src/test/kotlin/node/services/NodeWalletServiceTest.kt rename to node/src/test/kotlin/com/r3corda/node/services/NodeWalletServiceTest.kt index 5fd18651d8..bd4f3c7130 100644 --- a/node/src/test/kotlin/node/services/NodeWalletServiceTest.kt +++ b/node/src/test/kotlin/com/r3corda/node/services/NodeWalletServiceTest.kt @@ -1,16 +1,16 @@ -package node.services +package com.r3corda.node.services -import contracts.Cash -import core.contracts.DOLLARS -import core.contracts.TransactionBuilder -import core.contracts.USD -import core.contracts.verifyToLedgerTransaction -import core.node.ServiceHub -import core.node.services.testing.MockKeyManagementService -import core.node.services.testing.MockStorageService -import core.testing.* -import core.utilities.BriefLogFormatter -import node.services.wallet.NodeWalletService +import com.r3corda.contracts.Cash +import com.r3corda.core.contracts.DOLLARS +import com.r3corda.core.contracts.TransactionBuilder +import com.r3corda.core.contracts.USD +import com.r3corda.core.contracts.verifyToLedgerTransaction +import com.r3corda.core.node.ServiceHub +import com.r3corda.core.node.services.testing.MockKeyManagementService +import com.r3corda.core.node.services.testing.MockStorageService +import com.r3corda.core.testing.* +import com.r3corda.core.utilities.BriefLogFormatter +import com.r3corda.node.services.wallet.NodeWalletService import org.junit.After import org.junit.Before import org.junit.Test diff --git a/node/src/test/kotlin/node/services/NotaryServiceTests.kt b/node/src/test/kotlin/com/r3corda/node/services/NotaryServiceTests.kt similarity index 87% rename from node/src/test/kotlin/node/services/NotaryServiceTests.kt rename to node/src/test/kotlin/com/r3corda/node/services/NotaryServiceTests.kt index 68a84f1cb3..42cba98407 100644 --- a/node/src/test/kotlin/node/services/NotaryServiceTests.kt +++ b/node/src/test/kotlin/com/r3corda/node/services/NotaryServiceTests.kt @@ -1,16 +1,16 @@ -package node.services +package com.r3corda.node.services -import core.contracts.TransactionBuilder -import core.seconds -import core.testing.DUMMY_NOTARY -import core.testing.DUMMY_NOTARY_KEY -import node.internal.testing.MockNetwork -import node.testutils.issueState +import com.r3corda.core.contracts.TransactionBuilder +import com.r3corda.core.seconds +import com.r3corda.core.testing.DUMMY_NOTARY +import com.r3corda.core.testing.DUMMY_NOTARY_KEY +import com.r3corda.node.internal.testing.MockNetwork +import com.r3corda.node.testutils.issueState import org.junit.Before import org.junit.Test -import protocols.NotaryError -import protocols.NotaryException -import protocols.NotaryProtocol +import com.r3corda.protocols.NotaryError +import com.r3corda.protocols.NotaryException +import com.r3corda.protocols.NotaryProtocol import java.time.Instant import java.util.concurrent.ExecutionException import kotlin.test.assertEquals diff --git a/node/src/test/kotlin/node/services/PerFileCheckpointStorageTests.kt b/node/src/test/kotlin/com/r3corda/node/services/PerFileCheckpointStorageTests.kt similarity index 94% rename from node/src/test/kotlin/node/services/PerFileCheckpointStorageTests.kt rename to node/src/test/kotlin/com/r3corda/node/services/PerFileCheckpointStorageTests.kt index 4c3aa9ca1d..4bf122c9aa 100644 --- a/node/src/test/kotlin/node/services/PerFileCheckpointStorageTests.kt +++ b/node/src/test/kotlin/com/r3corda/node/services/PerFileCheckpointStorageTests.kt @@ -1,11 +1,11 @@ -package node.services +package com.r3corda.node.services import com.google.common.jimfs.Configuration.unix import com.google.common.jimfs.Jimfs import com.google.common.primitives.Ints -import core.serialization.SerializedBytes -import node.services.api.Checkpoint -import node.services.persistence.PerFileCheckpointStorage +import com.r3corda.core.serialization.SerializedBytes +import com.r3corda.node.services.api.Checkpoint +import com.r3corda.node.services.persistence.PerFileCheckpointStorage import org.assertj.core.api.Assertions.assertThat import org.assertj.core.api.Assertions.assertThatExceptionOfType import org.junit.After diff --git a/node/src/test/kotlin/node/services/TimestampCheckerTests.kt b/node/src/test/kotlin/com/r3corda/node/services/TimestampCheckerTests.kt similarity index 86% rename from node/src/test/kotlin/node/services/TimestampCheckerTests.kt rename to node/src/test/kotlin/com/r3corda/node/services/TimestampCheckerTests.kt index aefcc6ce86..0d59ed5707 100644 --- a/node/src/test/kotlin/node/services/TimestampCheckerTests.kt +++ b/node/src/test/kotlin/com/r3corda/node/services/TimestampCheckerTests.kt @@ -1,8 +1,8 @@ -package node.services +package com.r3corda.node.services -import core.contracts.TimestampCommand -import core.seconds -import node.services.transactions.TimestampChecker +import com.r3corda.core.contracts.TimestampCommand +import com.r3corda.core.seconds +import com.r3corda.node.services.transactions.TimestampChecker import org.junit.Test import java.time.Clock import java.time.Instant diff --git a/node/src/test/kotlin/node/services/UniquenessProviderTests.kt b/node/src/test/kotlin/com/r3corda/node/services/UniquenessProviderTests.kt similarity index 79% rename from node/src/test/kotlin/node/services/UniquenessProviderTests.kt rename to node/src/test/kotlin/com/r3corda/node/services/UniquenessProviderTests.kt index 19c31c2fde..f7b76fbc32 100644 --- a/node/src/test/kotlin/node/services/UniquenessProviderTests.kt +++ b/node/src/test/kotlin/com/r3corda/node/services/UniquenessProviderTests.kt @@ -1,10 +1,10 @@ -package node.services +package com.r3corda.node.services -import core.contracts.TransactionBuilder -import core.node.services.UniquenessException -import core.testing.MEGA_CORP -import core.testing.generateStateRef -import node.services.transactions.InMemoryUniquenessProvider +import com.r3corda.core.contracts.TransactionBuilder +import com.r3corda.core.node.services.UniquenessException +import com.r3corda.core.testing.MEGA_CORP +import com.r3corda.core.testing.generateStateRef +import com.r3corda.node.services.transactions.InMemoryUniquenessProvider import org.junit.Test import kotlin.test.assertEquals import kotlin.test.assertFailsWith diff --git a/node/src/test/kotlin/node/utilities/AffinityExecutorTests.kt b/node/src/test/kotlin/com/r3corda/node/utilities/AffinityExecutorTests.kt similarity index 98% rename from node/src/test/kotlin/node/utilities/AffinityExecutorTests.kt rename to node/src/test/kotlin/com/r3corda/node/utilities/AffinityExecutorTests.kt index 86b95d3bc7..1cbdef3e83 100644 --- a/node/src/test/kotlin/node/utilities/AffinityExecutorTests.kt +++ b/node/src/test/kotlin/com/r3corda/node/utilities/AffinityExecutorTests.kt @@ -1,4 +1,4 @@ -package node.utilities +package com.r3corda.node.utilities import org.junit.After import org.junit.Test diff --git a/node/src/test/kotlin/node/visualiser/GraphStream.kt b/node/src/test/kotlin/com/r3corda/node/visualiser/GraphStream.kt similarity index 98% rename from node/src/test/kotlin/node/visualiser/GraphStream.kt rename to node/src/test/kotlin/com/r3corda/node/visualiser/GraphStream.kt index dc0e20d7c5..d05674ad2a 100644 --- a/node/src/test/kotlin/node/visualiser/GraphStream.kt +++ b/node/src/test/kotlin/com/r3corda/node/visualiser/GraphStream.kt @@ -1,4 +1,4 @@ -package node.visualiser +package com.r3corda.node.visualiser import org.graphstream.graph.Edge import org.graphstream.graph.Element diff --git a/node/src/test/kotlin/node/visualiser/GroupToGraphConversion.kt b/node/src/test/kotlin/com/r3corda/node/visualiser/GroupToGraphConversion.kt similarity index 93% rename from node/src/test/kotlin/node/visualiser/GroupToGraphConversion.kt rename to node/src/test/kotlin/com/r3corda/node/visualiser/GroupToGraphConversion.kt index b5266d4858..a36aa7731b 100644 --- a/node/src/test/kotlin/node/visualiser/GroupToGraphConversion.kt +++ b/node/src/test/kotlin/com/r3corda/node/visualiser/GroupToGraphConversion.kt @@ -1,9 +1,9 @@ -package node.visualiser +package com.r3corda.node.visualiser -import core.contracts.CommandData -import core.contracts.ContractState -import core.crypto.SecureHash -import core.testing.TransactionGroupDSL +import com.r3corda.core.contracts.CommandData +import com.r3corda.core.contracts.ContractState +import com.r3corda.core.crypto.SecureHash +import com.r3corda.core.testing.TransactionGroupDSL import org.graphstream.graph.Edge import org.graphstream.graph.Node import org.graphstream.graph.implementations.SingleGraph diff --git a/node/src/test/kotlin/node/visualiser/StateViewer.form b/node/src/test/kotlin/com/r3corda/node/visualiser/StateViewer.form similarity index 95% rename from node/src/test/kotlin/node/visualiser/StateViewer.form rename to node/src/test/kotlin/com/r3corda/node/visualiser/StateViewer.form index 5d7749fa50..339613e8f5 100644 --- a/node/src/test/kotlin/node/visualiser/StateViewer.form +++ b/node/src/test/kotlin/com/r3corda/node/visualiser/StateViewer.form @@ -1,5 +1,5 @@ -
+ diff --git a/node/src/test/kotlin/node/visualiser/StateViewer.java b/node/src/test/kotlin/com/r3corda/node/visualiser/StateViewer.java similarity index 98% rename from node/src/test/kotlin/node/visualiser/StateViewer.java rename to node/src/test/kotlin/com/r3corda/node/visualiser/StateViewer.java index eedf90a779..0418197742 100644 --- a/node/src/test/kotlin/node/visualiser/StateViewer.java +++ b/node/src/test/kotlin/com/r3corda/node/visualiser/StateViewer.java @@ -1,4 +1,4 @@ -package node.visualiser; +package com.r3corda.node.visualiser; import kotlin.*; diff --git a/node/src/test/resources/node/visualiser/graph.css b/node/src/test/resources/com/r3corda/node/visualiser/graph.css similarity index 100% rename from node/src/test/resources/node/visualiser/graph.css rename to node/src/test/resources/com/r3corda/node/visualiser/graph.css diff --git a/src/main/kotlin/demos/DemoClock.kt b/src/main/kotlin/com/r3corda/demos/DemoClock.kt similarity index 97% rename from src/main/kotlin/demos/DemoClock.kt rename to src/main/kotlin/com/r3corda/demos/DemoClock.kt index 1e86935e64..ac70d0adc7 100644 --- a/src/main/kotlin/demos/DemoClock.kt +++ b/src/main/kotlin/com/r3corda/demos/DemoClock.kt @@ -1,4 +1,4 @@ -package demos +package com.r3corda.demos import java.time.* import javax.annotation.concurrent.ThreadSafe diff --git a/src/main/kotlin/demos/IRSDemo.kt b/src/main/kotlin/com/r3corda/demos/IRSDemo.kt similarity index 85% rename from src/main/kotlin/demos/IRSDemo.kt rename to src/main/kotlin/com/r3corda/demos/IRSDemo.kt index 033b37dc71..2a7baf9e10 100644 --- a/src/main/kotlin/demos/IRSDemo.kt +++ b/src/main/kotlin/com/r3corda/demos/IRSDemo.kt @@ -1,24 +1,24 @@ -package demos +package com.r3corda.demos import com.google.common.net.HostAndPort import com.typesafe.config.ConfigFactory -import core.crypto.Party -import core.logElapsedTime -import node.internal.Node -import node.services.config.NodeConfiguration -import node.services.config.NodeConfigurationFromConfig -import core.node.NodeInfo -import node.services.network.NetworkMapService -import node.services.clientapi.NodeInterestRates -import node.services.transactions.NotaryService -import core.node.services.ServiceType -import node.services.messaging.ArtemisMessagingService -import core.serialization.deserialize -import core.utilities.BriefLogFormatter -import demos.api.InterestRateSwapAPI -import demos.protocols.AutoOfferProtocol -import demos.protocols.ExitServerProtocol -import demos.protocols.UpdateBusinessDayProtocol +import com.r3corda.core.crypto.Party +import com.r3corda.core.logElapsedTime +import com.r3corda.node.internal.Node +import com.r3corda.node.services.config.NodeConfiguration +import com.r3corda.node.services.config.NodeConfigurationFromConfig +import com.r3corda.core.node.NodeInfo +import com.r3corda.node.services.network.NetworkMapService +import com.r3corda.node.services.clientapi.NodeInterestRates +import com.r3corda.node.services.transactions.NotaryService +import com.r3corda.core.node.services.ServiceType +import com.r3corda.node.services.messaging.ArtemisMessagingService +import com.r3corda.core.serialization.deserialize +import com.r3corda.core.utilities.BriefLogFormatter +import com.r3corda.demos.api.InterestRateSwapAPI +import com.r3corda.demos.protocols.AutoOfferProtocol +import com.r3corda.demos.protocols.ExitServerProtocol +import com.r3corda.demos.protocols.UpdateBusinessDayProtocol import joptsimple.OptionParser import java.nio.file.Files import java.nio.file.Path diff --git a/src/main/kotlin/demos/RateFixDemo.kt b/src/main/kotlin/com/r3corda/demos/RateFixDemo.kt similarity index 81% rename from src/main/kotlin/demos/RateFixDemo.kt rename to src/main/kotlin/com/r3corda/demos/RateFixDemo.kt index e1cb618aac..10529b6ab0 100644 --- a/src/main/kotlin/demos/RateFixDemo.kt +++ b/src/main/kotlin/com/r3corda/demos/RateFixDemo.kt @@ -1,24 +1,24 @@ -package demos +package com.r3corda.demos -import contracts.Cash -import core.contracts.DOLLARS -import core.contracts.FixOf -import core.contracts.TransactionBuilder -import core.crypto.Party -import core.logElapsedTime -import core.node.NodeInfo -import core.node.services.ServiceType -import core.serialization.deserialize -import core.utilities.BriefLogFormatter -import core.utilities.Emoji -import demos.api.InterestRateSwapAPI +import com.r3corda.contracts.Cash +import com.r3corda.core.contracts.DOLLARS +import com.r3corda.core.contracts.FixOf +import com.r3corda.core.contracts.TransactionBuilder +import com.r3corda.core.crypto.Party +import com.r3corda.core.logElapsedTime +import com.r3corda.core.node.NodeInfo +import com.r3corda.core.node.services.ServiceType +import com.r3corda.core.serialization.deserialize +import com.r3corda.core.utilities.BriefLogFormatter +import com.r3corda.core.utilities.Emoji +import com.r3corda.demos.api.InterestRateSwapAPI import joptsimple.OptionParser -import node.internal.Node -import node.services.clientapi.NodeInterestRates -import node.services.config.NodeConfiguration -import node.services.messaging.ArtemisMessagingService -import node.utilities.* -import protocols.RatesFixProtocol +import com.r3corda.node.internal.Node +import com.r3corda.node.services.clientapi.NodeInterestRates +import com.r3corda.node.services.config.NodeConfiguration +import com.r3corda.node.services.messaging.ArtemisMessagingService +import com.r3corda.node.utilities.* +import com.r3corda.protocols.RatesFixProtocol import java.math.BigDecimal import java.nio.file.Files import java.nio.file.Paths diff --git a/src/main/kotlin/demos/TraderDemo.kt b/src/main/kotlin/com/r3corda/demos/TraderDemo.kt similarity index 91% rename from src/main/kotlin/demos/TraderDemo.kt rename to src/main/kotlin/com/r3corda/demos/TraderDemo.kt index e2a503f423..fb386c1447 100644 --- a/src/main/kotlin/demos/TraderDemo.kt +++ b/src/main/kotlin/com/r3corda/demos/TraderDemo.kt @@ -1,38 +1,38 @@ -package demos +package com.r3corda.demos import co.paralleluniverse.fibers.Suspendable import com.google.common.net.HostAndPort import com.typesafe.config.ConfigFactory -import contracts.CommercialPaper -import core.contracts.* -import core.crypto.Party -import core.crypto.SecureHash -import core.crypto.generateKeyPair -import core.days -import core.logElapsedTime -import core.messaging.SingleMessageRecipient -import node.services.statemachine.StateMachineManager -import node.internal.Node -import node.services.config.NodeConfigurationFromConfig -import core.node.NodeInfo -import node.services.network.NetworkMapService -import node.services.persistence.NodeAttachmentService -import node.services.transactions.NotaryService -import core.node.services.ServiceType -import node.services.messaging.ArtemisMessagingService -import node.services.wallet.NodeWalletService -import core.protocols.ProtocolLogic -import core.random63BitValue -import core.seconds -import core.serialization.deserialize -import node.utilities.ANSIProgressRenderer -import core.utilities.BriefLogFormatter -import core.utilities.Emoji -import core.utilities.ProgressTracker +import com.r3corda.contracts.CommercialPaper +import com.r3corda.core.contracts.* +import com.r3corda.core.crypto.Party +import com.r3corda.core.crypto.SecureHash +import com.r3corda.core.crypto.generateKeyPair +import com.r3corda.core.days +import com.r3corda.core.logElapsedTime +import com.r3corda.core.messaging.SingleMessageRecipient +import com.r3corda.node.services.statemachine.StateMachineManager +import com.r3corda.node.internal.Node +import com.r3corda.node.services.config.NodeConfigurationFromConfig +import com.r3corda.core.node.NodeInfo +import com.r3corda.node.services.network.NetworkMapService +import com.r3corda.node.services.persistence.NodeAttachmentService +import com.r3corda.node.services.transactions.NotaryService +import com.r3corda.core.node.services.ServiceType +import com.r3corda.node.services.messaging.ArtemisMessagingService +import com.r3corda.node.services.wallet.NodeWalletService +import com.r3corda.core.protocols.ProtocolLogic +import com.r3corda.core.random63BitValue +import com.r3corda.core.seconds +import com.r3corda.core.serialization.deserialize +import com.r3corda.node.utilities.ANSIProgressRenderer +import com.r3corda.core.utilities.BriefLogFormatter +import com.r3corda.core.utilities.Emoji +import com.r3corda.core.utilities.ProgressTracker import joptsimple.OptionParser import joptsimple.OptionSet -import protocols.NotaryProtocol -import protocols.TwoPartyTradeProtocol +import com.r3corda.protocols.NotaryProtocol +import com.r3corda.protocols.TwoPartyTradeProtocol import java.nio.file.Files import java.nio.file.Path import java.nio.file.Paths diff --git a/src/main/kotlin/demos/api/InterestRateSwapAPI.kt b/src/main/kotlin/com/r3corda/demos/api/InterestRateSwapAPI.kt similarity index 91% rename from src/main/kotlin/demos/api/InterestRateSwapAPI.kt rename to src/main/kotlin/com/r3corda/demos/api/InterestRateSwapAPI.kt index 5ef092d4c4..a9b206234f 100644 --- a/src/main/kotlin/demos/api/InterestRateSwapAPI.kt +++ b/src/main/kotlin/com/r3corda/demos/api/InterestRateSwapAPI.kt @@ -1,13 +1,13 @@ -package demos.api +package com.r3corda.demos.api -import contracts.InterestRateSwap -import core.utilities.loggerFor -import demos.protocols.AutoOfferProtocol -import demos.protocols.ExitServerProtocol -import demos.protocols.UpdateBusinessDayProtocol -import node.api.APIServer -import node.api.ProtocolClassRef -import node.api.StatesQuery +import com.r3corda.contracts.InterestRateSwap +import com.r3corda.core.utilities.loggerFor +import com.r3corda.demos.protocols.AutoOfferProtocol +import com.r3corda.demos.protocols.ExitServerProtocol +import com.r3corda.demos.protocols.UpdateBusinessDayProtocol +import com.r3corda.node.api.APIServer +import com.r3corda.node.api.ProtocolClassRef +import com.r3corda.node.api.StatesQuery import java.net.URI import java.time.LocalDate import javax.ws.rs.* diff --git a/src/main/kotlin/demos/protocols/AutoOfferProtocol.kt b/src/main/kotlin/com/r3corda/demos/protocols/AutoOfferProtocol.kt similarity index 90% rename from src/main/kotlin/demos/protocols/AutoOfferProtocol.kt rename to src/main/kotlin/com/r3corda/demos/protocols/AutoOfferProtocol.kt index f174d176d7..e4b463d142 100644 --- a/src/main/kotlin/demos/protocols/AutoOfferProtocol.kt +++ b/src/main/kotlin/com/r3corda/demos/protocols/AutoOfferProtocol.kt @@ -1,19 +1,19 @@ -package demos.protocols +package com.r3corda.demos.protocols import co.paralleluniverse.fibers.Suspendable import com.google.common.util.concurrent.FutureCallback import com.google.common.util.concurrent.Futures -import core.contracts.DealState -import core.crypto.Party -import core.contracts.SignedTransaction -import core.messaging.SingleMessageRecipient -import node.internal.Node -import core.protocols.ProtocolLogic -import core.random63BitValue -import core.serialization.deserialize -import node.utilities.ANSIProgressRenderer -import core.utilities.ProgressTracker -import protocols.TwoPartyDealProtocol +import com.r3corda.core.contracts.DealState +import com.r3corda.core.crypto.Party +import com.r3corda.core.contracts.SignedTransaction +import com.r3corda.core.messaging.SingleMessageRecipient +import com.r3corda.node.internal.Node +import com.r3corda.core.protocols.ProtocolLogic +import com.r3corda.core.random63BitValue +import com.r3corda.core.serialization.deserialize +import com.r3corda.node.utilities.ANSIProgressRenderer +import com.r3corda.core.utilities.ProgressTracker +import com.r3corda.protocols.TwoPartyDealProtocol /** * This whole class is really part of a demo just to initiate the agreement of a deal with a simple diff --git a/src/main/kotlin/demos/protocols/ExitServerProtocol.kt b/src/main/kotlin/com/r3corda/demos/protocols/ExitServerProtocol.kt similarity index 89% rename from src/main/kotlin/demos/protocols/ExitServerProtocol.kt rename to src/main/kotlin/com/r3corda/demos/protocols/ExitServerProtocol.kt index 4bbd501b80..abf20e3809 100644 --- a/src/main/kotlin/demos/protocols/ExitServerProtocol.kt +++ b/src/main/kotlin/com/r3corda/demos/protocols/ExitServerProtocol.kt @@ -1,12 +1,12 @@ -package demos.protocols +package com.r3corda.demos.protocols import co.paralleluniverse.fibers.Suspendable import co.paralleluniverse.strands.Strand -import core.node.NodeInfo -import core.protocols.ProtocolLogic -import core.serialization.deserialize -import node.internal.Node -import node.services.network.MockNetworkMapCache +import com.r3corda.core.node.NodeInfo +import com.r3corda.core.protocols.ProtocolLogic +import com.r3corda.core.serialization.deserialize +import com.r3corda.node.internal.Node +import com.r3corda.node.services.network.MockNetworkMapCache import java.util.concurrent.TimeUnit diff --git a/src/main/kotlin/demos/protocols/UpdateBusinessDayProtocol.kt b/src/main/kotlin/com/r3corda/demos/protocols/UpdateBusinessDayProtocol.kt similarity index 92% rename from src/main/kotlin/demos/protocols/UpdateBusinessDayProtocol.kt rename to src/main/kotlin/com/r3corda/demos/protocols/UpdateBusinessDayProtocol.kt index 3c6e0ab9fd..b59cc4a0aa 100644 --- a/src/main/kotlin/demos/protocols/UpdateBusinessDayProtocol.kt +++ b/src/main/kotlin/com/r3corda/demos/protocols/UpdateBusinessDayProtocol.kt @@ -1,20 +1,20 @@ -package demos.protocols +package com.r3corda.demos.protocols import co.paralleluniverse.fibers.Suspendable -import contracts.InterestRateSwap -import core.contracts.DealState -import core.contracts.StateAndRef -import core.node.NodeInfo -import core.node.services.linearHeadsOfType -import core.protocols.ProtocolLogic -import core.random63BitValue -import core.serialization.deserialize -import core.utilities.ProgressTracker -import node.utilities.ANSIProgressRenderer -import demos.DemoClock -import node.internal.Node -import node.services.network.MockNetworkMapCache -import protocols.TwoPartyDealProtocol +import com.r3corda.contracts.InterestRateSwap +import com.r3corda.core.contracts.DealState +import com.r3corda.core.contracts.StateAndRef +import com.r3corda.core.node.NodeInfo +import com.r3corda.core.node.services.linearHeadsOfType +import com.r3corda.core.protocols.ProtocolLogic +import com.r3corda.core.random63BitValue +import com.r3corda.core.serialization.deserialize +import com.r3corda.core.utilities.ProgressTracker +import com.r3corda.node.utilities.ANSIProgressRenderer +import com.r3corda.demos.DemoClock +import com.r3corda.node.internal.Node +import com.r3corda.node.services.network.MockNetworkMapCache +import com.r3corda.protocols.TwoPartyDealProtocol import java.time.LocalDate /** diff --git a/src/main/resources/demos/bank-of-london-cp.jar b/src/main/resources/com/r3corda/demos/bank-of-london-cp.jar similarity index 100% rename from src/main/resources/demos/bank-of-london-cp.jar rename to src/main/resources/com/r3corda/demos/bank-of-london-cp.jar diff --git a/src/test/kotlin/core/testing/IRSSimulationTest.kt b/src/test/kotlin/com/r3corda/core/testing/IRSSimulationTest.kt similarity index 77% rename from src/test/kotlin/core/testing/IRSSimulationTest.kt rename to src/test/kotlin/com/r3corda/core/testing/IRSSimulationTest.kt index 8063957d67..9aaca4575f 100644 --- a/src/test/kotlin/core/testing/IRSSimulationTest.kt +++ b/src/test/kotlin/com/r3corda/core/testing/IRSSimulationTest.kt @@ -1,8 +1,8 @@ -package core.testing +package com.r3corda.core.testing import com.google.common.base.Throwables -import core.utilities.BriefLogFormatter -import node.internal.testing.IRSSimulation +import com.r3corda.core.utilities.BriefLogFormatter +import com.r3corda.node.internal.testing.IRSSimulation import org.junit.Test class IRSSimulationTest { From ab5fc4a1d5522956058d149987ba82aafee2db4a Mon Sep 17 00:00:00 2001 From: Matthew Nesbit Date: Mon, 23 May 2016 15:10:45 +0100 Subject: [PATCH 2/4] Fix up default IntelliJ run configuration --- .idea/modules.xml | 15 --------------- .idea/runConfigurations/Node__buyer.xml | 4 ++-- .idea/runConfigurations/Node__seller.xml | 4 ++-- 3 files changed, 4 insertions(+), 19 deletions(-) diff --git a/.idea/modules.xml b/.idea/modules.xml index 72d42b27a1..3f38645c0c 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -3,34 +3,19 @@ - - - - - - - - - - - - - - - diff --git a/.idea/runConfigurations/Node__buyer.xml b/.idea/runConfigurations/Node__buyer.xml index d102535777..c757b34135 100644 --- a/.idea/runConfigurations/Node__buyer.xml +++ b/.idea/runConfigurations/Node__buyer.xml @@ -1,9 +1,9 @@ -