ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-06-22 09:08:49 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Add com.r3corda to all namespaces.

Browse Source
This commit is contained in:
Matthew Nesbit
2016-05-23 14:53:56 +01:00
parent 4eb4233584
commit 63a5fd1b9e
160 changed files with 1004 additions and 989 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
node/src/main/kotlin/node/api/APIServer.kt → node/src/main/kotlin/com/r3corda/node/api/APIServer.kt
View File

@ -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

2
node/src/main/kotlin/node/api/Query.kt → node/src/main/kotlin/com/r3corda/node/api/Query.kt
View File

@ -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

18
node/src/main/kotlin/node/internal/APIServerImpl.kt → node/src/main/kotlin/com/r3corda/node/internal/APIServerImpl.kt
View File

@ -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

76
node/src/main/kotlin/node/internal/AbstractNode.kt → node/src/main/kotlin/com/r3corda/node/internal/AbstractNode.kt
View File

@ -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")

26
node/src/main/kotlin/node/internal/Node.kt → node/src/main/kotlin/com/r3corda/node/internal/Node.kt
View File

@ -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

28
node/src/main/kotlin/node/internal/testing/IRSSimulation.kt → node/src/main/kotlin/com/r3corda/node/internal/testing/IRSSimulation.kt
View File

@ -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.*

30
node/src/main/kotlin/node/internal/testing/MockNode.kt → node/src/main/kotlin/com/r3corda/node/internal/testing/MockNode.kt
View File

@ -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

26
node/src/main/kotlin/node/internal/testing/Simulation.kt → node/src/main/kotlin/com/r3corda/node/internal/testing/Simulation.kt
View File

@ -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

14
node/src/main/kotlin/node/internal/testing/TestUtils.kt → node/src/main/kotlin/com/r3corda/node/internal/testing/TestUtils.kt
View File

