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

Rename com.r3corda -> net.corda

Browse Source
This commit is contained in:
Mike Hearn
2016-11-10 14:14:38 +01:00
parent 91c5f2ff57
commit ce99f354cb
4022 changed files with 2476 additions and 158936 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
test-utils/src/main/kotlin/com/r3corda/testing/AlwaysSucceedContract.kt → test-utils/src/main/kotlin/net/corda/testing/AlwaysSucceedContract.kt
View File

@ -1,8 +1,8 @@
package com.r3corda.testing
package net.corda.testing
import com.r3corda.core.contracts.Contract
import com.r3corda.core.contracts.TransactionForContract
import com.r3corda.core.crypto.SecureHash
import net.corda.core.contracts.Contract
import net.corda.core.contracts.TransactionForContract
import net.corda.core.crypto.SecureHash
class AlwaysSucceedContract(override val legalContractReference: SecureHash = SecureHash.sha256("Always succeed contract")) : Contract {
override fun verify(tx: TransactionForContract) {

34
test-utils/src/main/kotlin/com/r3corda/testing/CoreTestUtils.kt → test-utils/src/main/kotlin/net/corda/testing/CoreTestUtils.kt
View File

@ -1,26 +1,26 @@
@file:Suppress("UNUSED_PARAMETER", "UNCHECKED_CAST")
@file:JvmName("CoreTestUtils")
package com.r3corda.testing
package net.corda.testing
import com.google.common.base.Throwables
import com.google.common.net.HostAndPort
import com.google.common.util.concurrent.ListenableFuture
import com.google.common.util.concurrent.SettableFuture
import com.r3corda.core.contracts.StateRef
import com.r3corda.core.crypto.Party
import com.r3corda.core.crypto.SecureHash
import com.r3corda.core.crypto.generateKeyPair
import com.r3corda.core.node.ServiceHub
import com.r3corda.core.protocols.ProtocolLogic
import com.r3corda.core.transactions.TransactionBuilder
import com.r3corda.core.utilities.DUMMY_NOTARY
import com.r3corda.core.utilities.DUMMY_NOTARY_KEY
import com.r3corda.node.internal.AbstractNode
import com.r3corda.node.services.statemachine.ProtocolStateMachineImpl
import com.r3corda.node.services.statemachine.StateMachineManager.Change
import com.r3corda.node.utilities.AddOrRemove.ADD
import com.r3corda.testing.node.MockIdentityService
import com.r3corda.testing.node.MockServices
import net.corda.core.contracts.StateRef
import net.corda.core.crypto.Party
import net.corda.core.crypto.SecureHash
import net.corda.core.crypto.generateKeyPair
import net.corda.core.node.ServiceHub
import net.corda.core.protocols.ProtocolLogic
import net.corda.core.transactions.TransactionBuilder
import net.corda.core.utilities.DUMMY_NOTARY
import net.corda.core.utilities.DUMMY_NOTARY_KEY
import net.corda.node.internal.AbstractNode
import net.corda.node.services.statemachine.ProtocolStateMachineImpl
import net.corda.node.services.statemachine.StateMachineManager.Change
import net.corda.node.utilities.AddOrRemove.ADD
import net.corda.testing.node.MockIdentityService
import net.corda.testing.node.MockServices
import com.typesafe.config.Config
import rx.Subscriber
import java.net.ServerSocket
@ -166,4 +166,4 @@ inline fun <reified P : ProtocolLogic<*>> AbstractNode.initiateSingleShotProtoco
return future
}
fun Config.getHostAndPort(name: String) = HostAndPort.fromString(getString(name))
fun Config.getHostAndPort(name: String) = HostAndPort.fromString(getString(name))

12
test-utils/src/main/kotlin/com/r3corda/testing/DummyLinearState.kt → test-utils/src/main/kotlin/net/corda/testing/DummyLinearState.kt
View File

@ -1,10 +1,10 @@
package com.r3corda.testing
package net.corda.testing
import com.r3corda.core.contracts.*
import com.r3corda.core.contracts.clauses.Clause
import com.r3corda.core.contracts.clauses.FilterOn
import com.r3corda.core.contracts.clauses.verifyClause
import com.r3corda.core.crypto.SecureHash
import net.corda.core.contracts.*
import net.corda.core.contracts.clauses.Clause
import net.corda.core.contracts.clauses.FilterOn
import net.corda.core.contracts.clauses.verifyClause
import net.corda.core.crypto.SecureHash
import java.security.PublicKey
class DummyLinearContract: Contract {

2
test-utils/src/main/kotlin/com/r3corda/testing/Expect.kt → test-utils/src/main/kotlin/net/corda/testing/Expect.kt
View File

@ -1,4 +1,4 @@
package com.r3corda.testing
package net.corda.testing
import com.google.common.util.concurrent.SettableFuture
import org.slf4j.Logger

4
test-utils/src/main/kotlin/com/r3corda/testing/IntegrationTestCategory.kt → test-utils/src/main/kotlin/net/corda/testing/IntegrationTestCategory.kt
View File

@ -1,6 +1,6 @@
package com.r3corda.testing
package net.corda.testing
/**
* Marker interface for tests which are only run as part of the integration tests.
*/
interface IntegrationTestCategory
interface IntegrationTestCategory

2
test-utils/src/main/kotlin/com/r3corda/testing/JVMSpawner.kt → test-utils/src/main/kotlin/net/corda/testing/JVMSpawner.kt
View File

@ -1,4 +1,4 @@
package com.r3corda.testing
package net.corda.testing
import java.nio.file.Paths
import java.util.concurrent.TimeUnit

12
test-utils/src/main/kotlin/com/r3corda/testing/LedgerDSLInterpreter.kt → test-utils/src/main/kotlin/net/corda/testing/LedgerDSLInterpreter.kt
View File

@ -1,10 +1,10 @@
package com.r3corda.testing
package net.corda.testing
import com.r3corda.core.contracts.*
import com.r3corda.core.crypto.SecureHash
import com.r3corda.core.transactions.TransactionBuilder
import com.r3corda.core.transactions.WireTransaction
import com.r3corda.core.utilities.DUMMY_NOTARY
import net.corda.core.contracts.*
import net.corda.core.crypto.SecureHash
import net.corda.core.transactions.TransactionBuilder
import net.corda.core.transactions.WireTransaction
import net.corda.core.utilities.DUMMY_NOTARY
import java.io.InputStream
/**

2
test-utils/src/main/kotlin/com/r3corda/testing/NodeApi.kt → test-utils/src/main/kotlin/net/corda/testing/NodeApi.kt
View File

@ -1,4 +1,4 @@
package com.r3corda.testing
package net.corda.testing
import com.google.common.net.HostAndPort
import java.io.IOException

21
test-utils/src/main/kotlin/com/r3corda/testing/TestDSL.kt → test-utils/src/main/kotlin/net/corda/testing/TestDSL.kt
View File

@ -1,14 +1,15 @@
package com.r3corda.testing
package net.corda.testing
import com.r3corda.core.contracts.*
import com.r3corda.core.crypto.*
import com.r3corda.core.node.ServiceHub
import com.r3corda.core.node.recordTransactions
import com.r3corda.core.serialization.serialize
import com.r3corda.core.transactions.SignedTransaction
import com.r3corda.core.transactions.TransactionBuilder
import com.r3corda.core.transactions.WireTransaction
import com.r3corda.core.utilities.DUMMY_NOTARY_KEY
import net.corda.core.contracts.*
import net.corda.core.crypto.*
import net.corda.core.node.ServiceHub
import net.corda.core.node.recordTransactions
import net.corda.core.serialization.serialize
import net.corda.core.transactions.SignedTransaction
import net.corda.core.transactions.TransactionBuilder
import net.corda.core.transactions.WireTransaction
import net.corda.core.utilities.DUMMY_NOTARY_KEY
import net.corda.core.crypto.*
import java.io.InputStream
import java.security.KeyPair
import java.security.PublicKey

2
test-utils/src/main/kotlin/com/r3corda/testing/TestTimestamp.kt → test-utils/src/main/kotlin/net/corda/testing/TestTimestamp.kt
View File

@ -1,4 +1,4 @@
package com.r3corda.testing
package net.corda.testing
import java.text.SimpleDateFormat
import java.util.*

14
test-utils/src/main/kotlin/com/r3corda/testing/TransactionDSLInterpreter.kt → test-utils/src/main/kotlin/net/corda/testing/TransactionDSLInterpreter.kt
View File

@ -1,11 +1,11 @@
package com.r3corda.testing
package net.corda.testing
import com.r3corda.core.contracts.*
import com.r3corda.core.crypto.Party
import com.r3corda.core.crypto.SecureHash
import com.r3corda.core.seconds
import com.r3corda.core.transactions.TransactionBuilder
import com.r3corda.core.utilities.DUMMY_NOTARY
import net.corda.core.contracts.*
import net.corda.core.crypto.Party
import net.corda.core.crypto.SecureHash
import net.corda.core.seconds
import net.corda.core.transactions.TransactionBuilder
import net.corda.core.utilities.DUMMY_NOTARY
import java.security.PublicKey
import java.time.Duration
import java.time.Instant

4
test-utils/src/main/kotlin/com/r3corda/testing/http/HttpApi.kt → test-utils/src/main/kotlin/net/corda/testing/http/HttpApi.kt
View File

@ -1,4 +1,4 @@
package com.r3corda.testing.http
package net.corda.testing.http
import com.fasterxml.jackson.databind.ObjectMapper
import com.google.common.net.HostAndPort
@ -24,4 +24,4 @@ class HttpApi(val root: URL) {
fun fromHostAndPort(hostAndPort: HostAndPort, base: String, protocol: String = "http"): HttpApi
= HttpApi(URL("$protocol://$hostAndPort/$base/"))
}
}
}

6
test-utils/src/main/kotlin/com/r3corda/testing/http/HttpUtils.kt → test-utils/src/main/kotlin/net/corda/testing/http/HttpUtils.kt
View File

@ -1,6 +1,6 @@
package com.r3corda.testing.http
package net.corda.testing.http
import com.r3corda.core.utilities.loggerFor
import net.corda.core.utilities.loggerFor
import okhttp3.*
import java.net.URL
import java.util.concurrent.TimeUnit
@ -34,4 +34,4 @@ object HttpUtils {
}
return response.isSuccessful
}
}
}

29
test-utils/src/main/kotlin/com/r3corda/testing/node/InMemoryMessagingNetwork.kt → test-utils/src/main/kotlin/net/corda/testing/node/InMemoryMessagingNetwork.kt
View File

@ -1,17 +1,18 @@
package com.r3corda.testing.node
package net.corda.testing.node
import com.google.common.util.concurrent.Futures
import com.google.common.util.concurrent.ListenableFuture
import com.google.common.util.concurrent.SettableFuture
import com.r3corda.core.ThreadBox
import com.r3corda.core.messaging.*
import com.r3corda.core.serialization.SingletonSerializeAsToken
import com.r3corda.core.utilities.trace
import com.r3corda.node.services.api.MessagingServiceBuilder
import com.r3corda.node.utilities.AffinityExecutor
import com.r3corda.node.utilities.JDBCHashSet
import com.r3corda.node.utilities.databaseTransaction
import com.r3corda.testing.node.InMemoryMessagingNetwork.InMemoryMessaging
import net.corda.core.ThreadBox
import net.corda.core.messaging.*
import net.corda.core.serialization.SingletonSerializeAsToken
import net.corda.core.utilities.trace
import net.corda.node.services.api.MessagingServiceBuilder
import net.corda.node.services.api.MessagingServiceInternal
import net.corda.node.utilities.AffinityExecutor
import net.corda.node.utilities.JDBCHashSet
import net.corda.node.utilities.databaseTransaction
import net.corda.testing.node.InMemoryMessagingNetwork.InMemoryMessaging
import org.jetbrains.exposed.sql.Database
import org.slf4j.LoggerFactory
import rx.Observable
@ -84,7 +85,7 @@ class InMemoryMessagingNetwork(val sendManuallyPumped: Boolean) : SingletonSeria
fun createNode(manuallyPumped: Boolean,
executor: AffinityExecutor,
database: Database)
: Pair<Handle, com.r3corda.node.services.api.MessagingServiceBuilder<InMemoryMessaging>> {
: Pair<Handle, MessagingServiceBuilder<InMemoryMessaging>> {
check(counter >= 0) { "In memory network stopped: please recreate." }
val builder = createNodeWithID(manuallyPumped, counter, executor, database = database) as Builder
counter++
@ -143,8 +144,7 @@ class InMemoryMessagingNetwork(val sendManuallyPumped: Boolean) : SingletonSeria
messageReceiveQueues.clear()
}
inner class Builder(val manuallyPumped: Boolean, val id: Handle, val executor: AffinityExecutor, val database: Database)
: com.r3corda.node.services.api.MessagingServiceBuilder<InMemoryMessaging> {
inner class Builder(val manuallyPumped: Boolean, val id: Handle, val executor: AffinityExecutor, val database: Database) : MessagingServiceBuilder<InMemoryMessaging> {
override fun start(): ListenableFuture<InMemoryMessaging> {
synchronized(this@InMemoryMessagingNetwork) {
val node = InMemoryMessaging(manuallyPumped, id, executor, database)
@ -211,8 +211,7 @@ class InMemoryMessagingNetwork(val sendManuallyPumped: Boolean) : SingletonSeria
inner class InMemoryMessaging(private val manuallyPumped: Boolean,
private val handle: Handle,
private val executor: AffinityExecutor,
private val database: Database)
: SingletonSerializeAsToken(), com.r3corda.node.services.api.MessagingServiceInternal {
private val database: Database) : SingletonSerializeAsToken(), MessagingServiceInternal {
inner class Handler(val topicSession: TopicSession,
val callback: (Message, MessageHandlerRegistration) -> Unit) : MessageHandlerRegistration

17
test-utils/src/main/kotlin/com/r3corda/testing/node/MockNetworkMapCache.kt → test-utils/src/main/kotlin/net/corda/testing/node/MockNetworkMapCache.kt
View File

@ -1,18 +1,19 @@
package com.r3corda.testing.node
package net.corda.testing.node
import co.paralleluniverse.common.util.VisibleForTesting
import com.r3corda.core.crypto.DummyPublicKey
import com.r3corda.core.crypto.Party
import com.r3corda.core.messaging.SingleMessageRecipient
import com.r3corda.core.node.NodeInfo
import com.r3corda.core.node.services.NetworkMapCache
import net.corda.core.crypto.DummyPublicKey
import net.corda.core.crypto.Party
import net.corda.core.messaging.SingleMessageRecipient
import net.corda.core.node.NodeInfo
import net.corda.core.node.services.NetworkMapCache
import net.corda.node.services.network.InMemoryNetworkMapCache
import rx.Observable
import rx.subjects.PublishSubject
/**
* Network map cache with no backing map service.
*/
class MockNetworkMapCache() : com.r3corda.node.services.network.InMemoryNetworkMapCache() {
class MockNetworkMapCache() : InMemoryNetworkMapCache() {
override val changed: Observable<NetworkMapCache.MapChange> = PublishSubject.create<NetworkMapCache.MapChange>()
data class MockAddress(val id: String): SingleMessageRecipient
@ -42,4 +43,4 @@ class MockNetworkMapCache() : com.r3corda.node.services.network.InMemoryNetworkM
fun deleteRegistration(legalIdentity: Party) : Boolean {
return registeredNodes.remove(legalIdentity) != null
}
}
}

52
test-utils/src/main/kotlin/com/r3corda/testing/node/MockNode.kt → test-utils/src/main/kotlin/net/corda/testing/node/MockNode.kt
View File

@ -1,33 +1,33 @@
package com.r3corda.testing.node
package net.corda.testing.node
import com.google.common.jimfs.Configuration.unix
import com.google.common.jimfs.Jimfs
import com.google.common.util.concurrent.Futures
import com.r3corda.core.createDirectories
import com.r3corda.core.createDirectory
import com.r3corda.core.crypto.Party
import com.r3corda.core.div
import com.r3corda.core.messaging.SingleMessageRecipient
import com.r3corda.core.node.PhysicalLocation
import com.r3corda.core.node.services.KeyManagementService
import com.r3corda.core.node.services.ServiceInfo
import com.r3corda.core.node.services.VaultService
import com.r3corda.core.random63BitValue
import com.r3corda.core.utilities.DUMMY_NOTARY_KEY
import com.r3corda.core.utilities.loggerFor
import com.r3corda.node.internal.AbstractNode
import com.r3corda.node.services.api.MessagingServiceInternal
import com.r3corda.node.services.config.NodeConfiguration
import com.r3corda.node.services.keys.E2ETestKeyManagementService
import com.r3corda.node.services.messaging.RPCOps
import com.r3corda.node.services.network.InMemoryNetworkMapService
import com.r3corda.node.services.network.NetworkMapService
import com.r3corda.node.services.transactions.InMemoryUniquenessProvider
import com.r3corda.node.services.transactions.SimpleNotaryService
import com.r3corda.node.services.transactions.ValidatingNotaryService
import com.r3corda.node.services.vault.NodeVaultService
import com.r3corda.node.utilities.AffinityExecutor
import com.r3corda.node.utilities.AffinityExecutor.ServiceAffinityExecutor
import net.corda.core.createDirectories
import net.corda.core.createDirectory
import net.corda.core.crypto.Party
import net.corda.core.div
import net.corda.core.messaging.SingleMessageRecipient
import net.corda.core.node.PhysicalLocation
import net.corda.core.node.services.KeyManagementService
import net.corda.core.node.services.ServiceInfo
import net.corda.core.node.services.VaultService
import net.corda.core.random63BitValue
import net.corda.core.utilities.DUMMY_NOTARY_KEY
import net.corda.core.utilities.loggerFor
import net.corda.node.internal.AbstractNode
import net.corda.node.services.api.MessagingServiceInternal
import net.corda.node.services.config.NodeConfiguration
import net.corda.node.services.keys.E2ETestKeyManagementService
import net.corda.node.services.messaging.RPCOps
import net.corda.node.services.network.InMemoryNetworkMapService
import net.corda.node.services.network.NetworkMapService
import net.corda.node.services.transactions.InMemoryUniquenessProvider
import net.corda.node.services.transactions.SimpleNotaryService
import net.corda.node.services.transactions.ValidatingNotaryService
import net.corda.node.services.vault.NodeVaultService
import net.corda.node.utilities.AffinityExecutor
import net.corda.node.utilities.AffinityExecutor.ServiceAffinityExecutor
import org.slf4j.Logger
import java.nio.file.FileSystem
import java.nio.file.Path

38
test-utils/src/main/kotlin/com/r3corda/testing/node/MockServices.kt → test-utils/src/main/kotlin/net/corda/testing/node/MockServices.kt
View File

@ -1,24 +1,24 @@
package com.r3corda.testing.node
package net.corda.testing.node
import com.google.common.util.concurrent.ListenableFuture
import com.r3corda.core.contracts.Attachment
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.messaging.MessagingService
import com.r3corda.core.messaging.SingleMessageRecipient
import com.r3corda.core.node.NodeInfo
import com.r3corda.core.node.ServiceHub
import com.r3corda.core.node.services.*
import com.r3corda.core.protocols.ProtocolLogic
import com.r3corda.core.protocols.StateMachineRunId
import com.r3corda.core.serialization.SingletonSerializeAsToken
import com.r3corda.core.transactions.SignedTransaction
import com.r3corda.core.utilities.DUMMY_NOTARY
import com.r3corda.node.services.persistence.InMemoryStateMachineRecordedTransactionMappingStorage
import com.r3corda.testing.MEGA_CORP
import com.r3corda.testing.MINI_CORP
import net.corda.core.contracts.Attachment
import net.corda.core.crypto.Party
import net.corda.core.crypto.SecureHash
import net.corda.core.crypto.generateKeyPair
import net.corda.core.crypto.sha256
import net.corda.core.messaging.MessagingService
import net.corda.core.messaging.SingleMessageRecipient
import net.corda.core.node.NodeInfo
import net.corda.core.node.ServiceHub
import net.corda.core.node.services.*
import net.corda.core.protocols.ProtocolLogic
import net.corda.core.protocols.StateMachineRunId
import net.corda.core.serialization.SingletonSerializeAsToken
import net.corda.core.transactions.SignedTransaction
import net.corda.core.utilities.DUMMY_NOTARY
import net.corda.node.services.persistence.InMemoryStateMachineRecordedTransactionMappingStorage
import net.corda.testing.MEGA_CORP
import net.corda.testing.MINI_CORP
import rx.Observable
import rx.subjects.PublishSubject
import java.io.ByteArrayInputStream

12
test-utils/src/main/kotlin/com/r3corda/testing/node/TestClock.kt → test-utils/src/main/kotlin/net/corda/testing/node/TestClock.kt
View File

@ -1,9 +1,9 @@
package com.r3corda.testing.node
package net.corda.testing.node
import com.r3corda.core.serialization.SerializeAsToken
import com.r3corda.core.serialization.SerializeAsTokenContext
import com.r3corda.core.serialization.SingletonSerializationToken
import com.r3corda.node.utilities.MutableClock
import net.corda.core.serialization.SerializeAsToken
import net.corda.core.serialization.SerializeAsTokenContext
import net.corda.core.serialization.SingletonSerializationToken
import net.corda.node.utilities.MutableClock
import java.time.Clock
import java.time.Duration
import java.time.Instant
@ -15,7 +15,7 @@ import javax.annotation.concurrent.ThreadSafe
* A [Clock] that can have the time advanced for use in testing.
*/
@ThreadSafe
class TestClock(private var delegateClock: Clock = Clock.systemUTC()) : com.r3corda.node.utilities.MutableClock(), SerializeAsToken {
class TestClock(private var delegateClock: Clock = Clock.systemUTC()) : MutableClock(), SerializeAsToken {
private val token = SingletonSerializationToken(this)