@ -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 {

20
node/src/main/kotlin/node/internal/testing/TradeSimulation.kt → node/src/main/kotlin/com/r3corda/node/internal/testing/TradeSimulation.kt
View File

@ -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
/**

14
node/src/main/kotlin/node/services/api/AbstractNodeService.kt → node/src/main/kotlin/com/r3corda/node/services/api/AbstractNodeService.kt
View File

@ -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
/**

2
node/src/main/kotlin/node/services/api/AcceptsFileUpload.kt → node/src/main/kotlin/com/r3corda/node/services/api/AcceptsFileUpload.kt
View File

@ -1,4 +1,4 @@
package node.services.api
package com.r3corda.node.services.api
import java.io.InputStream

8
node/src/main/kotlin/node/services/api/CheckpointStorage.kt → node/src/main/kotlin/com/r3corda/node/services/api/CheckpointStorage.kt
View File

@ -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.

2
node/src/main/kotlin/node/services/api/MonitoringService.kt → node/src/main/kotlin/com/r3corda/node/services/api/MonitoringService.kt
View File

@ -1,4 +1,4 @@
package node.services.api
package com.r3corda.node.services.api
import com.codahale.metrics.MetricRegistry

4
node/src/main/kotlin/node/services/api/RegulatorService.kt → node/src/main/kotlin/com/r3corda/node/services/api/RegulatorService.kt
View File

@ -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.

4
node/src/main/kotlin/node/services/api/ServiceHubInternal.kt → node/src/main/kotlin/com/r3corda/node/services/api/ServiceHubInternal.kt
View File

@ -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

26
node/src/main/kotlin/node/services/clientapi/NodeInterestRates.kt → node/src/main/kotlin/com/r3corda/node/services/clientapi/NodeInterestRates.kt
View File

@ -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

2
node/src/main/kotlin/node/services/config/NodeConfiguration.kt → node/src/main/kotlin/com/r3corda/node/services/config/NodeConfiguration.kt
View File

@ -1,4 +1,4 @@
package node.services.config
package com.r3corda.node.services.config
import com.typesafe.config.Config
import com.typesafe.config.ConfigFactory

6
node/src/main/kotlin/node/services/identity/InMemoryIdentityService.kt → node/src/main/kotlin/com/r3corda/node/services/identity/InMemoryIdentityService.kt
View File

@ -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

8
node/src/main/kotlin/node/services/keys/E2ETestKeyManagementService.kt → node/src/main/kotlin/com/r3corda/node/services/keys/E2ETestKeyManagementService.kt
View File

@ -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

12
node/src/main/kotlin/node/services/messaging/ArtemisMessagingService.kt → node/src/main/kotlin/com/r3corda/node/services/messaging/ArtemisMessagingService.kt
View File

@ -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.*

12
node/src/main/kotlin/node/services/network/InMemoryMessagingNetwork.kt → node/src/main/kotlin/com/r3corda/node/services/network/InMemoryMessagingNetwork.kt
View File

@ -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

38
node/src/main/kotlin/node/services/network/InMemoryNetworkMapCache.kt → node/src/main/kotlin/com/r3corda/node/services/network/InMemoryNetworkMapCache.kt
View File

@ -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.*

10
node/src/main/kotlin/node/services/network/MockNetworkMapCache.kt → node/src/main/kotlin/com/r3corda/node/services/network/MockNetworkMapCache.kt
View File

@ -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.

32
node/src/main/kotlin/node/services/network/NetworkMapService.kt → node/src/main/kotlin/com/r3corda/node/services/network/NetworkMapService.kt
View File

@ -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

18
node/src/main/kotlin/node/services/persistence/DataVendingService.kt → node/src/main/kotlin/com/r3corda/node/services/persistence/DataVendingService.kt
View File

@ -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

14
node/src/main/kotlin/node/services/persistence/NodeAttachmentService.kt → node/src/main/kotlin/com/r3corda/node/services/persistence/NodeAttachmentService.kt
View File

@ -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

16
node/src/main/kotlin/node/services/persistence/PerFileCheckpointStorage.kt → node/src/main/kotlin/com/r3corda/node/services/persistence/PerFileCheckpointStorage.kt
View File

@ -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

14
node/src/main/kotlin/node/services/persistence/StorageServiceImpl.kt → node/src/main/kotlin/com/r3corda/node/services/persistence/StorageServiceImpl.kt
View File

@ -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.*

22
node/src/main/kotlin/node/services/statemachine/ProtocolStateMachineImpl.kt → node/src/main/kotlin/com/r3corda/node/services/statemachine/ProtocolStateMachineImpl.kt
View File

@ -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

34
node/src/main/kotlin/node/services/statemachine/StateMachineManager.kt → node/src/main/kotlin/com/r3corda/node/services/statemachine/StateMachineManager.kt
View File

@ -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.*

14
node/src/main/kotlin/node/services/transactions/InMemoryUniquenessProvider.kt → node/src/main/kotlin/com/r3corda/node/services/transactions/InMemoryUniquenessProvider.kt
View File

@ -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

40
node/src/main/kotlin/node/services/transactions/NotaryService.kt → node/src/main/kotlin/com/r3corda/node/services/transactions/NotaryService.kt
View File

@ -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
/**

8
node/src/main/kotlin/node/services/transactions/TimestampChecker.kt → node/src/main/kotlin/com/r3corda/node/services/transactions/TimestampChecker.kt
View File

@ -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

22
node/src/main/kotlin/node/services/wallet/NodeWalletService.kt → node/src/main/kotlin/com/r3corda/node/services/wallet/NodeWalletService.kt
View File

@ -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

14
node/src/main/kotlin/node/services/wallet/WalletImpl.kt → node/src/main/kotlin/com/r3corda/node/services/wallet/WalletImpl.kt
View File

@ -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.*
/**

8
node/src/main/kotlin/node/servlets/AttachmentDownloadServlet.kt → node/src/main/kotlin/com/r3corda/node/servlets/AttachmentDownloadServlet.kt
View File

@ -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

6
node/src/main/kotlin/node/servlets/Config.kt → node/src/main/kotlin/com/r3corda/node/servlets/Config.kt
View File

@ -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

8
node/src/main/kotlin/node/servlets/DataUploadServlet.kt → node/src/main/kotlin/com/r3corda/node/servlets/DataUploadServlet.kt
View File

@ -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

2
node/src/main/kotlin/node/servlets/ResponseFilter.kt → node/src/main/kotlin/com/r3corda/node/servlets/ResponseFilter.kt
View File

@ -1,4 +1,4 @@
package node.servlets
package com.r3corda.node.servlets
import javax.ws.rs.container.ContainerRequestContext
import javax.ws.rs.container.ContainerResponseContext

8
node/src/main/kotlin/node/utilities/ANSIProgressRenderer.kt → node/src/main/kotlin/com/r3corda/node/utilities/ANSIProgressRenderer.kt
View File

@ -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

2
node/src/main/kotlin/node/utilities/AddOrRemove.kt → node/src/main/kotlin/com/r3corda/node/utilities/AddOrRemove.kt
View File

@ -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.

4
node/src/main/kotlin/node/utilities/AffinityExecutor.kt → node/src/main/kotlin/com/r3corda/node/utilities/AffinityExecutor.kt
View File

@ -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

10
node/src/main/kotlin/node/utilities/JsonSupport.kt → node/src/main/kotlin/com/r3corda/node/utilities/JsonSupport.kt
View File

@ -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

0
node/src/main/resources/node/internal/testing/example.rates.txt → node/src/main/resources/com/r3corda/node/internal/testing/example.rates.txt
View File

0
node/src/main/resources/node/internal/testing/trade.json → node/src/main/resources/com/r3corda/node/internal/testing/trade.json
View File

32
node/src/test/kotlin/node/messaging/AttachmentTests.kt → node/src/test/kotlin/com/r3corda/node/messaging/AttachmentTests.kt
View File

@ -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

12
node/src/test/kotlin/node/messaging/InMemoryMessagingTests.kt → node/src/test/kotlin/com/r3corda/node/messaging/InMemoryMessagingTests.kt
View File

@ -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.*

60
node/src/test/kotlin/node/messaging/TwoPartyTradeProtocolTests.kt → node/src/test/kotlin/com/r3corda/node/messaging/TwoPartyTradeProtocolTests.kt
View File

@ -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<ContractState> {
transactionGroupFor<ContractState> {
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)

10
node/src/test/kotlin/node/services/ArtemisMessagingServiceTests.kt → node/src/test/kotlin/com/r3corda/node/services/ArtemisMessagingServiceTests.kt
View File

@ -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

4
node/src/test/kotlin/node/services/InMemoryNetworkMapCacheTest.kt → node/src/test/kotlin/com/r3corda/node/services/InMemoryNetworkMapCacheTest.kt
View File

@ -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

22
node/src/test/kotlin/node/services/InMemoryNetworkMapServiceTest.kt → node/src/test/kotlin/com/r3corda/node/services/InMemoryNetworkMapServiceTest.kt
View File

@ -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

26
node/src/test/kotlin/node/services/MockServices.kt → node/src/test/kotlin/com/r3corda/node/services/MockServices.kt
View File

@ -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

8
node/src/test/kotlin/node/services/NodeAttachmentStorageTest.kt → node/src/test/kotlin/com/r3corda/node/services/NodeAttachmentStorageTest.kt
View File

@ -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

30
node/src/test/kotlin/node/services/NodeInterestRatesTest.kt → node/src/test/kotlin/com/r3corda/node/services/NodeInterestRatesTest.kt
View File

@ -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

24
node/src/test/kotlin/node/services/NodeWalletServiceTest.kt → node/src/test/kotlin/com/r3corda/node/services/NodeWalletServiceTest.kt
View File

@ -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

20
node/src/test/kotlin/node/services/NotaryServiceTests.kt → node/src/test/kotlin/com/r3corda/node/services/NotaryServiceTests.kt
View File

@ -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

8
node/src/test/kotlin/node/services/PerFileCheckpointStorageTests.kt → node/src/test/kotlin/com/r3corda/node/services/PerFileCheckpointStorageTests.kt
View File

@ -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

8
node/src/test/kotlin/node/services/TimestampCheckerTests.kt → node/src/test/kotlin/com/r3corda/node/services/TimestampCheckerTests.kt
View File

@ -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

12
node/src/test/kotlin/node/services/UniquenessProviderTests.kt → node/src/test/kotlin/com/r3corda/node/services/UniquenessProviderTests.kt
View File

@ -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

2
node/src/test/kotlin/node/utilities/AffinityExecutorTests.kt → node/src/test/kotlin/com/r3corda/node/utilities/AffinityExecutorTests.kt
View File

@ -1,4 +1,4 @@
package node.utilities
package com.r3corda.node.utilities
import org.junit.After
import org.junit.Test

2
node/src/test/kotlin/node/visualiser/GraphStream.kt → node/src/test/kotlin/com/r3corda/node/visualiser/GraphStream.kt
View File

@ -1,4 +1,4 @@
package node.visualiser
package com.r3corda.node.visualiser
import org.graphstream.graph.Edge
import org.graphstream.graph.Element

10
node/src/test/kotlin/node/visualiser/GroupToGraphConversion.kt → node/src/test/kotlin/com/r3corda/node/visualiser/GroupToGraphConversion.kt
View File

@ -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

2
node/src/test/kotlin/node/visualiser/StateViewer.form → node/src/test/kotlin/com/r3corda/node/visualiser/StateViewer.form
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="node.visualiser.StateViewer">
<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="com.r3corda.node.visualiser.StateViewer">
<grid id="27dc6" binding="root" layout-manager="BorderLayout" hgap="15" vgap="15">
<constraints>
<xy x="20" y="20" width="500" height="400"/>

2
node/src/test/kotlin/node/visualiser/StateViewer.java → node/src/test/kotlin/com/r3corda/node/visualiser/StateViewer.java
View File

@ -1,4 +1,4 @@
package node.visualiser;
package com.r3corda.node.visualiser;
import kotlin.*;

0
node/src/test/resources/node/visualiser/graph.css → node/src/test/resources/com/r3corda/node/visualiser/graph.css
View File