diff --git a/contracts/build.gradle b/contracts/build.gradle index 486bdb9a6d..ae3daa7713 100644 --- a/contracts/build.gradle +++ b/contracts/build.gradle @@ -78,4 +78,6 @@ repositories { dependencies { compile project(':core') + + testCompile 'junit:junit:4.12' } \ No newline at end of file diff --git a/contracts/src/main/java/contracts/JavaCommercialPaper.java b/contracts/src/main/java/contracts/JavaCommercialPaper.java index 7b283c31f7..39d1cd5d8f 100644 --- a/contracts/src/main/java/contracts/JavaCommercialPaper.java +++ b/contracts/src/main/java/contracts/JavaCommercialPaper.java @@ -88,7 +88,7 @@ public class JavaCommercialPaper implements Contract { @Override public Contract getContract() { return JCP_PROGRAM_ID; - //return SecureHash.Companion.sha256("java commercial paper (this should be a bytecode hash)"); + //return SecureHash.sha256("java commercial paper (this should be a bytecode hash)"); } @Override diff --git a/contracts/src/main/kotlin/contracts/testing/TestUtils.kt b/contracts/src/main/kotlin/contracts/testing/TestUtils.kt new file mode 100644 index 0000000000..febd5941b2 --- /dev/null +++ b/contracts/src/main/kotlin/contracts/testing/TestUtils.kt @@ -0,0 +1,53 @@ +package 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 java.security.PublicKey +import java.util.* + +// In a real system this would be a persistent map of hash to bytecode and we'd instantiate the object as needed inside +// a sandbox. For unit tests we just have a hard-coded list. +val TEST_PROGRAM_MAP: Map> = mapOf( + CASH_PROGRAM_ID to Cash::class.java, + CP_PROGRAM_ID to CommercialPaper::class.java, + JavaCommercialPaper.JCP_PROGRAM_ID to JavaCommercialPaper::class.java, + CROWDFUND_PROGRAM_ID to CrowdFund::class.java, + DUMMY_PROGRAM_ID to DummyContract::class.java, + IRS_PROGRAM_ID to InterestRateSwap::class.java +) + +fun generateState(notary: Party = DUMMY_NOTARY) = DummyContract.State(Random().nextInt(), notary) + +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +// +// Defines a simple DSL for building pseudo-transactions (not the same as the wire protocol) for testing purposes. +// +// Define a transaction like this: +// +// transaction { +// input { someExpression } +// output { someExpression } +// arg { someExpression } +// +// tweak { +// ... same thing but works with a copy of the parent, can add inputs/outputs/args just within this scope. +// } +// +// contract.accepts() -> should pass +// contract `fails requirement` "some substring of the error message" +// } +// +// TODO: Make it impossible to forget to test either a failure or an accept for each transaction{} block + +infix fun Cash.State.`owned by`(owner: PublicKey) = copy(owner = owner) +infix fun Cash.State.`issued by`(party: Party) = copy(deposit = deposit.copy(party = party)) +infix fun CommercialPaper.State.`owned by`(owner: PublicKey) = this.copy(owner = owner) +infix fun ICommercialPaperState.`owned by`(new_owner: PublicKey) = this.withOwner(new_owner) + +// Allows you to write 100.DOLLARS.CASH +val Amount.CASH: Cash.State get() = Cash.State(MINI_CORP.ref(1, 2, 3), this, NullPublicKey, DUMMY_NOTARY) diff --git a/node/src/main/kotlin/protocols/TwoPartyTradeProtocol.kt b/contracts/src/main/kotlin/protocols/TwoPartyTradeProtocol.kt similarity index 93% rename from node/src/main/kotlin/protocols/TwoPartyTradeProtocol.kt rename to contracts/src/main/kotlin/protocols/TwoPartyTradeProtocol.kt index bb123c82ce..6da66c4ab9 100644 --- a/node/src/main/kotlin/protocols/TwoPartyTradeProtocol.kt +++ b/contracts/src/main/kotlin/protocols/TwoPartyTradeProtocol.kt @@ -1,7 +1,6 @@ package protocols import co.paralleluniverse.fibers.Suspendable -import com.google.common.util.concurrent.ListenableFuture import contracts.Cash import contracts.sumCashBy import core.contracts.* @@ -9,7 +8,6 @@ import core.crypto.DigitalSignature import core.crypto.Party import core.crypto.signWithECDSA import core.messaging.SingleMessageRecipient -import core.messaging.StateMachineManager import core.node.NodeInfo import core.protocols.ProtocolLogic import core.random63BitValue @@ -46,20 +44,6 @@ import java.security.SignatureException object TwoPartyTradeProtocol { val TRADE_TOPIC = "platform.trade" - fun runSeller(smm: StateMachineManager, notary: NodeInfo, - otherSide: SingleMessageRecipient, assetToSell: StateAndRef, price: Amount, - myKeyPair: KeyPair, buyerSessionID: Long): ListenableFuture { - val seller = Seller(otherSide, notary, assetToSell, price, myKeyPair, buyerSessionID) - return smm.add("${TRADE_TOPIC}.seller", seller) - } - - fun runBuyer(smm: StateMachineManager, notaryNode: NodeInfo, - otherSide: SingleMessageRecipient, acceptablePrice: Amount, typeToBuy: Class, - sessionID: Long): ListenableFuture { - val buyer = Buyer(otherSide, notaryNode.identity, acceptablePrice, typeToBuy, sessionID) - return smm.add("$TRADE_TOPIC.buyer", buyer) - } - class UnacceptablePriceException(val givenPrice: Amount) : Exception() class AssetMismatchException(val expectedTypeName: String, val typeName: String) : Exception() { override fun toString() = "The submitted asset didn't match the expected type: $expectedTypeName vs $typeName" diff --git a/node/src/test/kotlin/contracts/CashTests.kt b/contracts/src/test/kotlin/contracts/CashTests.kt similarity index 99% rename from node/src/test/kotlin/contracts/CashTests.kt rename to contracts/src/test/kotlin/contracts/CashTests.kt index 6ebfb55e52..864274c8d7 100644 --- a/node/src/test/kotlin/contracts/CashTests.kt +++ b/contracts/src/test/kotlin/contracts/CashTests.kt @@ -1,12 +1,13 @@ import contracts.Cash import contracts.DummyContract import contracts.InsufficientBalanceException -import core.* +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.testutils.* +import core.testing.* import org.junit.Test import java.security.PublicKey import java.util.* diff --git a/node/src/test/kotlin/contracts/CommercialPaperTests.kt b/contracts/src/test/kotlin/contracts/CommercialPaperTests.kt similarity index 96% rename from node/src/test/kotlin/contracts/CommercialPaperTests.kt rename to contracts/src/test/kotlin/contracts/CommercialPaperTests.kt index cb70b1f969..3b59e4dbfd 100644 --- a/node/src/test/kotlin/contracts/CommercialPaperTests.kt +++ b/contracts/src/test/kotlin/contracts/CommercialPaperTests.kt @@ -1,9 +1,13 @@ package contracts -import core.* +import contracts.testing.CASH +import contracts.testing.`owned by` import core.contracts.* import core.crypto.SecureHash -import core.testutils.* +import core.days +import core.node.services.testing.MockStorageService +import core.seconds +import core.testing.* import org.junit.Test import org.junit.runner.RunWith import org.junit.runners.Parameterized @@ -149,7 +153,7 @@ class CommercialPaperTestsGeneric { signWith(DUMMY_NOTARY_KEY) } val stx = ptx.toSignedTransaction() - stx.verifyToLedgerTransaction(MockIdentityService, attachments) + stx.verifyToLedgerTransaction(MOCK_IDENTITY_SERVICE, attachments) } val (alicesWalletTX, alicesWallet) = cashOutputsToWallet( @@ -166,7 +170,7 @@ class CommercialPaperTestsGeneric { ptx.signWith(MINI_CORP_KEY) ptx.signWith(ALICE_KEY) ptx.signWith(DUMMY_NOTARY_KEY) - ptx.toSignedTransaction().verifyToLedgerTransaction(MockIdentityService, attachments) + ptx.toSignedTransaction().verifyToLedgerTransaction(MOCK_IDENTITY_SERVICE, attachments) } // Won't be validated. @@ -182,7 +186,7 @@ class CommercialPaperTestsGeneric { ptx.signWith(ALICE_KEY) ptx.signWith(MINI_CORP_KEY) ptx.signWith(DUMMY_NOTARY_KEY) - return ptx.toSignedTransaction().verifyToLedgerTransaction(MockIdentityService, attachments) + return ptx.toSignedTransaction().verifyToLedgerTransaction(MOCK_IDENTITY_SERVICE, attachments) } val tooEarlyRedemption = makeRedeemTX(TEST_TX_TIME + 10.days) diff --git a/node/src/test/kotlin/contracts/CrowdFundTests.kt b/contracts/src/test/kotlin/contracts/CrowdFundTests.kt similarity index 95% rename from node/src/test/kotlin/contracts/CrowdFundTests.kt rename to contracts/src/test/kotlin/contracts/CrowdFundTests.kt index 2b9a044bb8..eeba0593ae 100644 --- a/node/src/test/kotlin/contracts/CrowdFundTests.kt +++ b/contracts/src/test/kotlin/contracts/CrowdFundTests.kt @@ -1,9 +1,13 @@ package contracts -import core.* +import contracts.testing.CASH +import contracts.testing.`owned by` import core.contracts.* import core.crypto.SecureHash -import core.testutils.* +import core.days +import core.node.services.testing.MockStorageService +import core.seconds +import core.testing.* import org.junit.Test import java.time.Instant import java.util.* @@ -109,7 +113,7 @@ class CrowdFundTests { signWith(MINI_CORP_KEY) signWith(DUMMY_NOTARY_KEY) } - ptx.toSignedTransaction().verifyToLedgerTransaction(MockIdentityService, attachments) + ptx.toSignedTransaction().verifyToLedgerTransaction(MOCK_IDENTITY_SERVICE, attachments) } // let's give Alice some funds that she can invest @@ -128,7 +132,7 @@ class CrowdFundTests { ptx.signWith(ALICE_KEY) ptx.signWith(DUMMY_NOTARY_KEY) // this verify passes - the transaction contains an output cash, necessary to verify the fund command - ptx.toSignedTransaction().verifyToLedgerTransaction(MockIdentityService, attachments) + ptx.toSignedTransaction().verifyToLedgerTransaction(MOCK_IDENTITY_SERVICE, attachments) } // Won't be validated. @@ -143,7 +147,7 @@ class CrowdFundTests { CrowdFund().generateClose(ptx, pledgeTX.outRef(0), miniCorpWallet) ptx.signWith(MINI_CORP_KEY) ptx.signWith(DUMMY_NOTARY_KEY) - return ptx.toSignedTransaction().verifyToLedgerTransaction(MockIdentityService, attachments) + return ptx.toSignedTransaction().verifyToLedgerTransaction(MOCK_IDENTITY_SERVICE, attachments) } val tooEarlyClose = makeFundedTX(TEST_TX_TIME + 6.days) diff --git a/node/src/test/kotlin/contracts/IRSTests.kt b/contracts/src/test/kotlin/contracts/IRSTests.kt similarity index 99% rename from node/src/test/kotlin/contracts/IRSTests.kt rename to contracts/src/test/kotlin/contracts/IRSTests.kt index 981fb9055c..ce5ebc7bb6 100644 --- a/node/src/test/kotlin/contracts/IRSTests.kt +++ b/contracts/src/test/kotlin/contracts/IRSTests.kt @@ -1,8 +1,9 @@ package contracts -import core.* import core.contracts.* -import core.testutils.* +import core.node.services.testing.MockStorageService +import core.seconds +import core.testing.* import org.junit.Test import java.math.BigDecimal import java.time.LocalDate @@ -236,7 +237,7 @@ class IRSTests { signWith(MINI_CORP_KEY) signWith(DUMMY_NOTARY_KEY) } - gtx.toSignedTransaction().verifyToLedgerTransaction(MockIdentityService, attachments) + gtx.toSignedTransaction().verifyToLedgerTransaction(MOCK_IDENTITY_SERVICE, attachments) } return genTX } @@ -320,7 +321,7 @@ class IRSTests { signWith(MINI_CORP_KEY) signWith(DUMMY_NOTARY_KEY) } - tx.toSignedTransaction().verifyToLedgerTransaction(MockIdentityService, attachments) + tx.toSignedTransaction().verifyToLedgerTransaction(MOCK_IDENTITY_SERVICE, attachments) } currentIRS = previousTXN.outputs.filterIsInstance().single() println(currentIRS.prettyPrint()) diff --git a/core/build.gradle b/core/build.gradle index 5894f309fe..d6551b4e4d 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -21,8 +21,15 @@ repositories { } } +//noinspection GroovyAssignabilityCheck +configurations { + quasar +} + dependencies { testCompile 'junit:junit:4.12' + testCompile 'org.assertj:assertj-core:3.4.1' + testCompile "commons-fileupload:commons-fileupload:1.3.1" compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" @@ -56,4 +63,40 @@ dependencies { // For JSON compile "com.fasterxml.jackson.core:jackson-databind:2.5.5" + + // Quasar: for the bytecode rewriting for state machines. + quasar "co.paralleluniverse:quasar-core:${quasar_version}:jdk8@jar" } + + +tasks.withType(Test) { + jvmArgs "-javaagent:${configurations.quasar.singleFile}" + jvmArgs "-Dco.paralleluniverse.fibers.verifyInstrumentation" +} +tasks.withType(JavaExec) { + jvmArgs "-javaagent:${configurations.quasar.singleFile}" + jvmArgs "-Dco.paralleluniverse.fibers.verifyInstrumentation" +} + + +// These lines tell gradle to run the Quasar suspendables scanner to look for unannotated super methods +// that have @Suspendable sub implementations. These tend to cause NPEs and are not caught by the verifier +// NOTE: need to make sure the output isn't on the classpath or every other run it generates empty results, so +// we explicitly delete to avoid that happening. We also need to turn off what seems to be a spurious warning in the IDE +// +// TODO: Make this task incremental, as it can be quite slow. + +//noinspection GroovyAssignabilityCheck +task quasarScan(dependsOn: ['classes']) << { + ant.taskdef(name:'scanSuspendables', classname:'co.paralleluniverse.fibers.instrument.SuspendablesScanner', + classpath: "${sourceSets.main.output.classesDir}:${sourceSets.main.output.resourcesDir}:${configurations.runtime.asPath}") + delete "$sourceSets.main.output.resourcesDir/META-INF/suspendables", "$sourceSets.main.output.resourcesDir/META-INF/suspendable-supers" + ant.scanSuspendables( + auto:false, + suspendablesFile: "$sourceSets.main.output.resourcesDir/META-INF/suspendables", + supersFile: "$sourceSets.main.output.resourcesDir/META-INF/suspendable-supers") { + fileset(dir: sourceSets.main.output.classesDir) + } +} + +jar.dependsOn quasarScan \ No newline at end of file diff --git a/core/src/main/kotlin/core/node/ServiceHub.kt b/core/src/main/kotlin/core/node/ServiceHub.kt index ec36bb412c..73e491486b 100644 --- a/core/src/main/kotlin/core/node/ServiceHub.kt +++ b/core/src/main/kotlin/core/node/ServiceHub.kt @@ -3,8 +3,7 @@ package core.node import core.contracts.* import core.crypto.SecureHash import core.messaging.MessagingService -import core.node.services.IdentityService -import core.node.subsystems.* +import core.node.services.* import core.utilities.RecordingMap import java.time.Clock @@ -24,7 +23,6 @@ interface ServiceHub { val storageService: StorageService val networkService: MessagingService val networkMapCache: NetworkMapCache - val monitoringService: MonitoringService val clock: Clock /** diff --git a/core/src/main/kotlin/core/node/subsystems/NetworkMapCache.kt b/core/src/main/kotlin/core/node/services/NetworkMapCache.kt similarity index 93% rename from core/src/main/kotlin/core/node/subsystems/NetworkMapCache.kt rename to core/src/main/kotlin/core/node/services/NetworkMapCache.kt index f1e7e3f9e4..992198b3d0 100644 --- a/core/src/main/kotlin/core/node/subsystems/NetworkMapCache.kt +++ b/core/src/main/kotlin/core/node/services/NetworkMapCache.kt @@ -1,19 +1,13 @@ -package core.node.subsystems +package core.node.services import com.google.common.util.concurrent.ListenableFuture import core.contracts.Contract import core.crypto.Party -import core.crypto.SecureHash import core.messaging.MessagingService import core.node.NodeInfo -import core.node.services.* -import core.serialization.deserialize -import core.serialization.serialize +import core.node.services.ServiceType import org.slf4j.LoggerFactory import java.security.PublicKey -import java.security.SignatureException -import java.util.* -import javax.annotation.concurrent.ThreadSafe /** * A network map contains lists of nodes on the network along with information about their identity keys, services diff --git a/core/src/main/kotlin/core/node/subsystems/Services.kt b/core/src/main/kotlin/core/node/services/Services.kt similarity index 93% rename from core/src/main/kotlin/core/node/subsystems/Services.kt rename to core/src/main/kotlin/core/node/services/Services.kt index f9978f71fa..1f4fdf70eb 100644 --- a/core/src/main/kotlin/core/node/subsystems/Services.kt +++ b/core/src/main/kotlin/core/node/services/Services.kt @@ -1,12 +1,9 @@ -package core.node.subsystems +package core.node.services -import com.codahale.metrics.MetricRegistry -import core.* import core.contracts.* import core.crypto.Party import core.crypto.SecureHash import core.node.services.AttachmentStorage -import core.node.storage.CheckpointStorage import java.security.KeyPair import java.security.PrivateKey import java.security.PublicKey @@ -128,8 +125,6 @@ interface StorageService { */ val validatedTransactions: MutableMap - val checkpointStorage: CheckpointStorage - /** Provides access to storage of arbitrary JAR files (which may contain only data, no code). */ val attachments: AttachmentStorage @@ -141,9 +136,4 @@ interface StorageService { val myLegalIdentityKey: KeyPair } -/** - * Provides access to various metrics and ways to notify monitoring services of things, for sysadmin purposes. - * This is not an interface because it is too lightweight to bother mocking out. - */ -class MonitoringService(val metrics: MetricRegistry) diff --git a/core/src/main/kotlin/core/node/services/testing/MockServices.kt b/core/src/main/kotlin/core/node/services/testing/MockServices.kt new file mode 100644 index 0000000000..737be869af --- /dev/null +++ b/core/src/main/kotlin/core/node/services/testing/MockServices.kt @@ -0,0 +1,113 @@ +package 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 org.slf4j.LoggerFactory +import java.io.ByteArrayInputStream +import java.io.ByteArrayOutputStream +import java.io.File +import java.io.InputStream +import java.security.KeyPair +import java.security.PrivateKey +import java.security.PublicKey +import java.util.* +import java.util.jar.JarInputStream +import javax.annotation.concurrent.ThreadSafe + +@ThreadSafe +class MockIdentityService(val identities: List) : IdentityService { + private val keyToParties: Map + get() = synchronized(identities) { identities.associateBy { it.owningKey } } + private val nameToParties: Map + get() = synchronized(identities) { identities.associateBy { it.name } } + + override fun registerIdentity(party: Party) { throw UnsupportedOperationException() } + override fun partyFromKey(key: PublicKey): Party? = keyToParties[key] + override fun partyFromName(name: String): Party? = nameToParties[name] +} + + +class MockKeyManagementService(vararg initialKeys: KeyPair) : KeyManagementService { + override val keys: MutableMap + + init { + keys = initialKeys.map { it.public to it.private }.toMap(HashMap()) + } + + val nextKeys = LinkedList() + + override fun freshKey(): KeyPair { + val k = nextKeys.poll() ?: generateKeyPair() + keys[k.public] = k.private + return k + } +} + +class MockAttachmentStorage : AttachmentStorage { + val files = HashMap() + + override fun openAttachment(id: SecureHash): Attachment? { + val f = files[id] ?: return null + return object : Attachment { + override fun open(): InputStream = ByteArrayInputStream(f) + override val id: SecureHash = id + } + } + + override fun importAttachment(jar: InputStream): SecureHash { + // JIS makes read()/readBytes() return bytes of the current file, but we want to hash the entire container here. + require(jar !is JarInputStream) + + val bytes = run { + val s = ByteArrayOutputStream() + jar.copyTo(s) + s.close() + s.toByteArray() + } + val sha256 = bytes.sha256() + if (files.containsKey(sha256)) + throw FileAlreadyExistsException(File("!! MOCK FILE NAME")) + files[sha256] = bytes + return sha256 + } +} + + +@ThreadSafe +class MockStorageService(override val attachments: AttachmentStorage = MockAttachmentStorage(), + override val myLegalIdentityKey: KeyPair = generateKeyPair(), + override val myLegalIdentity: Party = Party("Unit test party", myLegalIdentityKey.public), +// This parameter is for unit tests that want to observe operation details. + val recordingAs: (String) -> String = { tableName -> "" }) +: StorageService { + protected val tables = HashMap>() + + private fun getMapOriginal(tableName: String): MutableMap { + synchronized(tables) { + @Suppress("UNCHECKED_CAST") + return tables.getOrPut(tableName) { + recorderWrap(Collections.synchronizedMap(HashMap()), tableName) + } as MutableMap + } + } + + private fun recorderWrap(map: MutableMap, tableName: String): MutableMap { + if (recordingAs(tableName) != "") + return RecordingMap(map, LoggerFactory.getLogger("recordingmap.${recordingAs(tableName)}")) + else + return map + } + + override val validatedTransactions: MutableMap + get() = getMapOriginal("validated-transactions") + +} diff --git a/core/src/main/kotlin/core/serialization/Kryo.kt b/core/src/main/kotlin/core/serialization/Kryo.kt index bf20a92881..37acca91ae 100644 --- a/core/src/main/kotlin/core/serialization/Kryo.kt +++ b/core/src/main/kotlin/core/serialization/Kryo.kt @@ -8,7 +8,6 @@ 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.* import core.contracts.* import core.crypto.SecureHash import core.crypto.generateKeyPair diff --git a/node/src/test/kotlin/core/testutils/TestUtils.kt b/core/src/main/kotlin/core/testing/TestUtils.kt similarity index 84% rename from node/src/test/kotlin/core/testutils/TestUtils.kt rename to core/src/main/kotlin/core/testing/TestUtils.kt index 76a7c193dc..ea76bdc1f4 100644 --- a/node/src/test/kotlin/core/testutils/TestUtils.kt +++ b/core/src/main/kotlin/core/testing/TestUtils.kt @@ -1,17 +1,15 @@ @file:Suppress("UNUSED_PARAMETER", "UNCHECKED_CAST") -package core.testutils +package core.testing import com.google.common.base.Throwables import com.google.common.net.HostAndPort -import contracts.* import core.* import core.contracts.* import core.crypto.* -import core.node.AbstractNode import core.serialization.serialize -import core.testing.MockIdentityService -import core.visualiser.GraphVisualiser +import core.node.services.testing.MockIdentityService +import core.node.services.testing.MockStorageService import java.net.ServerSocket import java.security.KeyPair import java.security.PublicKey @@ -73,31 +71,10 @@ val DUMMY_NOTARY = Party("Notary Service", DUMMY_NOTARY_KEY.public) val ALL_TEST_KEYS = listOf(MEGA_CORP_KEY, MINI_CORP_KEY, ALICE_KEY, BOB_KEY, DUMMY_NOTARY_KEY) -val MockIdentityService = MockIdentityService(listOf(MEGA_CORP, MINI_CORP, DUMMY_NOTARY)) +val MOCK_IDENTITY_SERVICE = MockIdentityService(listOf(MEGA_CORP, MINI_CORP, DUMMY_NOTARY)) -// In a real system this would be a persistent map of hash to bytecode and we'd instantiate the object as needed inside -// a sandbox. For unit tests we just have a hard-coded list. -val TEST_PROGRAM_MAP: Map> = mapOf( - CASH_PROGRAM_ID to Cash::class.java, - CP_PROGRAM_ID to CommercialPaper::class.java, - JavaCommercialPaper.JCP_PROGRAM_ID to JavaCommercialPaper::class.java, - CROWDFUND_PROGRAM_ID to CrowdFund::class.java, - DUMMY_PROGRAM_ID to DummyContract::class.java, - IRS_PROGRAM_ID to InterestRateSwap::class.java -) - -fun generateState(notary: Party = DUMMY_NOTARY) = DummyContract.State(Random().nextInt(), notary) fun generateStateRef() = StateRef(SecureHash.randomSHA256(), 0) -fun issueState(node: AbstractNode, notary: Party = DUMMY_NOTARY): StateRef { - val tx = DummyContract().generateInitial(node.info.identity.ref(0), Random().nextInt(), DUMMY_NOTARY) - tx.signWith(node.storage.myLegalIdentityKey) - tx.signWith(DUMMY_NOTARY_KEY) - val stx = tx.toSignedTransaction() - node.services.recordTransactions(listOf(stx)) - return StateRef(stx.id, 0) -} - //////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // // Defines a simple DSL for building pseudo-transactions (not the same as the wire protocol) for testing purposes. @@ -119,14 +96,6 @@ fun issueState(node: AbstractNode, notary: Party = DUMMY_NOTARY): StateRef { // // TODO: Make it impossible to forget to test either a failure or an accept for each transaction{} block -infix fun Cash.State.`owned by`(owner: PublicKey) = copy(owner = owner) -infix fun Cash.State.`issued by`(party: Party) = copy(deposit = deposit.copy(party = party)) -infix fun CommercialPaper.State.`owned by`(owner: PublicKey) = this.copy(owner = owner) -infix fun ICommercialPaperState.`owned by`(new_owner: PublicKey) = this.withOwner(new_owner) - -// Allows you to write 100.DOLLARS.CASH -val Amount.CASH: Cash.State get() = Cash.State(MINI_CORP.ref(1, 2, 3), this, NullPublicKey, DUMMY_NOTARY) - class LabeledOutput(val label: String?, val state: ContractState) { override fun toString() = state.toString() + (if (label != null) " ($label)" else "") override fun equals(other: Any?) = other is LabeledOutput && state.equals(other.state) @@ -143,7 +112,7 @@ abstract class AbstractTransactionForTest { open fun output(label: String? = null, s: () -> ContractState) = LabeledOutput(label, s()).apply { outStates.add(this) } protected fun commandsToAuthenticatedObjects(): List> { - return commands.map { AuthenticatedObject(it.signers, it.signers.mapNotNull { MockIdentityService.partyFromKey(it) }, it.value) } + return commands.map { AuthenticatedObject(it.signers, it.signers.mapNotNull { MOCK_IDENTITY_SERVICE.partyFromKey(it) }, it.value) } } fun attachment(attachmentID: SecureHash) { @@ -177,7 +146,7 @@ open class TransactionForTest : AbstractTransactionForTest() { protected fun runCommandsAndVerify(time: Instant) { val cmds = commandsToAuthenticatedObjects() - val tx = TransactionForVerification(inStates, outStates.map { it.state }, emptyList(), cmds, SecureHash.randomSHA256()) + val tx = TransactionForVerification(inStates, outStates.map { it.state }, emptyList(), cmds, SecureHash.Companion.randomSHA256()) tx.verify() } @@ -334,8 +303,8 @@ class TransactionGroupDSL(private val stateType: Class) { } fun toTransactionGroup() = TransactionGroup( - txns.map { it.toLedgerTransaction(MockIdentityService, MockStorageService().attachments) }.toSet(), - rootTxns.map { it.toLedgerTransaction(MockIdentityService, MockStorageService().attachments) }.toSet() + txns.map { it.toLedgerTransaction(MOCK_IDENTITY_SERVICE, MockStorageService().attachments) }.toSet(), + rootTxns.map { it.toLedgerTransaction(MOCK_IDENTITY_SERVICE, MockStorageService().attachments) }.toSet() ) class Failed(val index: Int, cause: Throwable) : Exception("Transaction $index didn't verify", cause) @@ -361,11 +330,6 @@ class TransactionGroupDSL(private val stateType: Class) { return e } - fun visualise() { - @Suppress("CAST_NEVER_SUCCEEDS") - GraphVisualiser(this as TransactionGroupDSL).display() - } - fun signAll(txnsToSign: List = txns, vararg extraKeys: KeyPair): List { return txnsToSign.map { wtx -> val allPubKeys = wtx.commands.flatMap { it.signers }.toMutableSet() diff --git a/node/src/main/resources/core/node/cities.txt b/core/src/main/resources/core/node/cities.txt similarity index 100% rename from node/src/main/resources/core/node/cities.txt rename to core/src/main/resources/core/node/cities.txt diff --git a/node/src/test/resources/core/node/isolated.jar b/core/src/main/resources/core/node/isolated.jar similarity index 100% rename from node/src/test/resources/core/node/isolated.jar rename to core/src/main/resources/core/node/isolated.jar diff --git a/node/src/test/kotlin/core/TransactionGroupTests.kt b/core/src/test/kotlin/core/contracts/TransactionGroupTests.kt similarity index 62% rename from node/src/test/kotlin/core/TransactionGroupTests.kt rename to core/src/test/kotlin/core/contracts/TransactionGroupTests.kt index f14e0097fb..32694c393d 100644 --- a/node/src/test/kotlin/core/TransactionGroupTests.kt +++ b/core/src/test/kotlin/core/contracts/TransactionGroupTests.kt @@ -1,15 +1,43 @@ -package core +package core.contracts -import contracts.Cash -import core.contracts.* -import core.testutils.* +import core.crypto.Party +import core.crypto.SecureHash +import core.node.services.testing.MockStorageService +import core.testing.* import org.junit.Test +import java.security.PublicKey +import java.security.SecureRandom import kotlin.test.assertEquals import kotlin.test.assertFailsWith import kotlin.test.assertNotEquals +val TEST_PROGRAM_ID = TransactionGroupTests.TestCash() + class TransactionGroupTests { - val A_THOUSAND_POUNDS = Cash.State(MINI_CORP.ref(1, 2, 3), 1000.POUNDS, MINI_CORP_PUBKEY, DUMMY_NOTARY) + val A_THOUSAND_POUNDS = TestCash.State(MINI_CORP.ref(1, 2, 3), 1000.POUNDS, MINI_CORP_PUBKEY, DUMMY_NOTARY) + + class TestCash : Contract { + override val legalContractReference = SecureHash.sha256("TestCash") + + override fun verify(tx: TransactionForVerification) { + } + + data class State( + val deposit: PartyAndReference, + val amount: Amount, + override val owner: PublicKey, + override val notary: Party) : OwnableState { + override val contract: Contract = TEST_PROGRAM_ID + override fun withNewOwner(newOwner: PublicKey) = Pair(Commands.Move(), copy(owner = newOwner)) + } + interface Commands : CommandData { + class Move() : TypeOnlyCommandData(), Commands + data class Issue(val nonce: Long = SecureRandom.getInstanceStrong().nextLong()) : Commands + data class Exit(val amount: Amount) : Commands + } + } + + infix fun TestCash.State.`owned by`(owner: PublicKey) = copy(owner = owner) @Test fun success() { @@ -21,13 +49,13 @@ class TransactionGroupTests { transaction { input("£1000") output("alice's £1000") { A_THOUSAND_POUNDS `owned by` ALICE_PUBKEY } - arg(MINI_CORP_PUBKEY) { Cash.Commands.Move() } + arg(MINI_CORP_PUBKEY) { TestCash.Commands.Move() } } transaction { input("alice's £1000") - arg(ALICE_PUBKEY) { Cash.Commands.Move() } - arg(MINI_CORP_PUBKEY) { Cash.Commands.Exit(1000.POUNDS) } + arg(ALICE_PUBKEY) { TestCash.Commands.Move() } + arg(MINI_CORP_PUBKEY) { TestCash.Commands.Exit(1000.POUNDS) } } verify() @@ -39,7 +67,7 @@ class TransactionGroupTests { transactionGroup { val t = transaction { output("cash") { A_THOUSAND_POUNDS } - arg(MINI_CORP_PUBKEY) { Cash.Commands.Issue() } + arg(MINI_CORP_PUBKEY) { TestCash.Commands.Issue() } } val conflict1 = transaction { @@ -47,7 +75,7 @@ class TransactionGroupTests { val HALF = A_THOUSAND_POUNDS.copy(amount = 500.POUNDS) `owned by` BOB_PUBKEY output { HALF } output { HALF } - arg(MINI_CORP_PUBKEY) { Cash.Commands.Move() } + arg(MINI_CORP_PUBKEY) { TestCash.Commands.Move() } } verify() @@ -58,7 +86,7 @@ class TransactionGroupTests { val HALF = A_THOUSAND_POUNDS.copy(amount = 500.POUNDS) `owned by` ALICE_PUBKEY output { HALF } output { HALF } - arg(MINI_CORP_PUBKEY) { Cash.Commands.Move() } + arg(MINI_CORP_PUBKEY) { TestCash.Commands.Move() } } assertNotEquals(conflict1, conflict2) @@ -77,7 +105,7 @@ class TransactionGroupTests { val tg = transactionGroup { transaction { output("cash") { A_THOUSAND_POUNDS } - arg(MINI_CORP_PUBKEY) { Cash.Commands.Issue() } + arg(MINI_CORP_PUBKEY) { TestCash.Commands.Issue() } } transaction { @@ -92,7 +120,7 @@ class TransactionGroupTests { tg.txns += TransactionBuilder().apply { addInputState(input) addOutputState(A_THOUSAND_POUNDS) - addCommand(Cash.Commands.Move(), BOB_PUBKEY) + addCommand(TestCash.Commands.Move(), BOB_PUBKEY) }.toWireTransaction() val e = assertFailsWith(TransactionResolutionException::class) { @@ -113,7 +141,7 @@ class TransactionGroupTests { input("£1000") input("£1000") output { A_THOUSAND_POUNDS.copy(amount = A_THOUSAND_POUNDS.amount * 2) } - arg(MINI_CORP_PUBKEY) { Cash.Commands.Move() } + arg(MINI_CORP_PUBKEY) { TestCash.Commands.Move() } } assertFailsWith(TransactionConflictException::class) { @@ -127,25 +155,25 @@ class TransactionGroupTests { val signedTxns: List = transactionGroup { transaction { output("£1000") { A_THOUSAND_POUNDS } - arg(MINI_CORP_PUBKEY) { Cash.Commands.Issue() } + arg(MINI_CORP_PUBKEY) { TestCash.Commands.Issue() } } transaction { input("£1000") output("alice's £1000") { A_THOUSAND_POUNDS `owned by` ALICE_PUBKEY } - arg(MINI_CORP_PUBKEY) { Cash.Commands.Move() } + arg(MINI_CORP_PUBKEY) { TestCash.Commands.Move() } } transaction { input("alice's £1000") - arg(ALICE_PUBKEY) { Cash.Commands.Move() } - arg(MINI_CORP_PUBKEY) { Cash.Commands.Exit(1000.POUNDS) } + arg(ALICE_PUBKEY) { TestCash.Commands.Move() } + arg(MINI_CORP_PUBKEY) { TestCash.Commands.Exit(1000.POUNDS) } } }.signAll() // Now go through the conversion -> verification path with them. val ltxns = signedTxns.map { - it.verifyToLedgerTransaction(MockIdentityService, MockStorageService().attachments) + it.verifyToLedgerTransaction(MOCK_IDENTITY_SERVICE, MockStorageService().attachments) }.toSet() TransactionGroup(ltxns, emptySet()).verify() } diff --git a/node/src/test/java/core/crypto/Base58Test.java b/core/src/test/kotlin/core/crypto/Base58Test.java similarity index 100% rename from node/src/test/java/core/crypto/Base58Test.java rename to core/src/test/kotlin/core/crypto/Base58Test.java diff --git a/node/src/test/kotlin/core/node/AttachmentClassLoaderTests.kt b/core/src/test/kotlin/core/node/AttachmentClassLoaderTests.kt similarity index 87% rename from node/src/test/kotlin/core/node/AttachmentClassLoaderTests.kt rename to core/src/test/kotlin/core/node/AttachmentClassLoaderTests.kt index df29092342..e24e12ef23 100644 --- a/node/src/test/kotlin/core/node/AttachmentClassLoaderTests.kt +++ b/core/src/test/kotlin/core/node/AttachmentClassLoaderTests.kt @@ -1,15 +1,13 @@ package core.node -import contracts.DUMMY_PROGRAM_ID -import contracts.DummyContract -import core.* 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.testutils.DUMMY_NOTARY -import core.testutils.MEGA_CORP +import core.testing.DUMMY_NOTARY +import core.testing.MEGA_CORP import org.apache.commons.io.IOUtils import org.junit.Test import java.io.ByteArrayInputStream @@ -26,11 +24,36 @@ interface DummyContractBackdoor { fun inspectState(state: ContractState): Int } +val ATTACHMENT_TEST_PROGRAM_ID = AttachmentClassLoaderTests.AttachmentDummyContract() + class AttachmentClassLoaderTests { companion object { val ISOLATED_CONTRACTS_JAR_PATH = AttachmentClassLoaderTests::class.java.getResource("isolated.jar") } + class AttachmentDummyContract : Contract { + class State(val magicNumber: Int = 0, + override val notary: Party) : ContractState { + override val contract = ATTACHMENT_TEST_PROGRAM_ID + } + + interface Commands : CommandData { + class Create : TypeOnlyCommandData(), Commands + } + + override fun verify(tx: TransactionForVerification) { + // Always accepts. + } + + // The "empty contract" + override val legalContractReference: SecureHash = SecureHash.sha256("") + + fun generateInitial(owner: PartyAndReference, magicNumber: Int, notary: Party): TransactionBuilder { + val state = State(magicNumber, notary) + return TransactionBuilder().withItems(state, Command(Commands.Create(), owner.party.owningKey)) + } + } + fun importJar(storage: AttachmentStorage) = ISOLATED_CONTRACTS_JAR_PATH.openStream().use { storage.importAttachment(it) } // These ClassLoaders work together to load 'AnotherDummyContract' in a disposable way, such that even though @@ -123,7 +146,7 @@ class AttachmentClassLoaderTests { @Test fun `verify that contract DummyContract is in classPath`() { - val contractClass = Class.forName("contracts.DummyContract") + val contractClass = Class.forName("core.node.AttachmentClassLoaderTests\$AttachmentDummyContract") val contract = contractClass.newInstance() as Contract assertNotNull(contract) @@ -186,13 +209,13 @@ class AttachmentClassLoaderTests { @Test fun `test serialization of WireTransaction with statically loaded contract`() { - val tx = DUMMY_PROGRAM_ID.generateInitial(MEGA_CORP.ref(0), 42, DUMMY_NOTARY) + val tx = ATTACHMENT_TEST_PROGRAM_ID.generateInitial(MEGA_CORP.ref(0), 42, DUMMY_NOTARY) val wireTransaction = tx.toWireTransaction() val bytes = wireTransaction.serialize() val copiedWireTransaction = bytes.deserialize() assertEquals(1, copiedWireTransaction.outputs.size) - assertEquals(42, (copiedWireTransaction.outputs[0] as DummyContract.State).magicNumber) + assertEquals(42, (copiedWireTransaction.outputs[0] as AttachmentDummyContract.State).magicNumber) } @Test diff --git a/node/src/test/kotlin/core/serialization/KryoTests.kt b/core/src/test/kotlin/core/serialization/KryoTests.kt similarity index 100% rename from node/src/test/kotlin/core/serialization/KryoTests.kt rename to core/src/test/kotlin/core/serialization/KryoTests.kt diff --git a/core/src/test/kotlin/core/serialization/SerializationTokenTest.kt b/core/src/test/kotlin/core/serialization/SerializationTokenTest.kt index 64431bb830..346364457b 100644 --- a/core/src/test/kotlin/core/serialization/SerializationTokenTest.kt +++ b/core/src/test/kotlin/core/serialization/SerializationTokenTest.kt @@ -74,6 +74,7 @@ class SerializationTokenTest { @Test(expected = IllegalStateException::class) fun `unannotated throws`() { + @Suppress("UNUSED_VARIABLE") val tokenizableBefore = UnannotatedSerializeAsSingletonToken() } } \ No newline at end of file diff --git a/node/src/test/kotlin/core/serialization/TransactionSerializationTests.kt b/core/src/test/kotlin/core/serialization/TransactionSerializationTests.kt similarity index 58% rename from node/src/test/kotlin/core/serialization/TransactionSerializationTests.kt rename to core/src/test/kotlin/core/serialization/TransactionSerializationTests.kt index 5c4999daa1..5c2fd978ae 100644 --- a/node/src/test/kotlin/core/serialization/TransactionSerializationTests.kt +++ b/core/src/test/kotlin/core/serialization/TransactionSerializationTests.kt @@ -1,21 +1,48 @@ package core.serialization -import contracts.Cash -import core.* import core.contracts.* -import core.testutils.* +import core.crypto.Party +import core.crypto.SecureHash +import core.node.services.testing.MockStorageService +import core.seconds +import core.testing.* import org.junit.Before import org.junit.Test +import java.security.PublicKey +import java.security.SecureRandom import java.security.SignatureException import kotlin.test.assertEquals import kotlin.test.assertFailsWith +val TEST_PROGRAM_ID = TransactionSerializationTests.TestCash() + class TransactionSerializationTests { - // Simple TX that takes 1000 pounds from me and sends 600 to someone else (with 400 change). + class TestCash : Contract { + override val legalContractReference = SecureHash.sha256("TestCash") + + override fun verify(tx: TransactionForVerification) { + } + + data class State( + val deposit: PartyAndReference, + val amount: Amount, + override val owner: PublicKey, + override val notary: Party) : OwnableState { + override val contract: Contract = TEST_PROGRAM_ID + override fun withNewOwner(newOwner: PublicKey) = Pair(Commands.Move(), copy(owner = newOwner)) + } + interface Commands : CommandData { + class Move() : TypeOnlyCommandData(), Commands + data class Issue(val nonce: Long = SecureRandom.getInstanceStrong().nextLong()) : Commands + data class Exit(val amount: Amount) : Commands + } + } + + // Simple TX that takes 1000 pounds from me and sends 600 to someone else (with 400 change). // It refers to a fake TX/state that we don't bother creating here. val depositRef = MINI_CORP.ref(1) - val outputState = Cash.State(depositRef, 600.POUNDS, DUMMY_PUBKEY_1, DUMMY_NOTARY) - val changeState = Cash.State(depositRef, 400.POUNDS, TestUtils.keypair.public, DUMMY_NOTARY) + val outputState = TestCash.State(depositRef, 600.POUNDS, DUMMY_PUBKEY_1, DUMMY_NOTARY) + val changeState = TestCash.State(depositRef, 400.POUNDS, TestUtils.keypair.public, DUMMY_NOTARY) val fakeStateRef = generateStateRef() lateinit var tx: TransactionBuilder @@ -23,7 +50,7 @@ class TransactionSerializationTests { @Before fun setup() { tx = TransactionBuilder().withItems( - fakeStateRef, outputState, changeState, Command(Cash.Commands.Move(), arrayListOf(TestUtils.keypair.public)) + fakeStateRef, outputState, changeState, Command(TestCash.Commands.Move(), arrayListOf(TestUtils.keypair.public)) ) } @@ -60,7 +87,7 @@ class TransactionSerializationTests { // If the signature was replaced in transit, we don't like it. assertFailsWith(SignatureException::class) { val tx2 = TransactionBuilder().withItems(fakeStateRef, outputState, changeState, - Command(Cash.Commands.Move(), TestUtils.keypair2.public)) + Command(TestCash.Commands.Move(), TestUtils.keypair2.public)) tx2.signWith(TestUtils.keypair2) signedTX.copy(sigs = tx2.toSignedTransaction().sigs).verify() @@ -73,7 +100,7 @@ class TransactionSerializationTests { tx.signWith(TestUtils.keypair) tx.signWith(DUMMY_NOTARY_KEY) val stx = tx.toSignedTransaction() - val ltx = stx.verifyToLedgerTransaction(MockIdentityService, MockStorageService().attachments) + val ltx = stx.verifyToLedgerTransaction(MOCK_IDENTITY_SERVICE, MockStorageService().attachments) assertEquals(tx.commands().map { it.value }, ltx.commands.map { it.value }) assertEquals(tx.inputStates(), ltx.inputs) assertEquals(tx.outputStates(), ltx.outputs) diff --git a/node/src/test/kotlin/core/utilities/CollectionExtensionTests.kt b/core/src/test/kotlin/core/utilities/CollectionExtensionTests.kt similarity index 100% rename from node/src/test/kotlin/core/utilities/CollectionExtensionTests.kt rename to core/src/test/kotlin/core/utilities/CollectionExtensionTests.kt diff --git a/docs/build/html/api/alltypes/index.html b/docs/build/html/api/alltypes/index.html index c3ff70f22b..c5d370f7c6 100644 --- a/docs/build/html/api/alltypes/index.html +++ b/docs/build/html/api/alltypes/index.html @@ -9,7 +9,7 @@ -core.utilities.ANSIProgressRenderer +node.utilities.ANSIProgressRenderer

Knows how to render a ProgressTracker to the terminal using coloured, emoji-fied output. Useful when writing small command line tools, demos, tests etc. Just set the progressTracker field and it will go ahead and start drawing @@ -18,20 +18,20 @@ if the terminal supports it. Otherwise it just prints out the name of the step w -api.APIServer +node.api.APIServer

Top level interface to external interaction with the distributed ledger.

-api.APIServerImpl +node.internal.APIServerImpl -core.node.AbstractNode +node.internal.AbstractNode

A base node implementation that can be customised either for production (with real implementations that do real I/O), or a mock implementation suitable for unit test environments.

@@ -39,7 +39,7 @@ I/O), or a mock implementation suitable for unit test environments.

-core.node.services.AbstractNodeService +node.services.api.AbstractNodeService

Abstract superclass for services that a node can host, which provides helper functions.

@@ -54,7 +54,7 @@ fields such as replyTo and replyToTopic.

-core.node.AcceptsFileUpload +node.services.api.AcceptsFileUpload

A service that implements AcceptsFileUpload can have new binary data provided to it via an HTTP upload.

@@ -69,14 +69,14 @@ We dont actually do anything with this yet though, so its ignored for now.

-core.utilities.AddOrRemove +node.utilities.AddOrRemove

Enum for when adding/removing something, for example adding or removing an entry in a directory.

-core.utilities.AffinityExecutor +node.utilities.AffinityExecutor

An extended executor interface that supports thread affinity assertions and short circuiting. This can be useful for ensuring code runs on the right thread, and also for unit testing.

@@ -98,7 +98,7 @@ for ensuring code runs on the right thread, and also for unit testing.

-core.node.subsystems.ArtemisMessagingService +node.services.messaging.ArtemisMessagingService

This class implements the MessagingService API using Apache Artemis, the successor to their ActiveMQ product. Artemis is a message queue broker and here, we embed the entire server inside our own process. Nodes communicate @@ -117,7 +117,7 @@ of how attachments are meant to be used include:

-core.node.servlets.AttachmentDownloadServlet +node.servlets.AttachmentDownloadServlet

Allows the node administrator to either download full attachment zips, or individual files within those zips.

@@ -195,13 +195,13 @@ the same transaction.

-core.node.storage.Checkpoint +node.services.api.Checkpoint -core.node.storage.CheckpointStorage +node.services.api.CheckpointStorage

Thread-safe storage of fiber checkpoints.

@@ -235,7 +235,7 @@ the same transaction.

-api.Config +node.servlets.Config

Primary purpose is to install Kotlin extensions for Jackson ObjectMapper so data classes work and to organise serializers / deserializers for java.time.* classes as necessary

@@ -243,7 +243,7 @@ and to organise serializers / deserializers for java.time.* classes as necessary -core.node.ConfigurationException +node.internal.ConfigurationException @@ -259,20 +259,20 @@ timestamp attached to the transaction itself i.e. it is NOT necessarily the curr -api.ContractClassRef +node.api.ContractClassRef -api.ContractDefRef +node.api.ContractDefRef

Encapsulates the contract type. e.g. Cash or CommercialPaper etc.

-api.ContractLedgerRef +node.api.ContractLedgerRef @@ -303,14 +303,14 @@ return the funds to the pledge-makers (if the target has not been reached).

-core.node.servlets.DataUploadServlet +node.servlets.DataUploadServlet

Accepts binary streams, finds the right AcceptsFileUpload implementor and hands the stream off to it.

-core.node.subsystems.DataVendingService +node.services.persistence.DataVendingService

This class sets up network message handlers for requests from peers for data keyed by hash. It is a piece of simple glue that sits between the network layer and the database layer.

@@ -407,7 +407,7 @@ building partially signed transactions.

-core.node.subsystems.E2ETestKeyManagementService +node.services.keys.E2ETestKeyManagementService

A simple in-memory KMS that doesnt bother saving keys to disk. A real implementation would:

@@ -534,7 +534,7 @@ that would divide into (eg annually = 1, semiannual = 2, monthly = 12 etc).

-core.testing.IRSSimulation +node.internal.testing.IRSSimulation

A simulation in which banks execute interest rate swaps with each other, including the fixing events.

@@ -558,14 +558,14 @@ set via the constructor and the class is immutable.

-core.node.subsystems.InMemoryIdentityService +node.services.identity.InMemoryIdentityService

Simple identity service which caches parties and provides functionality for efficient lookup.

-core.testing.InMemoryMessagingNetwork +node.services.network.InMemoryMessagingNetwork

An in-memory network allows you to manufacture InMemoryMessagings for a set of participants. Each InMemoryMessaging maintains a queue of messages it has received, and a background thread that dispatches @@ -576,14 +576,14 @@ testing).

-core.node.subsystems.InMemoryNetworkMapCache +node.services.network.InMemoryNetworkMapCache

Extremely simple in-memory cache of the network map.

-core.node.services.InMemoryNetworkMapService +node.services.network.InMemoryNetworkMapService @@ -649,7 +649,7 @@ This is just a representation of a vanilla Fixed vs Floating (same currency) IRS -core.utilities.JsonSupport +node.utilities.JsonSupport

Utilities and serialisers for working with JSON representations of basic types. This adds Jackson support for the java.time API, some core types, and Kotlin data classes.

@@ -657,7 +657,7 @@ the java.time API, some core types, and Kotlin data classes.

-core.node.subsystems.KeyManagementService +core.node.services.KeyManagementService

The KMS is responsible for storing and using private keys to sign things. An implementation of this may, for example, call out to a hardware security module that enforces various auditing and frequency-of-use requirements.

@@ -765,7 +765,7 @@ may let you cast the returned future to an object that lets you get status info. -core.testing.MockIdentityService +core.testservices.MockIdentityService

Scaffolding: a dummy identity service that just expects to have identities loaded off disk or found elsewhere. This class allows the provided list of identities to be mutated after construction, so it takes the list lock @@ -775,7 +775,7 @@ MockNetwork code.

-core.testing.MockNetwork +node.internal.testing.MockNetwork

A mock node brings up a suite of in-memory services in a fast manner suitable for unit testing. Components that do IO are either swapped out for mocks, or pointed to a Jimfs in memory filesystem.

@@ -783,7 +783,7 @@ Components that do IO are either swapped out for mocks, or pointed to a -core.testing.MockNetworkMapCache +node.services.network.MockNetworkMapCache

Network map cache with no backing map service.

@@ -805,13 +805,13 @@ This is not an interface because it is too lightweight to bother mocking out.

-core.node.subsystems.NetworkCacheError +core.node.services.NetworkCacheError -core.node.subsystems.NetworkMapCache +core.node.services.NetworkMapCache

A network map contains lists of nodes on the network along with information about their identity keys, services they provide and host names or IP addresses where they can be connected to. The cache wraps around a map fetched @@ -821,7 +821,7 @@ with a specified network map service, which it fetches data from and then subscr -core.node.services.NetworkMapService +node.services.network.NetworkMapService

A network map contains lists of nodes on the network along with information about their identity keys, services they provide and host names or IP addresses where they can be connected to. This information is cached locally within @@ -831,7 +831,7 @@ replace each other based on a serial number present in the change.

-core.node.Node +node.internal.Node

A Node manages a standalone server that takes part in the P2P network. It creates the services found in ServiceHub, loads important data off disk and starts listening for connections.

@@ -839,20 +839,20 @@ loads important data off disk and starts listening for connections.

-core.node.services.NodeAttachmentService +node.services.persistence.NodeAttachmentService

Stores attachments in the specified local directory, which must exist. Doesnt allow new attachments to be uploaded.

-core.node.NodeConfiguration +node.services.config.NodeConfiguration -core.node.NodeConfigurationFromConfig +node.services.config.NodeConfigurationFromConfig @@ -865,7 +865,7 @@ loads important data off disk and starts listening for connections.

-core.node.services.NodeInterestRates +node.services.clientapi.NodeInterestRates

An interest rates service is an oracle that signs transactions which contain embedded assertions about an interest rate fix (e.g. LIBOR, EURIBOR ...).

@@ -873,13 +873,13 @@ rate fix (e.g. LIBOR, EURIBOR ...).

-core.node.services.NodeMapError +node.services.network.NodeMapError -core.node.services.NodeRegistration +node.services.network.NodeRegistration

A node registration state in the network map.

@@ -894,7 +894,7 @@ add features like checking against other NTP servers to make sure the clock hasn -core.node.subsystems.NodeWalletService +node.services.wallet.NodeWalletService

This class implements a simple, in memory wallet that tracks states that are owned by us, and also has a convenience method to auto-generate some self-issued cash states that can be used for test trading. A real wallet would persist @@ -959,7 +959,7 @@ ledger. The reference is intended to be encrypted so its meaningless to anyone o -core.node.storage.PerFileCheckpointStorage +node.services.persistence.PerFileCheckpointStorage

File-based checkpoint storage, storing checkpoints per file.

@@ -1003,13 +1003,13 @@ a singleton).

-api.ProtocolClassRef +node.api.ProtocolClassRef -api.ProtocolInstanceRef +node.api.ProtocolInstanceRef @@ -1024,14 +1024,14 @@ a node crash, how many instances of your protocol there are running and so on. -api.ProtocolRef +node.api.ProtocolRef

Encapsulates the protocol to be instantiated. e.g. TwoPartyTradeProtocol.Buyer.

-api.ProtocolRequiringAttention +node.api.ProtocolRequiringAttention

Thinking that Instant is OK for short lived protocol deadlines.

@@ -1103,7 +1103,7 @@ e.g. LIBOR 6M as of 17 March 2016. Hence it requires a source (name) and a value -core.node.services.RegulatorService +node.services.api.RegulatorService

Placeholder interface for regulator services.

@@ -1125,7 +1125,7 @@ all the transactions have been successfully verified and inserted into the local -api.ResponseFilter +node.servlets.ResponseFilter

This adds headers needed for cross site scripting on API clients

@@ -1187,7 +1187,7 @@ contained within.

-core.testing.Simulation +node.internal.testing.Simulation

Base class for network simulations that are based on the unit test / mock environment.

@@ -1209,7 +1209,7 @@ Points at which polynomial pieces connect are known as knots.

-core.messaging.StackSnapshot +node.services.statemachine.StackSnapshot @@ -1222,7 +1222,7 @@ Points at which polynomial pieces connect are known as knots.

-core.messaging.StateMachineManager +node.services.statemachine.StateMachineManager

A StateMachineManager is responsible for coordination and persistence of multiple ProtocolStateMachine objects. Each such object represents an instantiation of a (two-party) protocol that has reached a particular point.

@@ -1238,14 +1238,14 @@ transaction defined the state and where in that transaction it was.

-api.StatesQuery +node.api.StatesQuery

Extremely rudimentary query language which should most likely be replaced with a product

-core.node.subsystems.StorageService +core.node.services.StorageService

A sketch of an interface to a simple key/value storage system. Intended for persistence of simple blobs like transactions, serialised protocol state machines and so on. Again, this isnt intended to imply lack of SQL or @@ -1254,7 +1254,7 @@ anything like that, this interface is only big enough to support the prototyping -core.node.subsystems.StorageServiceImpl +node.services.persistence.StorageServiceImpl @@ -1335,7 +1335,7 @@ themselves.

-core.testing.TradeSimulation +node.internal.testing.TradeSimulation

Simulates a never ending series of trades that go pair-wise through the banks (e.g. A and B trade with each other, then B and C trade with each other, then C and A etc).

@@ -1355,7 +1355,7 @@ then B and C trade with each other, then C and A etc).

-api.TransactionBuildStep +node.api.TransactionBuildStep

Encapsulate a generateXXX method call on a contract.

@@ -1469,7 +1469,7 @@ intended as the way things will necessarily be done longer term

-core.node.subsystems.Wallet +core.node.services.Wallet

A wallet (name may be temporary) wraps a set of states that are useful for us to keep track of, for instance, because we own them. This class represents an immutable, stable state of a wallet: it is guaranteed not to @@ -1479,7 +1479,7 @@ about new transactions from our peers and generate new transactions that consume -core.node.subsystems.WalletImpl +node.services.wallet.WalletImpl

A wallet (name may be temporary) wraps a set of states that are useful for us to keep track of, for instance, because we own them. This class represents an immutable, stable state of a wallet: it is guaranteed not to @@ -1489,7 +1489,7 @@ about new transactions from our peers and generate new transactions that consume -core.node.subsystems.WalletService +core.node.services.WalletService

A WalletService is responsible for securely and safely persisting the current state of a wallet to storage. The wallet service vends immutable snapshots of the current wallet for working with: if you build a transaction based @@ -1499,7 +1499,7 @@ consumed by someone else first

-core.node.services.WireNodeRegistration +node.services.network.WireNodeRegistration

A node registration and its signature as a pair.

diff --git a/docs/build/html/api/api/-a-p-i-server-impl/-init-.html b/docs/build/html/api/api/-a-p-i-server-impl/-init-.html index 18200d6124..6690ee2e39 100644 --- a/docs/build/html/api/api/-a-p-i-server-impl/-init-.html +++ b/docs/build/html/api/api/-a-p-i-server-impl/-init-.html @@ -7,7 +7,7 @@ api / APIServerImpl / <init>

<init>

-APIServerImpl(node: AbstractNode)
+APIServerImpl(node: AbstractNode)


diff --git a/docs/build/html/api/api/-a-p-i-server-impl/build-transaction.html b/docs/build/html/api/api/-a-p-i-server-impl/build-transaction.html index 6f618d718c..7c0449e677 100644 --- a/docs/build/html/api/api/-a-p-i-server-impl/build-transaction.html +++ b/docs/build/html/api/api/-a-p-i-server-impl/build-transaction.html @@ -7,8 +7,8 @@ api / APIServerImpl / buildTransaction

buildTransaction

- -fun buildTransaction(type: ContractDefRef, steps: List<TransactionBuildStep>): SerializedBytes<WireTransaction>
+ +fun buildTransaction(type: ContractDefRef, steps: List<TransactionBuildStep>): SerializedBytes<WireTransaction>
Overrides APIServer.buildTransaction

TransactionBuildSteps would be invocations of contract.generateXXX() methods that all share a common TransactionBuilder and a common contract type (e.g. Cash or CommercialPaper) diff --git a/docs/build/html/api/api/-a-p-i-server-impl/commit-transaction.html b/docs/build/html/api/api/-a-p-i-server-impl/commit-transaction.html index 5d1f347005..b6a5b26d29 100644 --- a/docs/build/html/api/api/-a-p-i-server-impl/commit-transaction.html +++ b/docs/build/html/api/api/-a-p-i-server-impl/commit-transaction.html @@ -7,8 +7,8 @@ api / APIServerImpl / commitTransaction

commitTransaction

- -fun commitTransaction(tx: SerializedBytes<WireTransaction>, signatures: List<WithKey>): SecureHash
+ +fun commitTransaction(tx: SerializedBytes<WireTransaction>, signatures: List<WithKey>): SecureHash
Overrides APIServer.commitTransaction

Attempt to commit transaction (returned from build transaction) with the necessary signatures for that to be successful, otherwise exception is thrown.

diff --git a/docs/build/html/api/api/-a-p-i-server-impl/fetch-protocols-requiring-attention.html b/docs/build/html/api/api/-a-p-i-server-impl/fetch-protocols-requiring-attention.html index 8452c98810..77bb4725e1 100644 --- a/docs/build/html/api/api/-a-p-i-server-impl/fetch-protocols-requiring-attention.html +++ b/docs/build/html/api/api/-a-p-i-server-impl/fetch-protocols-requiring-attention.html @@ -7,8 +7,8 @@ api / APIServerImpl / fetchProtocolsRequiringAttention

fetchProtocolsRequiringAttention

- -fun fetchProtocolsRequiringAttention(query: StatesQuery): Map<StateRef, ProtocolRequiringAttention>
+ +fun fetchProtocolsRequiringAttention(query: StatesQuery): Map<StateRef, ProtocolRequiringAttention>
Overrides APIServer.fetchProtocolsRequiringAttention

Fetch protocols that require a response to some prompt/question by a human (on the "bank" side).


diff --git a/docs/build/html/api/api/-a-p-i-server-impl/fetch-states.html b/docs/build/html/api/api/-a-p-i-server-impl/fetch-states.html index c737dadd81..e3bd8eece6 100644 --- a/docs/build/html/api/api/-a-p-i-server-impl/fetch-states.html +++ b/docs/build/html/api/api/-a-p-i-server-impl/fetch-states.html @@ -7,8 +7,8 @@ api / APIServerImpl / fetchStates

fetchStates

- -fun fetchStates(states: List<StateRef>): Map<StateRef, ContractState?>
+ +fun fetchStates(states: List<StateRef>): Map<StateRef, ContractState?>
Overrides APIServer.fetchStates


diff --git a/docs/build/html/api/api/-a-p-i-server-impl/fetch-transactions.html b/docs/build/html/api/api/-a-p-i-server-impl/fetch-transactions.html index 671bc729d6..a598b1c4ba 100644 --- a/docs/build/html/api/api/-a-p-i-server-impl/fetch-transactions.html +++ b/docs/build/html/api/api/-a-p-i-server-impl/fetch-transactions.html @@ -7,8 +7,8 @@ api / APIServerImpl / fetchTransactions

fetchTransactions

- -fun fetchTransactions(txs: List<SecureHash>): Map<SecureHash, SignedTransaction?>
+ +fun fetchTransactions(txs: List<SecureHash>): Map<SecureHash, SignedTransaction?>
Overrides APIServer.fetchTransactions

Query for immutable transactions (results can be cached indefinitely by their id/hash).

Parameters

diff --git a/docs/build/html/api/api/-a-p-i-server-impl/generate-transaction-signature.html b/docs/build/html/api/api/-a-p-i-server-impl/generate-transaction-signature.html index 46bed4c2b5..5e603d4de0 100644 --- a/docs/build/html/api/api/-a-p-i-server-impl/generate-transaction-signature.html +++ b/docs/build/html/api/api/-a-p-i-server-impl/generate-transaction-signature.html @@ -7,8 +7,8 @@ api / APIServerImpl / generateTransactionSignature

generateTransactionSignature

- -fun generateTransactionSignature(tx: SerializedBytes<WireTransaction>): WithKey
+ +fun generateTransactionSignature(tx: SerializedBytes<WireTransaction>): WithKey
Overrides APIServer.generateTransactionSignature

Generate a signature for this transaction signed by us.


diff --git a/docs/build/html/api/api/-a-p-i-server-impl/index.html b/docs/build/html/api/api/-a-p-i-server-impl/index.html index f2778a26f2..5c4f5c85ac 100644 --- a/docs/build/html/api/api/-a-p-i-server-impl/index.html +++ b/docs/build/html/api/api/-a-p-i-server-impl/index.html @@ -17,7 +17,7 @@ <init> -APIServerImpl(node: AbstractNode) +APIServerImpl(node: AbstractNode) @@ -39,7 +39,7 @@ buildTransaction -fun buildTransaction(type: ContractDefRef, steps: List<TransactionBuildStep>): SerializedBytes<WireTransaction>

TransactionBuildSteps would be invocations of contract.generateXXX() methods that all share a common TransactionBuilder +fun buildTransaction(type: ContractDefRef, steps: List<TransactionBuildStep>): SerializedBytes<WireTransaction>

TransactionBuildSteps would be invocations of contract.generateXXX() methods that all share a common TransactionBuilder and a common contract type (e.g. Cash or CommercialPaper) which would automatically be passed as the first argument (wed need that to be a criteria/pattern of the generateXXX methods).

@@ -48,7 +48,7 @@ which would automatically be passed as the first argument (wed need that to be a commitTransaction -fun commitTransaction(tx: SerializedBytes<WireTransaction>, signatures: List<WithKey>): SecureHash

Attempt to commit transaction (returned from build transaction) with the necessary signatures for that to be +fun commitTransaction(tx: SerializedBytes<WireTransaction>, signatures: List<WithKey>): SecureHash

Attempt to commit transaction (returned from build transaction) with the necessary signatures for that to be successful, otherwise exception is thrown.

@@ -56,48 +56,48 @@ successful, otherwise exception is thrown.

fetchProtocolsRequiringAttention -fun fetchProtocolsRequiringAttention(query: StatesQuery): Map<StateRef, ProtocolRequiringAttention>

Fetch protocols that require a response to some prompt/question by a human (on the "bank" side).

+fun fetchProtocolsRequiringAttention(query: StatesQuery): Map<StateRef, ProtocolRequiringAttention>

Fetch protocols that require a response to some prompt/question by a human (on the "bank" side).

fetchStates -fun fetchStates(states: List<StateRef>): Map<StateRef, ContractState?> +fun fetchStates(states: List<StateRef>): Map<StateRef, ContractState?> fetchTransactions -fun fetchTransactions(txs: List<SecureHash>): Map<SecureHash, SignedTransaction?>

Query for immutable transactions (results can be cached indefinitely by their id/hash).

+fun fetchTransactions(txs: List<SecureHash>): Map<SecureHash, SignedTransaction?>

Query for immutable transactions (results can be cached indefinitely by their id/hash).

generateTransactionSignature -fun generateTransactionSignature(tx: SerializedBytes<WireTransaction>): WithKey

Generate a signature for this transaction signed by us.

+fun generateTransactionSignature(tx: SerializedBytes<WireTransaction>): WithKey

Generate a signature for this transaction signed by us.

invokeProtocolSync -fun invokeProtocolSync(type: ProtocolRef, args: Map<String, Any?>): Any?

This method would not return until the protocol is finished (hence the "Sync").

+fun invokeProtocolSync(type: ProtocolRef, args: Map<String, Any?>): Any?

This method would not return until the protocol is finished (hence the "Sync").

provideProtocolResponse -fun provideProtocolResponse(protocol: ProtocolInstanceRef, choice: SecureHash, args: Map<String, Any?>): Unit

Provide the response that a protocol is waiting for.

+fun provideProtocolResponse(protocol: ProtocolInstanceRef, choice: SecureHash, args: Map<String, Any?>): Unit

Provide the response that a protocol is waiting for.

queryStates -fun queryStates(query: StatesQuery): List<StateRef>

Query your "local" states (containing only outputs involving you) and return the hashes & indexes associated with them +fun queryStates(query: StatesQuery): List<StateRef>

Query your "local" states (containing only outputs involving you) and return the hashes & indexes associated with them to probably be later inflated by fetchLedgerTransactions() or fetchStates() although because immutable you can cache them to avoid calling fetchLedgerTransactions() many times.

diff --git a/docs/build/html/api/api/-a-p-i-server-impl/invoke-protocol-sync.html b/docs/build/html/api/api/-a-p-i-server-impl/invoke-protocol-sync.html index d3f58a6cc5..352bbebe2c 100644 --- a/docs/build/html/api/api/-a-p-i-server-impl/invoke-protocol-sync.html +++ b/docs/build/html/api/api/-a-p-i-server-impl/invoke-protocol-sync.html @@ -7,8 +7,8 @@ api / APIServerImpl / invokeProtocolSync

invokeProtocolSync

- -fun invokeProtocolSync(type: ProtocolRef, args: Map<String, Any?>): Any?
+ +fun invokeProtocolSync(type: ProtocolRef, args: Map<String, Any?>): Any?
Overrides APIServer.invokeProtocolSync

This method would not return until the protocol is finished (hence the "Sync").

Longer term wed add an Async version that returns some kind of ProtocolInvocationRef that could be queried and diff --git a/docs/build/html/api/api/-a-p-i-server-impl/node.html b/docs/build/html/api/api/-a-p-i-server-impl/node.html index fd0b8bb8e4..7da96a0954 100644 --- a/docs/build/html/api/api/-a-p-i-server-impl/node.html +++ b/docs/build/html/api/api/-a-p-i-server-impl/node.html @@ -7,7 +7,7 @@ api / APIServerImpl / node

node

- + val node: AbstractNode


diff --git a/docs/build/html/api/api/-a-p-i-server-impl/provide-protocol-response.html b/docs/build/html/api/api/-a-p-i-server-impl/provide-protocol-response.html index 6c84da1fec..83eef417fa 100644 --- a/docs/build/html/api/api/-a-p-i-server-impl/provide-protocol-response.html +++ b/docs/build/html/api/api/-a-p-i-server-impl/provide-protocol-response.html @@ -7,8 +7,8 @@ api / APIServerImpl / provideProtocolResponse

provideProtocolResponse

- -fun provideProtocolResponse(protocol: ProtocolInstanceRef, choice: SecureHash, args: Map<String, Any?>): Unit
+ +fun provideProtocolResponse(protocol: ProtocolInstanceRef, choice: SecureHash, args: Map<String, Any?>): Unit
Overrides APIServer.provideProtocolResponse

Provide the response that a protocol is waiting for.

Parameters

diff --git a/docs/build/html/api/api/-a-p-i-server-impl/query-states.html b/docs/build/html/api/api/-a-p-i-server-impl/query-states.html index 9fdeeec4e5..8048a81cc3 100644 --- a/docs/build/html/api/api/-a-p-i-server-impl/query-states.html +++ b/docs/build/html/api/api/-a-p-i-server-impl/query-states.html @@ -7,8 +7,8 @@ api / APIServerImpl / queryStates

queryStates

- -fun queryStates(query: StatesQuery): List<StateRef>
+ +fun queryStates(query: StatesQuery): List<StateRef>
Overrides APIServer.queryStates

Query your "local" states (containing only outputs involving you) and return the hashes & indexes associated with them to probably be later inflated by fetchLedgerTransactions() or fetchStates() although because immutable you can cache them diff --git a/docs/build/html/api/api/-a-p-i-server-impl/server-time.html b/docs/build/html/api/api/-a-p-i-server-impl/server-time.html index 099e9cbe06..98547db68f 100644 --- a/docs/build/html/api/api/-a-p-i-server-impl/server-time.html +++ b/docs/build/html/api/api/-a-p-i-server-impl/server-time.html @@ -7,7 +7,7 @@ api / APIServerImpl / serverTime

serverTime

- + fun serverTime(): LocalDateTime
Overrides APIServer.serverTime

Report current UTC time as understood by the platform.

diff --git a/docs/build/html/api/api/-a-p-i-server/build-transaction.html b/docs/build/html/api/api/-a-p-i-server/build-transaction.html index 3cb2a6b51b..807d0b9f85 100644 --- a/docs/build/html/api/api/-a-p-i-server/build-transaction.html +++ b/docs/build/html/api/api/-a-p-i-server/build-transaction.html @@ -7,8 +7,8 @@ api / APIServer / buildTransaction

buildTransaction

- -abstract fun buildTransaction(type: ContractDefRef, steps: List<TransactionBuildStep>): SerializedBytes<WireTransaction>
+ +abstract fun buildTransaction(type: ContractDefRef, steps: List<TransactionBuildStep>): SerializedBytes<WireTransaction>

TransactionBuildSteps would be invocations of contract.generateXXX() methods that all share a common TransactionBuilder and a common contract type (e.g. Cash or CommercialPaper) which would automatically be passed as the first argument (wed need that to be a criteria/pattern of the generateXXX methods).

diff --git a/docs/build/html/api/api/-a-p-i-server/commit-transaction.html b/docs/build/html/api/api/-a-p-i-server/commit-transaction.html index 3bc3fa1980..e252513bc0 100644 --- a/docs/build/html/api/api/-a-p-i-server/commit-transaction.html +++ b/docs/build/html/api/api/-a-p-i-server/commit-transaction.html @@ -7,8 +7,8 @@ api / APIServer / commitTransaction

commitTransaction

- -abstract fun commitTransaction(tx: SerializedBytes<WireTransaction>, signatures: List<WithKey>): SecureHash
+ +abstract fun commitTransaction(tx: SerializedBytes<WireTransaction>, signatures: List<WithKey>): SecureHash

Attempt to commit transaction (returned from build transaction) with the necessary signatures for that to be successful, otherwise exception is thrown.


diff --git a/docs/build/html/api/api/-a-p-i-server/fetch-protocols-requiring-attention.html b/docs/build/html/api/api/-a-p-i-server/fetch-protocols-requiring-attention.html index a38070a0a4..ad6553e308 100644 --- a/docs/build/html/api/api/-a-p-i-server/fetch-protocols-requiring-attention.html +++ b/docs/build/html/api/api/-a-p-i-server/fetch-protocols-requiring-attention.html @@ -7,8 +7,8 @@ api / APIServer / fetchProtocolsRequiringAttention

fetchProtocolsRequiringAttention

- -abstract fun fetchProtocolsRequiringAttention(query: StatesQuery): Map<StateRef, ProtocolRequiringAttention>
+ +abstract fun fetchProtocolsRequiringAttention(query: StatesQuery): Map<StateRef, ProtocolRequiringAttention>

Fetch protocols that require a response to some prompt/question by a human (on the "bank" side).



diff --git a/docs/build/html/api/api/-a-p-i-server/fetch-states.html b/docs/build/html/api/api/-a-p-i-server/fetch-states.html index aec13fe64c..98827ec434 100644 --- a/docs/build/html/api/api/-a-p-i-server/fetch-states.html +++ b/docs/build/html/api/api/-a-p-i-server/fetch-states.html @@ -7,8 +7,8 @@ api / APIServer / fetchStates

fetchStates

- -abstract fun fetchStates(states: List<StateRef>): Map<StateRef, ContractState?>
+ +abstract fun fetchStates(states: List<StateRef>): Map<StateRef, ContractState?>


diff --git a/docs/build/html/api/api/-a-p-i-server/fetch-transactions.html b/docs/build/html/api/api/-a-p-i-server/fetch-transactions.html index e9f0205f7b..ed8847df57 100644 --- a/docs/build/html/api/api/-a-p-i-server/fetch-transactions.html +++ b/docs/build/html/api/api/-a-p-i-server/fetch-transactions.html @@ -7,8 +7,8 @@ api / APIServer / fetchTransactions

fetchTransactions

- -abstract fun fetchTransactions(txs: List<SecureHash>): Map<SecureHash, SignedTransaction?>
+ +abstract fun fetchTransactions(txs: List<SecureHash>): Map<SecureHash, SignedTransaction?>

Query for immutable transactions (results can be cached indefinitely by their id/hash).

Parameters

diff --git a/docs/build/html/api/api/-a-p-i-server/generate-transaction-signature.html b/docs/build/html/api/api/-a-p-i-server/generate-transaction-signature.html index 9eccef19a4..54e27021f5 100644 --- a/docs/build/html/api/api/-a-p-i-server/generate-transaction-signature.html +++ b/docs/build/html/api/api/-a-p-i-server/generate-transaction-signature.html @@ -7,8 +7,8 @@ api / APIServer / generateTransactionSignature

generateTransactionSignature

- -abstract fun generateTransactionSignature(tx: SerializedBytes<WireTransaction>): WithKey
+ +abstract fun generateTransactionSignature(tx: SerializedBytes<WireTransaction>): WithKey

Generate a signature for this transaction signed by us.



diff --git a/docs/build/html/api/api/-a-p-i-server/index.html b/docs/build/html/api/api/-a-p-i-server/index.html index 52f25cab7c..8789d26f33 100644 --- a/docs/build/html/api/api/-a-p-i-server/index.html +++ b/docs/build/html/api/api/-a-p-i-server/index.html @@ -22,7 +22,7 @@ where a null indicates "missing" and the elements returned will be in the order buildTransaction -abstract fun buildTransaction(type: ContractDefRef, steps: List<TransactionBuildStep>): SerializedBytes<WireTransaction>

TransactionBuildSteps would be invocations of contract.generateXXX() methods that all share a common TransactionBuilder +abstract fun buildTransaction(type: ContractDefRef, steps: List<TransactionBuildStep>): SerializedBytes<WireTransaction>

TransactionBuildSteps would be invocations of contract.generateXXX() methods that all share a common TransactionBuilder and a common contract type (e.g. Cash or CommercialPaper) which would automatically be passed as the first argument (wed need that to be a criteria/pattern of the generateXXX methods).

@@ -31,7 +31,7 @@ which would automatically be passed as the first argument (wed need that to be a commitTransaction -abstract fun commitTransaction(tx: SerializedBytes<WireTransaction>, signatures: List<WithKey>): SecureHash

Attempt to commit transaction (returned from build transaction) with the necessary signatures for that to be +abstract fun commitTransaction(tx: SerializedBytes<WireTransaction>, signatures: List<WithKey>): SecureHash

Attempt to commit transaction (returned from build transaction) with the necessary signatures for that to be successful, otherwise exception is thrown.

@@ -39,48 +39,48 @@ successful, otherwise exception is thrown.

fetchProtocolsRequiringAttention -abstract fun fetchProtocolsRequiringAttention(query: StatesQuery): Map<StateRef, ProtocolRequiringAttention>

Fetch protocols that require a response to some prompt/question by a human (on the "bank" side).

+abstract fun fetchProtocolsRequiringAttention(query: StatesQuery): Map<StateRef, ProtocolRequiringAttention>

Fetch protocols that require a response to some prompt/question by a human (on the "bank" side).

fetchStates -abstract fun fetchStates(states: List<StateRef>): Map<StateRef, ContractState?> +abstract fun fetchStates(states: List<StateRef>): Map<StateRef, ContractState?> fetchTransactions -abstract fun fetchTransactions(txs: List<SecureHash>): Map<SecureHash, SignedTransaction?>

Query for immutable transactions (results can be cached indefinitely by their id/hash).

+abstract fun fetchTransactions(txs: List<SecureHash>): Map<SecureHash, SignedTransaction?>

Query for immutable transactions (results can be cached indefinitely by their id/hash).

generateTransactionSignature -abstract fun generateTransactionSignature(tx: SerializedBytes<WireTransaction>): WithKey

Generate a signature for this transaction signed by us.

+abstract fun generateTransactionSignature(tx: SerializedBytes<WireTransaction>): WithKey

Generate a signature for this transaction signed by us.

invokeProtocolSync -abstract fun invokeProtocolSync(type: ProtocolRef, args: Map<String, Any?>): Any?

This method would not return until the protocol is finished (hence the "Sync").

+abstract fun invokeProtocolSync(type: ProtocolRef, args: Map<String, Any?>): Any?

This method would not return until the protocol is finished (hence the "Sync").

provideProtocolResponse -abstract fun provideProtocolResponse(protocol: ProtocolInstanceRef, choice: SecureHash, args: Map<String, Any?>): Unit

Provide the response that a protocol is waiting for.

+abstract fun provideProtocolResponse(protocol: ProtocolInstanceRef, choice: SecureHash, args: Map<String, Any?>): Unit

Provide the response that a protocol is waiting for.

queryStates -abstract fun queryStates(query: StatesQuery): List<StateRef>

Query your "local" states (containing only outputs involving you) and return the hashes & indexes associated with them +abstract fun queryStates(query: StatesQuery): List<StateRef>

Query your "local" states (containing only outputs involving you) and return the hashes & indexes associated with them to probably be later inflated by fetchLedgerTransactions() or fetchStates() although because immutable you can cache them to avoid calling fetchLedgerTransactions() many times.

diff --git a/docs/build/html/api/api/-a-p-i-server/invoke-protocol-sync.html b/docs/build/html/api/api/-a-p-i-server/invoke-protocol-sync.html index d37bd9927e..38f020d59f 100644 --- a/docs/build/html/api/api/-a-p-i-server/invoke-protocol-sync.html +++ b/docs/build/html/api/api/-a-p-i-server/invoke-protocol-sync.html @@ -7,8 +7,8 @@ api / APIServer / invokeProtocolSync

invokeProtocolSync

- -abstract fun invokeProtocolSync(type: ProtocolRef, args: Map<String, Any?>): Any?
+ +abstract fun invokeProtocolSync(type: ProtocolRef, args: Map<String, Any?>): Any?

This method would not return until the protocol is finished (hence the "Sync").

Longer term wed add an Async version that returns some kind of ProtocolInvocationRef that could be queried and would appear on some kind of event message that is broadcast informing of progress.

diff --git a/docs/build/html/api/api/-a-p-i-server/provide-protocol-response.html b/docs/build/html/api/api/-a-p-i-server/provide-protocol-response.html index 6e08f6af48..fc053ee8b9 100644 --- a/docs/build/html/api/api/-a-p-i-server/provide-protocol-response.html +++ b/docs/build/html/api/api/-a-p-i-server/provide-protocol-response.html @@ -7,8 +7,8 @@ api / APIServer / provideProtocolResponse

provideProtocolResponse

- -abstract fun provideProtocolResponse(protocol: ProtocolInstanceRef, choice: SecureHash, args: Map<String, Any?>): Unit
+ +abstract fun provideProtocolResponse(protocol: ProtocolInstanceRef, choice: SecureHash, args: Map<String, Any?>): Unit

Provide the response that a protocol is waiting for.

Parameters

diff --git a/docs/build/html/api/api/-a-p-i-server/query-states.html b/docs/build/html/api/api/-a-p-i-server/query-states.html index 7752e1f7ff..9a1c0dc570 100644 --- a/docs/build/html/api/api/-a-p-i-server/query-states.html +++ b/docs/build/html/api/api/-a-p-i-server/query-states.html @@ -7,8 +7,8 @@ api / APIServer / queryStates

queryStates

- -abstract fun queryStates(query: StatesQuery): List<StateRef>
+ +abstract fun queryStates(query: StatesQuery): List<StateRef>

Query your "local" states (containing only outputs involving you) and return the hashes & indexes associated with them to probably be later inflated by fetchLedgerTransactions() or fetchStates() although because immutable you can cache them to avoid calling fetchLedgerTransactions() many times.

diff --git a/docs/build/html/api/api/-a-p-i-server/server-time.html b/docs/build/html/api/api/-a-p-i-server/server-time.html index 09584b876a..3e9baa48bf 100644 --- a/docs/build/html/api/api/-a-p-i-server/server-time.html +++ b/docs/build/html/api/api/-a-p-i-server/server-time.html @@ -7,7 +7,7 @@ api / APIServer / serverTime

serverTime

- + abstract fun serverTime(): LocalDateTime

Report current UTC time as understood by the platform.


diff --git a/docs/build/html/api/api/-config/-init-.html b/docs/build/html/api/api/-config/-init-.html index 95d3a0bb7d..50d91eaa45 100644 --- a/docs/build/html/api/api/-config/-init-.html +++ b/docs/build/html/api/api/-config/-init-.html @@ -7,7 +7,7 @@ api / Config / <init>

<init>

-Config(services: ServiceHub)
+Config(services: ServiceHub)

Primary purpose is to install Kotlin extensions for Jackson ObjectMapper so data classes work and to organise serializers / deserializers for java.time.* classes as necessary


diff --git a/docs/build/html/api/api/-config/default-object-mapper.html b/docs/build/html/api/api/-config/default-object-mapper.html index 6dff95e89c..a506961453 100644 --- a/docs/build/html/api/api/-config/default-object-mapper.html +++ b/docs/build/html/api/api/-config/default-object-mapper.html @@ -7,7 +7,7 @@ api / Config / defaultObjectMapper

defaultObjectMapper

- + val defaultObjectMapper: <ERROR CLASS>


diff --git a/docs/build/html/api/api/-config/get-context.html b/docs/build/html/api/api/-config/get-context.html index c2d2459cf3..4950225883 100644 --- a/docs/build/html/api/api/-config/get-context.html +++ b/docs/build/html/api/api/-config/get-context.html @@ -7,8 +7,8 @@ api / Config / getContext

getContext

- -fun getContext(type: Class<*>): <ERROR CLASS>
+ +fun getContext(type: Class<*>): <ERROR CLASS>


diff --git a/docs/build/html/api/api/-config/index.html b/docs/build/html/api/api/-config/index.html index 4971ab9066..14daff68d7 100644 --- a/docs/build/html/api/api/-config/index.html +++ b/docs/build/html/api/api/-config/index.html @@ -19,7 +19,7 @@ and to organise serializers / deserializers for java.time.* classes as necessary <init> -Config(services: ServiceHub)

Primary purpose is to install Kotlin extensions for Jackson ObjectMapper so data classes work +Config(services: ServiceHub)

Primary purpose is to install Kotlin extensions for Jackson ObjectMapper so data classes work and to organise serializers / deserializers for java.time.* classes as necessary

@@ -49,7 +49,7 @@ and to organise serializers / deserializers for java.time.* classes as necessary getContext -fun getContext(type: Class<*>): <ERROR CLASS> +fun getContext(type: Class<*>): <ERROR CLASS> diff --git a/docs/build/html/api/api/-config/services.html b/docs/build/html/api/api/-config/services.html index d688ab751e..9c94e87d2e 100644 --- a/docs/build/html/api/api/-config/services.html +++ b/docs/build/html/api/api/-config/services.html @@ -7,7 +7,7 @@ api / Config / services

services

- + val services: ServiceHub


diff --git a/docs/build/html/api/api/-contract-class-ref/-init-.html b/docs/build/html/api/api/-contract-class-ref/-init-.html index 2df8964c48..f48d09550a 100644 --- a/docs/build/html/api/api/-contract-class-ref/-init-.html +++ b/docs/build/html/api/api/-contract-class-ref/-init-.html @@ -7,7 +7,7 @@ api / ContractClassRef / <init>

<init>

-ContractClassRef(className: String)
+ContractClassRef(className: String)


diff --git a/docs/build/html/api/api/-contract-class-ref/class-name.html b/docs/build/html/api/api/-contract-class-ref/class-name.html index 53d56fa9d6..c3edb09e71 100644 --- a/docs/build/html/api/api/-contract-class-ref/class-name.html +++ b/docs/build/html/api/api/-contract-class-ref/class-name.html @@ -7,7 +7,7 @@ api / ContractClassRef / className

className

- + val className: String


diff --git a/docs/build/html/api/api/-contract-class-ref/index.html b/docs/build/html/api/api/-contract-class-ref/index.html index e7da9791c9..d9bc078720 100644 --- a/docs/build/html/api/api/-contract-class-ref/index.html +++ b/docs/build/html/api/api/-contract-class-ref/index.html @@ -17,7 +17,7 @@ <init> -ContractClassRef(className: String) +ContractClassRef(className: String) diff --git a/docs/build/html/api/api/-contract-ledger-ref/-init-.html b/docs/build/html/api/api/-contract-ledger-ref/-init-.html index 2075740aa8..ca52c6d28f 100644 --- a/docs/build/html/api/api/-contract-ledger-ref/-init-.html +++ b/docs/build/html/api/api/-contract-ledger-ref/-init-.html @@ -7,7 +7,7 @@ api / ContractLedgerRef / <init>

<init>

-ContractLedgerRef(hash: SecureHash)
+ContractLedgerRef(hash: SecureHash)


diff --git a/docs/build/html/api/api/-contract-ledger-ref/hash.html b/docs/build/html/api/api/-contract-ledger-ref/hash.html index 6a448997a9..08036ff4fe 100644 --- a/docs/build/html/api/api/-contract-ledger-ref/hash.html +++ b/docs/build/html/api/api/-contract-ledger-ref/hash.html @@ -7,7 +7,7 @@ api / ContractLedgerRef / hash

hash

- + val hash: SecureHash


diff --git a/docs/build/html/api/api/-contract-ledger-ref/index.html b/docs/build/html/api/api/-contract-ledger-ref/index.html index ee67aad865..eef696ec1f 100644 --- a/docs/build/html/api/api/-contract-ledger-ref/index.html +++ b/docs/build/html/api/api/-contract-ledger-ref/index.html @@ -17,7 +17,7 @@ <init> -ContractLedgerRef(hash: SecureHash) +ContractLedgerRef(hash: SecureHash) diff --git a/docs/build/html/api/api/-interest-rate-swap-a-p-i/-init-.html b/docs/build/html/api/api/-interest-rate-swap-a-p-i/-init-.html index 7aaf61b4d0..f643abf8af 100644 --- a/docs/build/html/api/api/-interest-rate-swap-a-p-i/-init-.html +++ b/docs/build/html/api/api/-interest-rate-swap-a-p-i/-init-.html @@ -7,7 +7,7 @@ api / InterestRateSwapAPI / <init>

<init>

-InterestRateSwapAPI(api: APIServer)
+InterestRateSwapAPI(api: APIServer)

This provides a simplified API, currently for demonstration use only.

It provides several JSON REST calls as follows:

GET /api/irs/deals - returns an array of all deals tracked by the wallet of this node. diff --git a/docs/build/html/api/api/-interest-rate-swap-a-p-i/index.html b/docs/build/html/api/api/-interest-rate-swap-a-p-i/index.html index c6cca419db..586d8644a1 100644 --- a/docs/build/html/api/api/-interest-rate-swap-a-p-i/index.html +++ b/docs/build/html/api/api/-interest-rate-swap-a-p-i/index.html @@ -31,7 +31,7 @@ or if the demodate or population of deals should be reset (will only work while <init> -InterestRateSwapAPI(api: APIServer)

This provides a simplified API, currently for demonstration use only.

+InterestRateSwapAPI(api: APIServer)

This provides a simplified API, currently for demonstration use only.

diff --git a/docs/build/html/api/api/-protocol-class-ref/-init-.html b/docs/build/html/api/api/-protocol-class-ref/-init-.html index 32f874d3ab..3048f63c04 100644 --- a/docs/build/html/api/api/-protocol-class-ref/-init-.html +++ b/docs/build/html/api/api/-protocol-class-ref/-init-.html @@ -7,7 +7,7 @@ api / ProtocolClassRef / <init>

<init>

-ProtocolClassRef(className: String)
+ProtocolClassRef(className: String)


diff --git a/docs/build/html/api/api/-protocol-class-ref/class-name.html b/docs/build/html/api/api/-protocol-class-ref/class-name.html index 3e58beb5d7..7bc461f6f9 100644 --- a/docs/build/html/api/api/-protocol-class-ref/class-name.html +++ b/docs/build/html/api/api/-protocol-class-ref/class-name.html @@ -7,7 +7,7 @@ api / ProtocolClassRef / className

className

- + val className: String


diff --git a/docs/build/html/api/api/-protocol-class-ref/index.html b/docs/build/html/api/api/-protocol-class-ref/index.html index ecb0ab82f4..6edc8fecaa 100644 --- a/docs/build/html/api/api/-protocol-class-ref/index.html +++ b/docs/build/html/api/api/-protocol-class-ref/index.html @@ -17,7 +17,7 @@ <init> -ProtocolClassRef(className: String) +ProtocolClassRef(className: String) diff --git a/docs/build/html/api/api/-protocol-instance-ref/-init-.html b/docs/build/html/api/api/-protocol-instance-ref/-init-.html index cb0b9892ce..a27552804e 100644 --- a/docs/build/html/api/api/-protocol-instance-ref/-init-.html +++ b/docs/build/html/api/api/-protocol-instance-ref/-init-.html @@ -7,7 +7,7 @@ api / ProtocolInstanceRef / <init>

<init>

-ProtocolInstanceRef(protocolInstance: SecureHash, protocolClass: ProtocolClassRef, protocolStepId: String)
+ProtocolInstanceRef(protocolInstance: SecureHash, protocolClass: ProtocolClassRef, protocolStepId: String)


diff --git a/docs/build/html/api/api/-protocol-instance-ref/index.html b/docs/build/html/api/api/-protocol-instance-ref/index.html index f3177805e7..5b4f7dab8d 100644 --- a/docs/build/html/api/api/-protocol-instance-ref/index.html +++ b/docs/build/html/api/api/-protocol-instance-ref/index.html @@ -17,7 +17,7 @@ <init> -ProtocolInstanceRef(protocolInstance: SecureHash, protocolClass: ProtocolClassRef, protocolStepId: String) +ProtocolInstanceRef(protocolInstance: SecureHash, protocolClass: ProtocolClassRef, protocolStepId: String) diff --git a/docs/build/html/api/api/-protocol-instance-ref/protocol-class.html b/docs/build/html/api/api/-protocol-instance-ref/protocol-class.html index c47de895b5..a99fd0e938 100644 --- a/docs/build/html/api/api/-protocol-instance-ref/protocol-class.html +++ b/docs/build/html/api/api/-protocol-instance-ref/protocol-class.html @@ -7,7 +7,7 @@ api / ProtocolInstanceRef / protocolClass

protocolClass

- + val protocolClass: ProtocolClassRef


diff --git a/docs/build/html/api/api/-protocol-instance-ref/protocol-instance.html b/docs/build/html/api/api/-protocol-instance-ref/protocol-instance.html index 472e56b261..46d482ae2e 100644 --- a/docs/build/html/api/api/-protocol-instance-ref/protocol-instance.html +++ b/docs/build/html/api/api/-protocol-instance-ref/protocol-instance.html @@ -7,7 +7,7 @@ api / ProtocolInstanceRef / protocolInstance

protocolInstance

- + val protocolInstance: SecureHash


diff --git a/docs/build/html/api/api/-protocol-instance-ref/protocol-step-id.html b/docs/build/html/api/api/-protocol-instance-ref/protocol-step-id.html index 959d10ab08..8ba9c45d76 100644 --- a/docs/build/html/api/api/-protocol-instance-ref/protocol-step-id.html +++ b/docs/build/html/api/api/-protocol-instance-ref/protocol-step-id.html @@ -7,7 +7,7 @@ api / ProtocolInstanceRef / protocolStepId

protocolStepId

- + val protocolStepId: String


diff --git a/docs/build/html/api/api/-protocol-requiring-attention/-init-.html b/docs/build/html/api/api/-protocol-requiring-attention/-init-.html index 3d8da22d91..dfa796f07d 100644 --- a/docs/build/html/api/api/-protocol-requiring-attention/-init-.html +++ b/docs/build/html/api/api/-protocol-requiring-attention/-init-.html @@ -7,7 +7,7 @@ api / ProtocolRequiringAttention / <init>

<init>

-ProtocolRequiringAttention(ref: ProtocolInstanceRef, prompt: String, choiceIdsToMessages: Map<SecureHash, String>, dueBy: Instant)
+ProtocolRequiringAttention(ref: ProtocolInstanceRef, prompt: String, choiceIdsToMessages: Map<SecureHash, String>, dueBy: Instant)

Thinking that Instant is OK for short lived protocol deadlines.



diff --git a/docs/build/html/api/api/-protocol-requiring-attention/choice-ids-to-messages.html b/docs/build/html/api/api/-protocol-requiring-attention/choice-ids-to-messages.html index 720fa2c4f1..39b189473a 100644 --- a/docs/build/html/api/api/-protocol-requiring-attention/choice-ids-to-messages.html +++ b/docs/build/html/api/api/-protocol-requiring-attention/choice-ids-to-messages.html @@ -7,7 +7,7 @@ api / ProtocolRequiringAttention / choiceIdsToMessages

choiceIdsToMessages

- + val choiceIdsToMessages: Map<SecureHash, String>


diff --git a/docs/build/html/api/api/-protocol-requiring-attention/due-by.html b/docs/build/html/api/api/-protocol-requiring-attention/due-by.html index 214ed6c59a..939e94b0fc 100644 --- a/docs/build/html/api/api/-protocol-requiring-attention/due-by.html +++ b/docs/build/html/api/api/-protocol-requiring-attention/due-by.html @@ -7,7 +7,7 @@ api / ProtocolRequiringAttention / dueBy

dueBy

- + val dueBy: Instant


diff --git a/docs/build/html/api/api/-protocol-requiring-attention/index.html b/docs/build/html/api/api/-protocol-requiring-attention/index.html index 4fb7655c0a..c6e84d71f2 100644 --- a/docs/build/html/api/api/-protocol-requiring-attention/index.html +++ b/docs/build/html/api/api/-protocol-requiring-attention/index.html @@ -18,7 +18,7 @@ <init> -ProtocolRequiringAttention(ref: ProtocolInstanceRef, prompt: String, choiceIdsToMessages: Map<SecureHash, String>, dueBy: Instant)

Thinking that Instant is OK for short lived protocol deadlines.

+ProtocolRequiringAttention(ref: ProtocolInstanceRef, prompt: String, choiceIdsToMessages: Map<SecureHash, String>, dueBy: Instant)

Thinking that Instant is OK for short lived protocol deadlines.

diff --git a/docs/build/html/api/api/-protocol-requiring-attention/prompt.html b/docs/build/html/api/api/-protocol-requiring-attention/prompt.html index 5cd67e63ee..749d5b177a 100644 --- a/docs/build/html/api/api/-protocol-requiring-attention/prompt.html +++ b/docs/build/html/api/api/-protocol-requiring-attention/prompt.html @@ -7,7 +7,7 @@ api / ProtocolRequiringAttention / prompt

prompt

- + val prompt: String


diff --git a/docs/build/html/api/api/-protocol-requiring-attention/ref.html b/docs/build/html/api/api/-protocol-requiring-attention/ref.html index e7cb929d50..eb110205ff 100644 --- a/docs/build/html/api/api/-protocol-requiring-attention/ref.html +++ b/docs/build/html/api/api/-protocol-requiring-attention/ref.html @@ -7,7 +7,7 @@ api / ProtocolRequiringAttention / ref

ref

- + val ref: ProtocolInstanceRef


diff --git a/docs/build/html/api/api/-response-filter/filter.html b/docs/build/html/api/api/-response-filter/filter.html index dd9f898179..f907d80458 100644 --- a/docs/build/html/api/api/-response-filter/filter.html +++ b/docs/build/html/api/api/-response-filter/filter.html @@ -7,8 +7,8 @@ api / ResponseFilter / filter

filter

- -fun filter(requestContext: <ERROR CLASS>, responseContext: <ERROR CLASS>): Unit
+ +fun filter(requestContext: <ERROR CLASS>, responseContext: <ERROR CLASS>): Unit


diff --git a/docs/build/html/api/api/-response-filter/index.html b/docs/build/html/api/api/-response-filter/index.html index f9fe3489e7..6770a9646a 100644 --- a/docs/build/html/api/api/-response-filter/index.html +++ b/docs/build/html/api/api/-response-filter/index.html @@ -30,7 +30,7 @@ filter -fun filter(requestContext: <ERROR CLASS>, responseContext: <ERROR CLASS>): Unit +fun filter(requestContext: <ERROR CLASS>, responseContext: <ERROR CLASS>): Unit diff --git a/docs/build/html/api/api/-states-query/-criteria/-deal/-init-.html b/docs/build/html/api/api/-states-query/-criteria/-deal/-init-.html index 2faa5d49cc..cdcb4e751c 100644 --- a/docs/build/html/api/api/-states-query/-criteria/-deal/-init-.html +++ b/docs/build/html/api/api/-states-query/-criteria/-deal/-init-.html @@ -7,7 +7,7 @@ api / StatesQuery / Criteria / Deal / <init>

<init>

-Deal(ref: String)
+Deal(ref: String)


diff --git a/docs/build/html/api/api/-states-query/-criteria/-deal/index.html b/docs/build/html/api/api/-states-query/-criteria/-deal/index.html index f4fd30ce53..254932574a 100644 --- a/docs/build/html/api/api/-states-query/-criteria/-deal/index.html +++ b/docs/build/html/api/api/-states-query/-criteria/-deal/index.html @@ -17,7 +17,7 @@ <init> -Deal(ref: String) +Deal(ref: String) diff --git a/docs/build/html/api/api/-states-query/-criteria/-deal/ref.html b/docs/build/html/api/api/-states-query/-criteria/-deal/ref.html index 91cba70480..68ef23c32b 100644 --- a/docs/build/html/api/api/-states-query/-criteria/-deal/ref.html +++ b/docs/build/html/api/api/-states-query/-criteria/-deal/ref.html @@ -7,7 +7,7 @@ api / StatesQuery / Criteria / Deal / ref

ref

- + val ref: String


diff --git a/docs/build/html/api/api/-states-query/-selection/-init-.html b/docs/build/html/api/api/-states-query/-selection/-init-.html index ebc534a0b9..67b51c36b7 100644 --- a/docs/build/html/api/api/-states-query/-selection/-init-.html +++ b/docs/build/html/api/api/-states-query/-selection/-init-.html @@ -7,7 +7,7 @@ api / StatesQuery / Selection / <init>

<init>

-Selection(criteria: Criteria)
+Selection(criteria: Criteria)


diff --git a/docs/build/html/api/api/-states-query/-selection/criteria.html b/docs/build/html/api/api/-states-query/-selection/criteria.html index f4dc1904b0..0f3670bc4b 100644 --- a/docs/build/html/api/api/-states-query/-selection/criteria.html +++ b/docs/build/html/api/api/-states-query/-selection/criteria.html @@ -7,7 +7,7 @@ api / StatesQuery / Selection / criteria

criteria

- + val criteria: Criteria


diff --git a/docs/build/html/api/api/-states-query/-selection/index.html b/docs/build/html/api/api/-states-query/-selection/index.html index 66237ff816..2d8e7f6d10 100644 --- a/docs/build/html/api/api/-states-query/-selection/index.html +++ b/docs/build/html/api/api/-states-query/-selection/index.html @@ -17,7 +17,7 @@ <init> -Selection(criteria: Criteria) +Selection(criteria: Criteria) diff --git a/docs/build/html/api/api/-states-query/index.html b/docs/build/html/api/api/-states-query/index.html index bea19a86f7..e7d1c6c8f9 100644 --- a/docs/build/html/api/api/-states-query/index.html +++ b/docs/build/html/api/api/-states-query/index.html @@ -35,7 +35,7 @@ select -fun select(criteria: Criteria): Selection +fun select(criteria: Criteria): Selection @@ -47,7 +47,7 @@ selectDeal -fun selectDeal(ref: String): Selection +fun selectDeal(ref: String): Selection diff --git a/docs/build/html/api/api/-states-query/select-all-deals.html b/docs/build/html/api/api/-states-query/select-all-deals.html index d236f0e17b..a36dc9986e 100644 --- a/docs/build/html/api/api/-states-query/select-all-deals.html +++ b/docs/build/html/api/api/-states-query/select-all-deals.html @@ -7,7 +7,7 @@ api / StatesQuery / selectAllDeals

selectAllDeals

- + fun selectAllDeals(): Selection


diff --git a/docs/build/html/api/api/-states-query/select-deal.html b/docs/build/html/api/api/-states-query/select-deal.html index 37316bcdaf..7f15b87a5f 100644 --- a/docs/build/html/api/api/-states-query/select-deal.html +++ b/docs/build/html/api/api/-states-query/select-deal.html @@ -7,8 +7,8 @@ api / StatesQuery / selectDeal

selectDeal

- -fun selectDeal(ref: String): Selection
+ +fun selectDeal(ref: String): Selection


diff --git a/docs/build/html/api/api/-states-query/select.html b/docs/build/html/api/api/-states-query/select.html index 38a84bed9a..05852b573e 100644 --- a/docs/build/html/api/api/-states-query/select.html +++ b/docs/build/html/api/api/-states-query/select.html @@ -7,8 +7,8 @@ api / StatesQuery / select

select

- -fun select(criteria: Criteria): Selection
+ +fun select(criteria: Criteria): Selection


diff --git a/docs/build/html/api/api/-transaction-build-step/-init-.html b/docs/build/html/api/api/-transaction-build-step/-init-.html index b680cfc751..4038624c02 100644 --- a/docs/build/html/api/api/-transaction-build-step/-init-.html +++ b/docs/build/html/api/api/-transaction-build-step/-init-.html @@ -7,7 +7,7 @@ api / TransactionBuildStep / <init>

<init>

-TransactionBuildStep(generateMethodName: String, args: Map<String, Any?>)
+TransactionBuildStep(generateMethodName: String, args: Map<String, Any?>)

Encapsulate a generateXXX method call on a contract.



diff --git a/docs/build/html/api/api/-transaction-build-step/args.html b/docs/build/html/api/api/-transaction-build-step/args.html index 53f68d0dbf..96e98b0557 100644 --- a/docs/build/html/api/api/-transaction-build-step/args.html +++ b/docs/build/html/api/api/-transaction-build-step/args.html @@ -7,7 +7,7 @@ api / TransactionBuildStep / args

args

- + val args: Map<String, Any?>


diff --git a/docs/build/html/api/api/-transaction-build-step/generate-method-name.html b/docs/build/html/api/api/-transaction-build-step/generate-method-name.html index c01febba4a..45a8f83c2f 100644 --- a/docs/build/html/api/api/-transaction-build-step/generate-method-name.html +++ b/docs/build/html/api/api/-transaction-build-step/generate-method-name.html @@ -7,7 +7,7 @@ api / TransactionBuildStep / generateMethodName

generateMethodName

- + val generateMethodName: String


diff --git a/docs/build/html/api/api/-transaction-build-step/index.html b/docs/build/html/api/api/-transaction-build-step/index.html index 3f50fe21b0..36bcd471b3 100644 --- a/docs/build/html/api/api/-transaction-build-step/index.html +++ b/docs/build/html/api/api/-transaction-build-step/index.html @@ -18,7 +18,7 @@ <init> -TransactionBuildStep(generateMethodName: String, args: Map<String, Any?>)

Encapsulate a generateXXX method call on a contract.

+TransactionBuildStep(generateMethodName: String, args: Map<String, Any?>)

Encapsulate a generateXXX method call on a contract.

diff --git a/docs/build/html/api/core.messaging/-state-machine-manager/-fiber-request/-expecting-response/-init-.html b/docs/build/html/api/core.messaging/-state-machine-manager/-fiber-request/-expecting-response/-init-.html index bc39c91e16..4a2491164b 100644 --- a/docs/build/html/api/core.messaging/-state-machine-manager/-fiber-request/-expecting-response/-init-.html +++ b/docs/build/html/api/core.messaging/-state-machine-manager/-fiber-request/-expecting-response/-init-.html @@ -7,7 +7,7 @@ core.messaging / StateMachineManager / FiberRequest / ExpectingResponse / <init>

<init>

-ExpectingResponse(topic: String, destination: MessageRecipients?, sessionIDForSend: Long, sessionIDForReceive: Long, obj: Any?, responseType: Class<R>)
+ExpectingResponse(topic: String, destination: MessageRecipients?, sessionIDForSend: Long, sessionIDForReceive: Long, obj: Any?, responseType: Class<R>)


diff --git a/docs/build/html/api/core.messaging/-state-machine-manager/-fiber-request/-expecting-response/index.html b/docs/build/html/api/core.messaging/-state-machine-manager/-fiber-request/-expecting-response/index.html index 551f1c91ea..870e6816ee 100644 --- a/docs/build/html/api/core.messaging/-state-machine-manager/-fiber-request/-expecting-response/index.html +++ b/docs/build/html/api/core.messaging/-state-machine-manager/-fiber-request/-expecting-response/index.html @@ -17,7 +17,7 @@ <init> -ExpectingResponse(topic: String, destination: MessageRecipients?, sessionIDForSend: Long, sessionIDForReceive: Long, obj: Any?, responseType: Class<R>) +ExpectingResponse(topic: String, destination: MessageRecipients?, sessionIDForSend: Long, sessionIDForReceive: Long, obj: Any?, responseType: Class<R>) diff --git a/docs/build/html/api/core.messaging/-state-machine-manager/-fiber-request/-expecting-response/response-type.html b/docs/build/html/api/core.messaging/-state-machine-manager/-fiber-request/-expecting-response/response-type.html index 06808768a7..de922a3e2a 100644 --- a/docs/build/html/api/core.messaging/-state-machine-manager/-fiber-request/-expecting-response/response-type.html +++ b/docs/build/html/api/core.messaging/-state-machine-manager/-fiber-request/-expecting-response/response-type.html @@ -7,7 +7,7 @@ core.messaging / StateMachineManager / FiberRequest / ExpectingResponse / responseType

responseType

- + val responseType: Class<R>


diff --git a/docs/build/html/api/core.messaging/-state-machine-manager/-fiber-request/-init-.html b/docs/build/html/api/core.messaging/-state-machine-manager/-fiber-request/-init-.html index 8cd98d402b..ea67fca681 100644 --- a/docs/build/html/api/core.messaging/-state-machine-manager/-fiber-request/-init-.html +++ b/docs/build/html/api/core.messaging/-state-machine-manager/-fiber-request/-init-.html @@ -7,7 +7,7 @@ core.messaging / StateMachineManager / FiberRequest / <init>

<init>

-FiberRequest(topic: String, destination: MessageRecipients?, sessionIDForSend: Long, sessionIDForReceive: Long, obj: Any?)
+FiberRequest(topic: String, destination: MessageRecipients?, sessionIDForSend: Long, sessionIDForReceive: Long, obj: Any?)


diff --git a/docs/build/html/api/core.messaging/-state-machine-manager/-fiber-request/-not-expecting-response/-init-.html b/docs/build/html/api/core.messaging/-state-machine-manager/-fiber-request/-not-expecting-response/-init-.html index ec9db5833d..50a409c4fe 100644 --- a/docs/build/html/api/core.messaging/-state-machine-manager/-fiber-request/-not-expecting-response/-init-.html +++ b/docs/build/html/api/core.messaging/-state-machine-manager/-fiber-request/-not-expecting-response/-init-.html @@ -7,7 +7,7 @@ core.messaging / StateMachineManager / FiberRequest / NotExpectingResponse / <init>

<init>

-NotExpectingResponse(topic: String, destination: MessageRecipients, sessionIDForSend: Long, obj: Any?)
+NotExpectingResponse(topic: String, destination: MessageRecipients, sessionIDForSend: Long, obj: Any?)


diff --git a/docs/build/html/api/core.messaging/-state-machine-manager/-fiber-request/-not-expecting-response/index.html b/docs/build/html/api/core.messaging/-state-machine-manager/-fiber-request/-not-expecting-response/index.html index d34b2017ef..19dd6dedc8 100644 --- a/docs/build/html/api/core.messaging/-state-machine-manager/-fiber-request/-not-expecting-response/index.html +++ b/docs/build/html/api/core.messaging/-state-machine-manager/-fiber-request/-not-expecting-response/index.html @@ -17,7 +17,7 @@ <init> -NotExpectingResponse(topic: String, destination: MessageRecipients, sessionIDForSend: Long, obj: Any?) +NotExpectingResponse(topic: String, destination: MessageRecipients, sessionIDForSend: Long, obj: Any?) diff --git a/docs/build/html/api/core.messaging/-state-machine-manager/-fiber-request/destination.html b/docs/build/html/api/core.messaging/-state-machine-manager/-fiber-request/destination.html index c67bf7ad20..7e494b78ae 100644 --- a/docs/build/html/api/core.messaging/-state-machine-manager/-fiber-request/destination.html +++ b/docs/build/html/api/core.messaging/-state-machine-manager/-fiber-request/destination.html @@ -7,7 +7,7 @@ core.messaging / StateMachineManager / FiberRequest / destination

destination

- + val destination: MessageRecipients?


diff --git a/docs/build/html/api/core.messaging/-state-machine-manager/-fiber-request/index.html b/docs/build/html/api/core.messaging/-state-machine-manager/-fiber-request/index.html index b3dd2a2730..61aee3f774 100644 --- a/docs/build/html/api/core.messaging/-state-machine-manager/-fiber-request/index.html +++ b/docs/build/html/api/core.messaging/-state-machine-manager/-fiber-request/index.html @@ -34,7 +34,7 @@ <init> -FiberRequest(topic: String, destination: MessageRecipients?, sessionIDForSend: Long, sessionIDForReceive: Long, obj: Any?) +FiberRequest(topic: String, destination: MessageRecipients?, sessionIDForSend: Long, sessionIDForReceive: Long, obj: Any?) diff --git a/docs/build/html/api/core.messaging/-state-machine-manager/-fiber-request/obj.html b/docs/build/html/api/core.messaging/-state-machine-manager/-fiber-request/obj.html index 59a930234b..6f8f1f65c0 100644 --- a/docs/build/html/api/core.messaging/-state-machine-manager/-fiber-request/obj.html +++ b/docs/build/html/api/core.messaging/-state-machine-manager/-fiber-request/obj.html @@ -7,7 +7,7 @@ core.messaging / StateMachineManager / FiberRequest / obj

obj

- + val obj: Any?


diff --git a/docs/build/html/api/core.messaging/-state-machine-manager/-fiber-request/session-i-d-for-receive.html b/docs/build/html/api/core.messaging/-state-machine-manager/-fiber-request/session-i-d-for-receive.html index 71edcfa82c..9858283af5 100644 --- a/docs/build/html/api/core.messaging/-state-machine-manager/-fiber-request/session-i-d-for-receive.html +++ b/docs/build/html/api/core.messaging/-state-machine-manager/-fiber-request/session-i-d-for-receive.html @@ -7,7 +7,7 @@ core.messaging / StateMachineManager / FiberRequest / sessionIDForReceive

sessionIDForReceive

- + val sessionIDForReceive: Long


diff --git a/docs/build/html/api/core.messaging/-state-machine-manager/-fiber-request/session-i-d-for-send.html b/docs/build/html/api/core.messaging/-state-machine-manager/-fiber-request/session-i-d-for-send.html index 31900075b9..1598718b23 100644 --- a/docs/build/html/api/core.messaging/-state-machine-manager/-fiber-request/session-i-d-for-send.html +++ b/docs/build/html/api/core.messaging/-state-machine-manager/-fiber-request/session-i-d-for-send.html @@ -7,7 +7,7 @@ core.messaging / StateMachineManager / FiberRequest / sessionIDForSend

sessionIDForSend

- + val sessionIDForSend: Long


diff --git a/docs/build/html/api/core.messaging/-state-machine-manager/-fiber-request/stack-trace-in-case-of-problems.html b/docs/build/html/api/core.messaging/-state-machine-manager/-fiber-request/stack-trace-in-case-of-problems.html index b734831095..1d094324d9 100644 --- a/docs/build/html/api/core.messaging/-state-machine-manager/-fiber-request/stack-trace-in-case-of-problems.html +++ b/docs/build/html/api/core.messaging/-state-machine-manager/-fiber-request/stack-trace-in-case-of-problems.html @@ -7,7 +7,7 @@ core.messaging / StateMachineManager / FiberRequest / stackTraceInCaseOfProblems

stackTraceInCaseOfProblems

- + val stackTraceInCaseOfProblems: StackSnapshot


diff --git a/docs/build/html/api/core.messaging/-state-machine-manager/-fiber-request/topic.html b/docs/build/html/api/core.messaging/-state-machine-manager/-fiber-request/topic.html index 6a805c7ceb..285b5a09f4 100644 --- a/docs/build/html/api/core.messaging/-state-machine-manager/-fiber-request/topic.html +++ b/docs/build/html/api/core.messaging/-state-machine-manager/-fiber-request/topic.html @@ -7,7 +7,7 @@ core.messaging / StateMachineManager / FiberRequest / topic

topic

- + val topic: String


diff --git a/docs/build/html/api/core.messaging/-state-machine-manager/-init-.html b/docs/build/html/api/core.messaging/-state-machine-manager/-init-.html index 70db983fe2..85e9d23af2 100644 --- a/docs/build/html/api/core.messaging/-state-machine-manager/-init-.html +++ b/docs/build/html/api/core.messaging/-state-machine-manager/-init-.html @@ -7,7 +7,7 @@ core.messaging / StateMachineManager / <init>

<init>

-StateMachineManager(serviceHub: ServiceHub, executor: AffinityExecutor)
+StateMachineManager(serviceHub: ServiceHub, executor: AffinityExecutor)

A StateMachineManager is responsible for coordination and persistence of multiple ProtocolStateMachine objects. Each such object represents an instantiation of a (two-party) protocol that has reached a particular point.

An implementation of this class will persist state machines to long term storage so they can survive process restarts diff --git a/docs/build/html/api/core.messaging/-state-machine-manager/add.html b/docs/build/html/api/core.messaging/-state-machine-manager/add.html index fa28ee12f5..69b5a4697b 100644 --- a/docs/build/html/api/core.messaging/-state-machine-manager/add.html +++ b/docs/build/html/api/core.messaging/-state-machine-manager/add.html @@ -7,8 +7,8 @@ core.messaging / StateMachineManager / add

add

- -fun <T> add(loggerName: String, logic: ProtocolLogic<T>): <ERROR CLASS><T>
+ +fun <T> add(loggerName: String, logic: ProtocolLogic<T>): <ERROR CLASS><T>

Kicks off a brand new state machine of the given class. It will log with the named logger. The state machine will be persisted when it suspends, with automated restart if the StateMachineManager is restarted with checkpointed state machines in the storage service.

diff --git a/docs/build/html/api/core.messaging/-state-machine-manager/executor.html b/docs/build/html/api/core.messaging/-state-machine-manager/executor.html index 75f15716f3..c1a24a730c 100644 --- a/docs/build/html/api/core.messaging/-state-machine-manager/executor.html +++ b/docs/build/html/api/core.messaging/-state-machine-manager/executor.html @@ -7,7 +7,7 @@ core.messaging / StateMachineManager / executor

executor

- + val executor: AffinityExecutor


diff --git a/docs/build/html/api/core.messaging/-state-machine-manager/find-state-machines.html b/docs/build/html/api/core.messaging/-state-machine-manager/find-state-machines.html index 88a2990dc7..743ca14abc 100644 --- a/docs/build/html/api/core.messaging/-state-machine-manager/find-state-machines.html +++ b/docs/build/html/api/core.messaging/-state-machine-manager/find-state-machines.html @@ -7,8 +7,8 @@ core.messaging / StateMachineManager / findStateMachines

findStateMachines

- -fun <T> findStateMachines(klass: Class<out ProtocolLogic<T>>): List<<ERROR CLASS><ProtocolLogic<T>, <ERROR CLASS><T>>>
+ +fun <T> findStateMachines(klass: Class<out ProtocolLogic<T>>): List<<ERROR CLASS><ProtocolLogic<T>, <ERROR CLASS><T>>>

Returns a list of all state machines executing the given protocol logic at the top level (subprotocols do not count)



diff --git a/docs/build/html/api/core.messaging/-state-machine-manager/index.html b/docs/build/html/api/core.messaging/-state-machine-manager/index.html index 3cf765f3df..297e926dae 100644 --- a/docs/build/html/api/core.messaging/-state-machine-manager/index.html +++ b/docs/build/html/api/core.messaging/-state-machine-manager/index.html @@ -55,7 +55,7 @@ TODO: Implement stub/skel classes that provide a basic RPC framework on top of t <init> -StateMachineManager(serviceHub: ServiceHub, executor: AffinityExecutor)

A StateMachineManager is responsible for coordination and persistence of multiple ProtocolStateMachine objects. +StateMachineManager(serviceHub: ServiceHub, executor: AffinityExecutor)

A StateMachineManager is responsible for coordination and persistence of multiple ProtocolStateMachine objects. Each such object represents an instantiation of a (two-party) protocol that has reached a particular point.

@@ -91,7 +91,7 @@ Each such object represents an instantiation of a (two-party) protocol that has add -fun <T> add(loggerName: String, logic: ProtocolLogic<T>): <ERROR CLASS><T>

Kicks off a brand new state machine of the given class. It will log with the named logger. +fun <T> add(loggerName: String, logic: ProtocolLogic<T>): <ERROR CLASS><T>

Kicks off a brand new state machine of the given class. It will log with the named logger. The state machine will be persisted when it suspends, with automated restart if the StateMachineManager is restarted with checkpointed state machines in the storage service.

@@ -100,7 +100,7 @@ restarted with checkpointed state machines in the storage service.

findStateMachines -fun <T> findStateMachines(klass: Class<out ProtocolLogic<T>>): List<<ERROR CLASS><ProtocolLogic<T>, <ERROR CLASS><T>>>

Returns a list of all state machines executing the given protocol logic at the top level (subprotocols do not count)

+fun <T> findStateMachines(klass: Class<out ProtocolLogic<T>>): List<<ERROR CLASS><ProtocolLogic<T>, <ERROR CLASS><T>>>

Returns a list of all state machines executing the given protocol logic at the top level (subprotocols do not count)

diff --git a/docs/build/html/api/core.messaging/-state-machine-manager/scheduler.html b/docs/build/html/api/core.messaging/-state-machine-manager/scheduler.html index f99b8f43ef..f58a032e81 100644 --- a/docs/build/html/api/core.messaging/-state-machine-manager/scheduler.html +++ b/docs/build/html/api/core.messaging/-state-machine-manager/scheduler.html @@ -7,7 +7,7 @@ core.messaging / StateMachineManager / scheduler

scheduler

- + val scheduler: FiberScheduler


diff --git a/docs/build/html/api/core.messaging/-state-machine-manager/service-hub.html b/docs/build/html/api/core.messaging/-state-machine-manager/service-hub.html index 2c30dba92a..444de82e4b 100644 --- a/docs/build/html/api/core.messaging/-state-machine-manager/service-hub.html +++ b/docs/build/html/api/core.messaging/-state-machine-manager/service-hub.html @@ -7,7 +7,7 @@ core.messaging / StateMachineManager / serviceHub

serviceHub

- + val serviceHub: ServiceHub


diff --git a/docs/build/html/api/core.node.services/-abstract-node-service/-init-.html b/docs/build/html/api/core.node.services/-abstract-node-service/-init-.html index fef3411e7d..4b491609d3 100644 --- a/docs/build/html/api/core.node.services/-abstract-node-service/-init-.html +++ b/docs/build/html/api/core.node.services/-abstract-node-service/-init-.html @@ -7,7 +7,7 @@ core.node.services / AbstractNodeService / <init>

<init>

-AbstractNodeService(net: MessagingService)
+AbstractNodeService(net: MessagingService)

Abstract superclass for services that a node can host, which provides helper functions.



diff --git a/docs/build/html/api/core.node.services/-abstract-node-service/add-message-handler.html b/docs/build/html/api/core.node.services/-abstract-node-service/add-message-handler.html index 010b6e12a0..b328005b4b 100644 --- a/docs/build/html/api/core.node.services/-abstract-node-service/add-message-handler.html +++ b/docs/build/html/api/core.node.services/-abstract-node-service/add-message-handler.html @@ -7,8 +7,8 @@ core.node.services / AbstractNodeService / addMessageHandler

addMessageHandler

- -protected inline fun <reified Q : AbstractRequestMessage, reified R : Any> addMessageHandler(topic: String, crossinline handler: (Q) -> R, crossinline exceptionConsumer: (Message, Exception) -> Unit): Unit
+ +protected inline fun <reified Q : AbstractRequestMessage, reified R : Any> addMessageHandler(topic: String, crossinline handler: (Q) -> R, crossinline exceptionConsumer: (Message, Exception) -> Unit): Unit

Register a handler for a message topic. In comparison to using net.addMessageHandler() this manages a lot of common boilerplate code. Exceptions are caught and passed to the provided consumer.

Parameters

@@ -22,8 +22,8 @@ common boilerplate code. Exceptions are caught and passed to the provided consum exceptionConsumer - a function to which any thrown exception is passed.


- -protected inline fun <reified Q : AbstractRequestMessage, reified R : Any> addMessageHandler(topic: String, crossinline handler: (Q) -> R): Unit
+ +protected inline fun <reified Q : AbstractRequestMessage, reified R : Any> addMessageHandler(topic: String, crossinline handler: (Q) -> R): Unit

Register a handler for a message topic. In comparison to using net.addMessageHandler() this manages a lot of common boilerplate code. Exceptions are propagated to the messaging layer.

Parameters

diff --git a/docs/build/html/api/core.node.services/-abstract-node-service/index.html b/docs/build/html/api/core.node.services/-abstract-node-service/index.html index ab8ae9725b..6d6555cf69 100644 --- a/docs/build/html/api/core.node.services/-abstract-node-service/index.html +++ b/docs/build/html/api/core.node.services/-abstract-node-service/index.html @@ -18,7 +18,7 @@ <init> -AbstractNodeService(net: MessagingService)

Abstract superclass for services that a node can host, which provides helper functions.

+AbstractNodeService(net: MessagingService)

Abstract superclass for services that a node can host, which provides helper functions.

@@ -41,9 +41,9 @@ addMessageHandler -fun <Q : AbstractRequestMessage, R : Any> addMessageHandler(topic: String, handler: (Q) -> R, exceptionConsumer: (Message, Exception) -> Unit): Unit

Register a handler for a message topic. In comparison to using net.addMessageHandler() this manages a lot of +fun <Q : AbstractRequestMessage, R : Any> addMessageHandler(topic: String, handler: (Q) -> R, exceptionConsumer: (Message, Exception) -> Unit): Unit

Register a handler for a message topic. In comparison to using net.addMessageHandler() this manages a lot of common boilerplate code. Exceptions are caught and passed to the provided consumer.

-fun <Q : AbstractRequestMessage, R : Any> addMessageHandler(topic: String, handler: (Q) -> R): Unit

Register a handler for a message topic. In comparison to using net.addMessageHandler() this manages a lot of +fun <Q : AbstractRequestMessage, R : Any> addMessageHandler(topic: String, handler: (Q) -> R): Unit

Register a handler for a message topic. In comparison to using net.addMessageHandler() this manages a lot of common boilerplate code. Exceptions are propagated to the messaging layer.

diff --git a/docs/build/html/api/core.node.services/-abstract-node-service/net.html b/docs/build/html/api/core.node.services/-abstract-node-service/net.html index 3c56620f90..31d0fb0119 100644 --- a/docs/build/html/api/core.node.services/-abstract-node-service/net.html +++ b/docs/build/html/api/core.node.services/-abstract-node-service/net.html @@ -7,7 +7,7 @@ core.node.services / AbstractNodeService / net

net

- + val net: MessagingService


diff --git a/docs/build/html/api/core.node.services/-in-memory-network-map-service/-init-.html b/docs/build/html/api/core.node.services/-in-memory-network-map-service/-init-.html index 1b31bee785..c49fc0e58a 100644 --- a/docs/build/html/api/core.node.services/-in-memory-network-map-service/-init-.html +++ b/docs/build/html/api/core.node.services/-in-memory-network-map-service/-init-.html @@ -7,7 +7,7 @@ core.node.services / InMemoryNetworkMapService / <init>

<init>

-InMemoryNetworkMapService(net: MessagingService, home: NodeRegistration, cache: NetworkMapCache)
+InMemoryNetworkMapService(net: MessagingService, home: NodeRegistration, cache: NetworkMapCache)


diff --git a/docs/build/html/api/core.node.services/-in-memory-network-map-service/cache.html b/docs/build/html/api/core.node.services/-in-memory-network-map-service/cache.html index 20076e7f8d..0509784c2e 100644 --- a/docs/build/html/api/core.node.services/-in-memory-network-map-service/cache.html +++ b/docs/build/html/api/core.node.services/-in-memory-network-map-service/cache.html @@ -7,7 +7,7 @@ core.node.services / InMemoryNetworkMapService / cache

cache

- + val cache: NetworkMapCache


diff --git a/docs/build/html/api/core.node.services/-in-memory-network-map-service/get-unacknowledged-count.html b/docs/build/html/api/core.node.services/-in-memory-network-map-service/get-unacknowledged-count.html index c5f4291e88..c985f38997 100644 --- a/docs/build/html/api/core.node.services/-in-memory-network-map-service/get-unacknowledged-count.html +++ b/docs/build/html/api/core.node.services/-in-memory-network-map-service/get-unacknowledged-count.html @@ -7,8 +7,8 @@ core.node.services / InMemoryNetworkMapService / getUnacknowledgedCount

getUnacknowledgedCount

- -fun getUnacknowledgedCount(subscriber: SingleMessageRecipient): Int?
+ +fun getUnacknowledgedCount(subscriber: SingleMessageRecipient): Int?


diff --git a/docs/build/html/api/core.node.services/-in-memory-network-map-service/index.html b/docs/build/html/api/core.node.services/-in-memory-network-map-service/index.html index 878e2f217e..257f7108a9 100644 --- a/docs/build/html/api/core.node.services/-in-memory-network-map-service/index.html +++ b/docs/build/html/api/core.node.services/-in-memory-network-map-service/index.html @@ -17,7 +17,7 @@ <init> -InMemoryNetworkMapService(net: MessagingService, home: NodeRegistration, cache: NetworkMapCache) +InMemoryNetworkMapService(net: MessagingService, home: NodeRegistration, cache: NetworkMapCache) @@ -71,43 +71,43 @@ getUnacknowledgedCount -fun getUnacknowledgedCount(subscriber: SingleMessageRecipient): Int? +fun getUnacknowledgedCount(subscriber: SingleMessageRecipient): Int? notifySubscribers -fun notifySubscribers(wireReg: WireNodeRegistration): Unit +fun notifySubscribers(wireReg: WireNodeRegistration): Unit processAcknowledge -fun processAcknowledge(req: UpdateAcknowledge): Unit +fun processAcknowledge(req: UpdateAcknowledge): Unit processFetchAllRequest -fun processFetchAllRequest(req: FetchMapRequest): FetchMapResponse +fun processFetchAllRequest(req: FetchMapRequest): FetchMapResponse processQueryRequest -fun processQueryRequest(req: QueryIdentityRequest): QueryIdentityResponse +fun processQueryRequest(req: QueryIdentityRequest): QueryIdentityResponse processRegistrationChangeRequest -fun processRegistrationChangeRequest(req: RegistrationRequest): RegistrationResponse +fun processRegistrationChangeRequest(req: RegistrationRequest): RegistrationResponse processSubscriptionRequest -fun processSubscriptionRequest(req: SubscribeRequest): SubscribeResponse +fun processSubscriptionRequest(req: SubscribeRequest): SubscribeResponse @@ -118,9 +118,9 @@ addMessageHandler -fun <Q : AbstractRequestMessage, R : Any> addMessageHandler(topic: String, handler: (Q) -> R, exceptionConsumer: (Message, Exception) -> Unit): Unit

Register a handler for a message topic. In comparison to using net.addMessageHandler() this manages a lot of +fun <Q : AbstractRequestMessage, R : Any> addMessageHandler(topic: String, handler: (Q) -> R, exceptionConsumer: (Message, Exception) -> Unit): Unit

Register a handler for a message topic. In comparison to using net.addMessageHandler() this manages a lot of common boilerplate code. Exceptions are caught and passed to the provided consumer.

-fun <Q : AbstractRequestMessage, R : Any> addMessageHandler(topic: String, handler: (Q) -> R): Unit

Register a handler for a message topic. In comparison to using net.addMessageHandler() this manages a lot of +fun <Q : AbstractRequestMessage, R : Any> addMessageHandler(topic: String, handler: (Q) -> R): Unit

Register a handler for a message topic. In comparison to using net.addMessageHandler() this manages a lot of common boilerplate code. Exceptions are propagated to the messaging layer.

diff --git a/docs/build/html/api/core.node.services/-in-memory-network-map-service/max-size-registration-request-bytes.html b/docs/build/html/api/core.node.services/-in-memory-network-map-service/max-size-registration-request-bytes.html index 61d590c4f1..2fab7ea0a7 100644 --- a/docs/build/html/api/core.node.services/-in-memory-network-map-service/max-size-registration-request-bytes.html +++ b/docs/build/html/api/core.node.services/-in-memory-network-map-service/max-size-registration-request-bytes.html @@ -7,7 +7,7 @@ core.node.services / InMemoryNetworkMapService / maxSizeRegistrationRequestBytes

maxSizeRegistrationRequestBytes

- + val maxSizeRegistrationRequestBytes: Int

Maximum credible size for a registration request. Generally requests are around 500-600 bytes, so this gives a 10 times overhead.

diff --git a/docs/build/html/api/core.node.services/-in-memory-network-map-service/max-unacknowledged-updates.html b/docs/build/html/api/core.node.services/-in-memory-network-map-service/max-unacknowledged-updates.html index 31b3ee776c..799980c39f 100644 --- a/docs/build/html/api/core.node.services/-in-memory-network-map-service/max-unacknowledged-updates.html +++ b/docs/build/html/api/core.node.services/-in-memory-network-map-service/max-unacknowledged-updates.html @@ -7,7 +7,7 @@ core.node.services / InMemoryNetworkMapService / maxUnacknowledgedUpdates

maxUnacknowledgedUpdates

- + val maxUnacknowledgedUpdates: Int

Maximum number of unacknowledged updates to send to a node before automatically unregistering them for updates


diff --git a/docs/build/html/api/core.node.services/-in-memory-network-map-service/nodes.html b/docs/build/html/api/core.node.services/-in-memory-network-map-service/nodes.html index b9dccf1f67..d30294d04a 100644 --- a/docs/build/html/api/core.node.services/-in-memory-network-map-service/nodes.html +++ b/docs/build/html/api/core.node.services/-in-memory-network-map-service/nodes.html @@ -7,7 +7,7 @@ core.node.services / InMemoryNetworkMapService / nodes

nodes

- + val nodes: List<NodeInfo>
Overrides NetworkMapService.nodes

diff --git a/docs/build/html/api/core.node.services/-in-memory-network-map-service/notify-subscribers.html b/docs/build/html/api/core.node.services/-in-memory-network-map-service/notify-subscribers.html index c209b51a2c..1d2c48f73b 100644 --- a/docs/build/html/api/core.node.services/-in-memory-network-map-service/notify-subscribers.html +++ b/docs/build/html/api/core.node.services/-in-memory-network-map-service/notify-subscribers.html @@ -7,8 +7,8 @@ core.node.services / InMemoryNetworkMapService / notifySubscribers

notifySubscribers

- -fun notifySubscribers(wireReg: WireNodeRegistration): Unit
+ +fun notifySubscribers(wireReg: WireNodeRegistration): Unit


diff --git a/docs/build/html/api/core.node.services/-in-memory-network-map-service/process-acknowledge.html b/docs/build/html/api/core.node.services/-in-memory-network-map-service/process-acknowledge.html index 672fdcbe36..0c3f2546e0 100644 --- a/docs/build/html/api/core.node.services/-in-memory-network-map-service/process-acknowledge.html +++ b/docs/build/html/api/core.node.services/-in-memory-network-map-service/process-acknowledge.html @@ -7,8 +7,8 @@ core.node.services / InMemoryNetworkMapService / processAcknowledge

processAcknowledge

- -fun processAcknowledge(req: UpdateAcknowledge): Unit
+ +fun processAcknowledge(req: UpdateAcknowledge): Unit


diff --git a/docs/build/html/api/core.node.services/-in-memory-network-map-service/process-fetch-all-request.html b/docs/build/html/api/core.node.services/-in-memory-network-map-service/process-fetch-all-request.html index 232eb5f681..79487b3070 100644 --- a/docs/build/html/api/core.node.services/-in-memory-network-map-service/process-fetch-all-request.html +++ b/docs/build/html/api/core.node.services/-in-memory-network-map-service/process-fetch-all-request.html @@ -7,8 +7,8 @@ core.node.services / InMemoryNetworkMapService / processFetchAllRequest

processFetchAllRequest

- -fun processFetchAllRequest(req: FetchMapRequest): FetchMapResponse
+ +fun processFetchAllRequest(req: FetchMapRequest): FetchMapResponse


diff --git a/docs/build/html/api/core.node.services/-in-memory-network-map-service/process-query-request.html b/docs/build/html/api/core.node.services/-in-memory-network-map-service/process-query-request.html index 4cd4b84eb7..7b25fb4f3f 100644 --- a/docs/build/html/api/core.node.services/-in-memory-network-map-service/process-query-request.html +++ b/docs/build/html/api/core.node.services/-in-memory-network-map-service/process-query-request.html @@ -7,8 +7,8 @@ core.node.services / InMemoryNetworkMapService / processQueryRequest

processQueryRequest

- -fun processQueryRequest(req: QueryIdentityRequest): QueryIdentityResponse
+ +fun processQueryRequest(req: QueryIdentityRequest): QueryIdentityResponse


diff --git a/docs/build/html/api/core.node.services/-in-memory-network-map-service/process-registration-change-request.html b/docs/build/html/api/core.node.services/-in-memory-network-map-service/process-registration-change-request.html index 639462f564..81d9bd35db 100644 --- a/docs/build/html/api/core.node.services/-in-memory-network-map-service/process-registration-change-request.html +++ b/docs/build/html/api/core.node.services/-in-memory-network-map-service/process-registration-change-request.html @@ -7,8 +7,8 @@ core.node.services / InMemoryNetworkMapService / processRegistrationChangeRequest

processRegistrationChangeRequest

- -fun processRegistrationChangeRequest(req: RegistrationRequest): RegistrationResponse
+ +fun processRegistrationChangeRequest(req: RegistrationRequest): RegistrationResponse


diff --git a/docs/build/html/api/core.node.services/-in-memory-network-map-service/process-subscription-request.html b/docs/build/html/api/core.node.services/-in-memory-network-map-service/process-subscription-request.html index 654d45a0ff..19229ef19b 100644 --- a/docs/build/html/api/core.node.services/-in-memory-network-map-service/process-subscription-request.html +++ b/docs/build/html/api/core.node.services/-in-memory-network-map-service/process-subscription-request.html @@ -7,8 +7,8 @@ core.node.services / InMemoryNetworkMapService / processSubscriptionRequest

processSubscriptionRequest

- -fun processSubscriptionRequest(req: SubscribeRequest): SubscribeResponse
+ +fun processSubscriptionRequest(req: SubscribeRequest): SubscribeResponse


diff --git a/docs/build/html/api/core.node.services/-network-map-service/-d-e-f-a-u-l-t_-e-x-p-i-r-a-t-i-o-n_-p-e-r-i-o-d.html b/docs/build/html/api/core.node.services/-network-map-service/-d-e-f-a-u-l-t_-e-x-p-i-r-a-t-i-o-n_-p-e-r-i-o-d.html index 091d844167..f7fe064447 100644 --- a/docs/build/html/api/core.node.services/-network-map-service/-d-e-f-a-u-l-t_-e-x-p-i-r-a-t-i-o-n_-p-e-r-i-o-d.html +++ b/docs/build/html/api/core.node.services/-network-map-service/-d-e-f-a-u-l-t_-e-x-p-i-r-a-t-i-o-n_-p-e-r-i-o-d.html @@ -7,7 +7,7 @@ core.node.services / NetworkMapService / DEFAULT_EXPIRATION_PERIOD

DEFAULT_EXPIRATION_PERIOD

- + val DEFAULT_EXPIRATION_PERIOD: Period


diff --git a/docs/build/html/api/core.node.services/-network-map-service/-f-e-t-c-h_-p-r-o-t-o-c-o-l_-t-o-p-i-c.html b/docs/build/html/api/core.node.services/-network-map-service/-f-e-t-c-h_-p-r-o-t-o-c-o-l_-t-o-p-i-c.html index 391e234dbb..4a1bd7bc7e 100644 --- a/docs/build/html/api/core.node.services/-network-map-service/-f-e-t-c-h_-p-r-o-t-o-c-o-l_-t-o-p-i-c.html +++ b/docs/build/html/api/core.node.services/-network-map-service/-f-e-t-c-h_-p-r-o-t-o-c-o-l_-t-o-p-i-c.html @@ -7,7 +7,7 @@ core.node.services / NetworkMapService / FETCH_PROTOCOL_TOPIC

FETCH_PROTOCOL_TOPIC

- + val FETCH_PROTOCOL_TOPIC: String


diff --git a/docs/build/html/api/core.node.services/-network-map-service/-fetch-map-request/-init-.html b/docs/build/html/api/core.node.services/-network-map-service/-fetch-map-request/-init-.html index 4ad91d3436..731f114713 100644 --- a/docs/build/html/api/core.node.services/-network-map-service/-fetch-map-request/-init-.html +++ b/docs/build/html/api/core.node.services/-network-map-service/-fetch-map-request/-init-.html @@ -7,7 +7,7 @@ core.node.services / NetworkMapService / FetchMapRequest / <init>

<init>

-FetchMapRequest(subscribe: Boolean, ifChangedSinceVersion: Int?, replyTo: MessageRecipients, sessionID: Long)
+FetchMapRequest(subscribe: Boolean, ifChangedSinceVersion: Int?, replyTo: MessageRecipients, sessionID: Long)


diff --git a/docs/build/html/api/core.node.services/-network-map-service/-fetch-map-request/if-changed-since-version.html b/docs/build/html/api/core.node.services/-network-map-service/-fetch-map-request/if-changed-since-version.html index f7528cb89c..b588b15258 100644 --- a/docs/build/html/api/core.node.services/-network-map-service/-fetch-map-request/if-changed-since-version.html +++ b/docs/build/html/api/core.node.services/-network-map-service/-fetch-map-request/if-changed-since-version.html @@ -7,7 +7,7 @@ core.node.services / NetworkMapService / FetchMapRequest / ifChangedSinceVersion

ifChangedSinceVersion

- + val ifChangedSinceVersion: Int?


diff --git a/docs/build/html/api/core.node.services/-network-map-service/-fetch-map-request/index.html b/docs/build/html/api/core.node.services/-network-map-service/-fetch-map-request/index.html index 899537d1ba..c473b7335a 100644 --- a/docs/build/html/api/core.node.services/-network-map-service/-fetch-map-request/index.html +++ b/docs/build/html/api/core.node.services/-network-map-service/-fetch-map-request/index.html @@ -17,7 +17,7 @@ <init> -FetchMapRequest(subscribe: Boolean, ifChangedSinceVersion: Int?, replyTo: MessageRecipients, sessionID: Long) +FetchMapRequest(subscribe: Boolean, ifChangedSinceVersion: Int?, replyTo: MessageRecipients, sessionID: Long) diff --git a/docs/build/html/api/core.node.services/-network-map-service/-fetch-map-request/subscribe.html b/docs/build/html/api/core.node.services/-network-map-service/-fetch-map-request/subscribe.html index e089589b14..6594aa45a5 100644 --- a/docs/build/html/api/core.node.services/-network-map-service/-fetch-map-request/subscribe.html +++ b/docs/build/html/api/core.node.services/-network-map-service/-fetch-map-request/subscribe.html @@ -7,7 +7,7 @@ core.node.services / NetworkMapService / FetchMapRequest / subscribe

subscribe

- + val subscribe: Boolean


diff --git a/docs/build/html/api/core.node.services/-network-map-service/-fetch-map-response/-init-.html b/docs/build/html/api/core.node.services/-network-map-service/-fetch-map-response/-init-.html index 1195a194a1..6b69a8200a 100644 --- a/docs/build/html/api/core.node.services/-network-map-service/-fetch-map-response/-init-.html +++ b/docs/build/html/api/core.node.services/-network-map-service/-fetch-map-response/-init-.html @@ -7,7 +7,7 @@ core.node.services / NetworkMapService / FetchMapResponse / <init>

<init>

-FetchMapResponse(nodes: Collection<NodeRegistration>?, version: Int)
+FetchMapResponse(nodes: Collection<NodeRegistration>?, version: Int)


diff --git a/docs/build/html/api/core.node.services/-network-map-service/-fetch-map-response/index.html b/docs/build/html/api/core.node.services/-network-map-service/-fetch-map-response/index.html index e030d8fd47..b91f536cdf 100644 --- a/docs/build/html/api/core.node.services/-network-map-service/-fetch-map-response/index.html +++ b/docs/build/html/api/core.node.services/-network-map-service/-fetch-map-response/index.html @@ -17,7 +17,7 @@ <init> -FetchMapResponse(nodes: Collection<NodeRegistration>?, version: Int) +FetchMapResponse(nodes: Collection<NodeRegistration>?, version: Int) diff --git a/docs/build/html/api/core.node.services/-network-map-service/-fetch-map-response/nodes.html b/docs/build/html/api/core.node.services/-network-map-service/-fetch-map-response/nodes.html index 6489556d3b..b2962c20e2 100644 --- a/docs/build/html/api/core.node.services/-network-map-service/-fetch-map-response/nodes.html +++ b/docs/build/html/api/core.node.services/-network-map-service/-fetch-map-response/nodes.html @@ -7,7 +7,7 @@ core.node.services / NetworkMapService / FetchMapResponse / nodes

nodes

- + val nodes: Collection<NodeRegistration>?


diff --git a/docs/build/html/api/core.node.services/-network-map-service/-fetch-map-response/version.html b/docs/build/html/api/core.node.services/-network-map-service/-fetch-map-response/version.html index f761a9e2fe..e18a965584 100644 --- a/docs/build/html/api/core.node.services/-network-map-service/-fetch-map-response/version.html +++ b/docs/build/html/api/core.node.services/-network-map-service/-fetch-map-response/version.html @@ -7,7 +7,7 @@ core.node.services / NetworkMapService / FetchMapResponse / version

version

- + val version: Int


diff --git a/docs/build/html/api/core.node.services/-network-map-service/-p-u-s-h_-a-c-k_-p-r-o-t-o-c-o-l_-t-o-p-i-c.html b/docs/build/html/api/core.node.services/-network-map-service/-p-u-s-h_-a-c-k_-p-r-o-t-o-c-o-l_-t-o-p-i-c.html index d1d1a0e2de..a08e92735f 100644 --- a/docs/build/html/api/core.node.services/-network-map-service/-p-u-s-h_-a-c-k_-p-r-o-t-o-c-o-l_-t-o-p-i-c.html +++ b/docs/build/html/api/core.node.services/-network-map-service/-p-u-s-h_-a-c-k_-p-r-o-t-o-c-o-l_-t-o-p-i-c.html @@ -7,7 +7,7 @@ core.node.services / NetworkMapService / PUSH_ACK_PROTOCOL_TOPIC

PUSH_ACK_PROTOCOL_TOPIC

- + val PUSH_ACK_PROTOCOL_TOPIC: String


diff --git a/docs/build/html/api/core.node.services/-network-map-service/-p-u-s-h_-p-r-o-t-o-c-o-l_-t-o-p-i-c.html b/docs/build/html/api/core.node.services/-network-map-service/-p-u-s-h_-p-r-o-t-o-c-o-l_-t-o-p-i-c.html index eda1965be4..be506f6f32 100644 --- a/docs/build/html/api/core.node.services/-network-map-service/-p-u-s-h_-p-r-o-t-o-c-o-l_-t-o-p-i-c.html +++ b/docs/build/html/api/core.node.services/-network-map-service/-p-u-s-h_-p-r-o-t-o-c-o-l_-t-o-p-i-c.html @@ -7,7 +7,7 @@ core.node.services / NetworkMapService / PUSH_PROTOCOL_TOPIC

PUSH_PROTOCOL_TOPIC

- + val PUSH_PROTOCOL_TOPIC: String


diff --git a/docs/build/html/api/core.node.services/-network-map-service/-q-u-e-r-y_-p-r-o-t-o-c-o-l_-t-o-p-i-c.html b/docs/build/html/api/core.node.services/-network-map-service/-q-u-e-r-y_-p-r-o-t-o-c-o-l_-t-o-p-i-c.html index 7b2fe0fa87..ecdf139dae 100644 --- a/docs/build/html/api/core.node.services/-network-map-service/-q-u-e-r-y_-p-r-o-t-o-c-o-l_-t-o-p-i-c.html +++ b/docs/build/html/api/core.node.services/-network-map-service/-q-u-e-r-y_-p-r-o-t-o-c-o-l_-t-o-p-i-c.html @@ -7,7 +7,7 @@ core.node.services / NetworkMapService / QUERY_PROTOCOL_TOPIC

QUERY_PROTOCOL_TOPIC

- + val QUERY_PROTOCOL_TOPIC: String


diff --git a/docs/build/html/api/core.node.services/-network-map-service/-query-identity-request/-init-.html b/docs/build/html/api/core.node.services/-network-map-service/-query-identity-request/-init-.html index 95f9857219..3f64950a5f 100644 --- a/docs/build/html/api/core.node.services/-network-map-service/-query-identity-request/-init-.html +++ b/docs/build/html/api/core.node.services/-network-map-service/-query-identity-request/-init-.html @@ -7,7 +7,7 @@ core.node.services / NetworkMapService / QueryIdentityRequest / <init>

<init>

-QueryIdentityRequest(identity: Party, replyTo: MessageRecipients, sessionID: Long)
+QueryIdentityRequest(identity: Party, replyTo: MessageRecipients, sessionID: Long)


diff --git a/docs/build/html/api/core.node.services/-network-map-service/-query-identity-request/identity.html b/docs/build/html/api/core.node.services/-network-map-service/-query-identity-request/identity.html index 888dd05cdd..57316cdc5b 100644 --- a/docs/build/html/api/core.node.services/-network-map-service/-query-identity-request/identity.html +++ b/docs/build/html/api/core.node.services/-network-map-service/-query-identity-request/identity.html @@ -7,7 +7,7 @@ core.node.services / NetworkMapService / QueryIdentityRequest / identity

identity

- + val identity: Party


diff --git a/docs/build/html/api/core.node.services/-network-map-service/-query-identity-request/index.html b/docs/build/html/api/core.node.services/-network-map-service/-query-identity-request/index.html index fc3f89669f..1260f3e539 100644 --- a/docs/build/html/api/core.node.services/-network-map-service/-query-identity-request/index.html +++ b/docs/build/html/api/core.node.services/-network-map-service/-query-identity-request/index.html @@ -17,7 +17,7 @@ <init> -QueryIdentityRequest(identity: Party, replyTo: MessageRecipients, sessionID: Long) +QueryIdentityRequest(identity: Party, replyTo: MessageRecipients, sessionID: Long) diff --git a/docs/build/html/api/core.node.services/-network-map-service/-query-identity-response/-init-.html b/docs/build/html/api/core.node.services/-network-map-service/-query-identity-response/-init-.html index 38680a0759..2b8883652e 100644 --- a/docs/build/html/api/core.node.services/-network-map-service/-query-identity-response/-init-.html +++ b/docs/build/html/api/core.node.services/-network-map-service/-query-identity-response/-init-.html @@ -7,7 +7,7 @@ core.node.services / NetworkMapService / QueryIdentityResponse / <init>

<init>

-QueryIdentityResponse(node: NodeInfo?)
+QueryIdentityResponse(node: NodeInfo?)


diff --git a/docs/build/html/api/core.node.services/-network-map-service/-query-identity-response/index.html b/docs/build/html/api/core.node.services/-network-map-service/-query-identity-response/index.html index de092cf79c..7efd7625ac 100644 --- a/docs/build/html/api/core.node.services/-network-map-service/-query-identity-response/index.html +++ b/docs/build/html/api/core.node.services/-network-map-service/-query-identity-response/index.html @@ -17,7 +17,7 @@ <init> -QueryIdentityResponse(node: NodeInfo?) +QueryIdentityResponse(node: NodeInfo?) diff --git a/docs/build/html/api/core.node.services/-network-map-service/-query-identity-response/node.html b/docs/build/html/api/core.node.services/-network-map-service/-query-identity-response/node.html index 3512d24d27..0f7239f10a 100644 --- a/docs/build/html/api/core.node.services/-network-map-service/-query-identity-response/node.html +++ b/docs/build/html/api/core.node.services/-network-map-service/-query-identity-response/node.html @@ -7,7 +7,7 @@ core.node.services / NetworkMapService / QueryIdentityResponse / node

node

- + val node: NodeInfo?


diff --git a/docs/build/html/api/core.node.services/-network-map-service/-r-e-g-i-s-t-e-r_-p-r-o-t-o-c-o-l_-t-o-p-i-c.html b/docs/build/html/api/core.node.services/-network-map-service/-r-e-g-i-s-t-e-r_-p-r-o-t-o-c-o-l_-t-o-p-i-c.html index c56cf4fec9..2e397edbbb 100644 --- a/docs/build/html/api/core.node.services/-network-map-service/-r-e-g-i-s-t-e-r_-p-r-o-t-o-c-o-l_-t-o-p-i-c.html +++ b/docs/build/html/api/core.node.services/-network-map-service/-r-e-g-i-s-t-e-r_-p-r-o-t-o-c-o-l_-t-o-p-i-c.html @@ -7,7 +7,7 @@ core.node.services / NetworkMapService / REGISTER_PROTOCOL_TOPIC

REGISTER_PROTOCOL_TOPIC

- + val REGISTER_PROTOCOL_TOPIC: String


diff --git a/docs/build/html/api/core.node.services/-network-map-service/-registration-request/-init-.html b/docs/build/html/api/core.node.services/-network-map-service/-registration-request/-init-.html index eced992064..cbbc9fa08a 100644 --- a/docs/build/html/api/core.node.services/-network-map-service/-registration-request/-init-.html +++ b/docs/build/html/api/core.node.services/-network-map-service/-registration-request/-init-.html @@ -7,7 +7,7 @@ core.node.services / NetworkMapService / RegistrationRequest / <init>

<init>

-RegistrationRequest(wireReg: WireNodeRegistration, replyTo: MessageRecipients, sessionID: Long)
+RegistrationRequest(wireReg: WireNodeRegistration, replyTo: MessageRecipients, sessionID: Long)


diff --git a/docs/build/html/api/core.node.services/-network-map-service/-registration-request/index.html b/docs/build/html/api/core.node.services/-network-map-service/-registration-request/index.html index 36f43ae538..e3b71cebd2 100644 --- a/docs/build/html/api/core.node.services/-network-map-service/-registration-request/index.html +++ b/docs/build/html/api/core.node.services/-network-map-service/-registration-request/index.html @@ -17,7 +17,7 @@ <init> -RegistrationRequest(wireReg: WireNodeRegistration, replyTo: MessageRecipients, sessionID: Long) +RegistrationRequest(wireReg: WireNodeRegistration, replyTo: MessageRecipients, sessionID: Long) diff --git a/docs/build/html/api/core.node.services/-network-map-service/-registration-request/wire-reg.html b/docs/build/html/api/core.node.services/-network-map-service/-registration-request/wire-reg.html index d9be6ddb4e..89d5ae2bf9 100644 --- a/docs/build/html/api/core.node.services/-network-map-service/-registration-request/wire-reg.html +++ b/docs/build/html/api/core.node.services/-network-map-service/-registration-request/wire-reg.html @@ -7,7 +7,7 @@ core.node.services / NetworkMapService / RegistrationRequest / wireReg

wireReg

- + val wireReg: WireNodeRegistration


diff --git a/docs/build/html/api/core.node.services/-network-map-service/-registration-response/-init-.html b/docs/build/html/api/core.node.services/-network-map-service/-registration-response/-init-.html index 5cc33c6fec..4ef8568bd7 100644 --- a/docs/build/html/api/core.node.services/-network-map-service/-registration-response/-init-.html +++ b/docs/build/html/api/core.node.services/-network-map-service/-registration-response/-init-.html @@ -7,7 +7,7 @@ core.node.services / NetworkMapService / RegistrationResponse / <init>

<init>

-RegistrationResponse(success: Boolean)
+RegistrationResponse(success: Boolean)


diff --git a/docs/build/html/api/core.node.services/-network-map-service/-registration-response/index.html b/docs/build/html/api/core.node.services/-network-map-service/-registration-response/index.html index 346cb979f8..2def0535e8 100644 --- a/docs/build/html/api/core.node.services/-network-map-service/-registration-response/index.html +++ b/docs/build/html/api/core.node.services/-network-map-service/-registration-response/index.html @@ -17,7 +17,7 @@ <init> -RegistrationResponse(success: Boolean) +RegistrationResponse(success: Boolean) diff --git a/docs/build/html/api/core.node.services/-network-map-service/-registration-response/success.html b/docs/build/html/api/core.node.services/-network-map-service/-registration-response/success.html index 76e186bc00..b90997416e 100644 --- a/docs/build/html/api/core.node.services/-network-map-service/-registration-response/success.html +++ b/docs/build/html/api/core.node.services/-network-map-service/-registration-response/success.html @@ -7,7 +7,7 @@ core.node.services / NetworkMapService / RegistrationResponse / success

success

- + val success: Boolean


diff --git a/docs/build/html/api/core.node.services/-network-map-service/-s-u-b-s-c-r-i-p-t-i-o-n_-p-r-o-t-o-c-o-l_-t-o-p-i-c.html b/docs/build/html/api/core.node.services/-network-map-service/-s-u-b-s-c-r-i-p-t-i-o-n_-p-r-o-t-o-c-o-l_-t-o-p-i-c.html index b947cd97c1..b7c627eac0 100644 --- a/docs/build/html/api/core.node.services/-network-map-service/-s-u-b-s-c-r-i-p-t-i-o-n_-p-r-o-t-o-c-o-l_-t-o-p-i-c.html +++ b/docs/build/html/api/core.node.services/-network-map-service/-s-u-b-s-c-r-i-p-t-i-o-n_-p-r-o-t-o-c-o-l_-t-o-p-i-c.html @@ -7,7 +7,7 @@ core.node.services / NetworkMapService / SUBSCRIPTION_PROTOCOL_TOPIC

SUBSCRIPTION_PROTOCOL_TOPIC

- + val SUBSCRIPTION_PROTOCOL_TOPIC: String


diff --git a/docs/build/html/api/core.node.services/-network-map-service/-subscribe-request/-init-.html b/docs/build/html/api/core.node.services/-network-map-service/-subscribe-request/-init-.html index cf51439727..4d1a2fc451 100644 --- a/docs/build/html/api/core.node.services/-network-map-service/-subscribe-request/-init-.html +++ b/docs/build/html/api/core.node.services/-network-map-service/-subscribe-request/-init-.html @@ -7,7 +7,7 @@ core.node.services / NetworkMapService / SubscribeRequest / <init>

<init>

-SubscribeRequest(subscribe: Boolean, replyTo: MessageRecipients, sessionID: Long)
+SubscribeRequest(subscribe: Boolean, replyTo: MessageRecipients, sessionID: Long)


diff --git a/docs/build/html/api/core.node.services/-network-map-service/-subscribe-request/index.html b/docs/build/html/api/core.node.services/-network-map-service/-subscribe-request/index.html index 01f1916a65..f3e0bda70a 100644 --- a/docs/build/html/api/core.node.services/-network-map-service/-subscribe-request/index.html +++ b/docs/build/html/api/core.node.services/-network-map-service/-subscribe-request/index.html @@ -17,7 +17,7 @@ <init> -SubscribeRequest(subscribe: Boolean, replyTo: MessageRecipients, sessionID: Long) +SubscribeRequest(subscribe: Boolean, replyTo: MessageRecipients, sessionID: Long) diff --git a/docs/build/html/api/core.node.services/-network-map-service/-subscribe-request/subscribe.html b/docs/build/html/api/core.node.services/-network-map-service/-subscribe-request/subscribe.html index 4870d74d68..087c031bf7 100644 --- a/docs/build/html/api/core.node.services/-network-map-service/-subscribe-request/subscribe.html +++ b/docs/build/html/api/core.node.services/-network-map-service/-subscribe-request/subscribe.html @@ -7,7 +7,7 @@ core.node.services / NetworkMapService / SubscribeRequest / subscribe

subscribe

- + val subscribe: Boolean


diff --git a/docs/build/html/api/core.node.services/-network-map-service/-subscribe-response/-init-.html b/docs/build/html/api/core.node.services/-network-map-service/-subscribe-response/-init-.html index a12c534bc7..35b537309b 100644 --- a/docs/build/html/api/core.node.services/-network-map-service/-subscribe-response/-init-.html +++ b/docs/build/html/api/core.node.services/-network-map-service/-subscribe-response/-init-.html @@ -7,7 +7,7 @@ core.node.services / NetworkMapService / SubscribeResponse / <init>

<init>

-SubscribeResponse(confirmed: Boolean)
+SubscribeResponse(confirmed: Boolean)


diff --git a/docs/build/html/api/core.node.services/-network-map-service/-subscribe-response/confirmed.html b/docs/build/html/api/core.node.services/-network-map-service/-subscribe-response/confirmed.html index 3642ae5ed1..b148e3e817 100644 --- a/docs/build/html/api/core.node.services/-network-map-service/-subscribe-response/confirmed.html +++ b/docs/build/html/api/core.node.services/-network-map-service/-subscribe-response/confirmed.html @@ -7,7 +7,7 @@ core.node.services / NetworkMapService / SubscribeResponse / confirmed

confirmed

- + val confirmed: Boolean


diff --git a/docs/build/html/api/core.node.services/-network-map-service/-subscribe-response/index.html b/docs/build/html/api/core.node.services/-network-map-service/-subscribe-response/index.html index 7f03db7a23..5a33f6e8b6 100644 --- a/docs/build/html/api/core.node.services/-network-map-service/-subscribe-response/index.html +++ b/docs/build/html/api/core.node.services/-network-map-service/-subscribe-response/index.html @@ -17,7 +17,7 @@ <init> -SubscribeResponse(confirmed: Boolean) +SubscribeResponse(confirmed: Boolean) diff --git a/docs/build/html/api/core.node.services/-network-map-service/-update-acknowledge/-init-.html b/docs/build/html/api/core.node.services/-network-map-service/-update-acknowledge/-init-.html index 7266d08e30..89854b8829 100644 --- a/docs/build/html/api/core.node.services/-network-map-service/-update-acknowledge/-init-.html +++ b/docs/build/html/api/core.node.services/-network-map-service/-update-acknowledge/-init-.html @@ -7,7 +7,7 @@ core.node.services / NetworkMapService / UpdateAcknowledge / <init>

<init>

-UpdateAcknowledge(wireRegHash: SecureHash, replyTo: MessageRecipients)
+UpdateAcknowledge(wireRegHash: SecureHash, replyTo: MessageRecipients)


diff --git a/docs/build/html/api/core.node.services/-network-map-service/-update-acknowledge/index.html b/docs/build/html/api/core.node.services/-network-map-service/-update-acknowledge/index.html index a9c7bfac8c..591c641e54 100644 --- a/docs/build/html/api/core.node.services/-network-map-service/-update-acknowledge/index.html +++ b/docs/build/html/api/core.node.services/-network-map-service/-update-acknowledge/index.html @@ -17,7 +17,7 @@ <init> -UpdateAcknowledge(wireRegHash: SecureHash, replyTo: MessageRecipients) +UpdateAcknowledge(wireRegHash: SecureHash, replyTo: MessageRecipients) diff --git a/docs/build/html/api/core.node.services/-network-map-service/-update-acknowledge/reply-to.html b/docs/build/html/api/core.node.services/-network-map-service/-update-acknowledge/reply-to.html index 3e386e36cd..9859a47636 100644 --- a/docs/build/html/api/core.node.services/-network-map-service/-update-acknowledge/reply-to.html +++ b/docs/build/html/api/core.node.services/-network-map-service/-update-acknowledge/reply-to.html @@ -7,7 +7,7 @@ core.node.services / NetworkMapService / UpdateAcknowledge / replyTo

replyTo

- + val replyTo: MessageRecipients


diff --git a/docs/build/html/api/core.node.services/-network-map-service/-update-acknowledge/wire-reg-hash.html b/docs/build/html/api/core.node.services/-network-map-service/-update-acknowledge/wire-reg-hash.html index acd9ac5e84..7da469f63e 100644 --- a/docs/build/html/api/core.node.services/-network-map-service/-update-acknowledge/wire-reg-hash.html +++ b/docs/build/html/api/core.node.services/-network-map-service/-update-acknowledge/wire-reg-hash.html @@ -7,7 +7,7 @@ core.node.services / NetworkMapService / UpdateAcknowledge / wireRegHash

wireRegHash

- + val wireRegHash: SecureHash


diff --git a/docs/build/html/api/core.node.services/-network-map-service/-update/-init-.html b/docs/build/html/api/core.node.services/-network-map-service/-update/-init-.html index f270f1ab90..f09d3918ec 100644 --- a/docs/build/html/api/core.node.services/-network-map-service/-update/-init-.html +++ b/docs/build/html/api/core.node.services/-network-map-service/-update/-init-.html @@ -7,7 +7,7 @@ core.node.services / NetworkMapService / Update / <init>

<init>

-Update(wireReg: WireNodeRegistration, replyTo: MessageRecipients)
+Update(wireReg: WireNodeRegistration, replyTo: MessageRecipients)


diff --git a/docs/build/html/api/core.node.services/-network-map-service/-update/index.html b/docs/build/html/api/core.node.services/-network-map-service/-update/index.html index 1e5476571c..b90e23ec55 100644 --- a/docs/build/html/api/core.node.services/-network-map-service/-update/index.html +++ b/docs/build/html/api/core.node.services/-network-map-service/-update/index.html @@ -17,7 +17,7 @@ <init> -Update(wireReg: WireNodeRegistration, replyTo: MessageRecipients) +Update(wireReg: WireNodeRegistration, replyTo: MessageRecipients) diff --git a/docs/build/html/api/core.node.services/-network-map-service/-update/reply-to.html b/docs/build/html/api/core.node.services/-network-map-service/-update/reply-to.html index d508d11149..007e5d4f56 100644 --- a/docs/build/html/api/core.node.services/-network-map-service/-update/reply-to.html +++ b/docs/build/html/api/core.node.services/-network-map-service/-update/reply-to.html @@ -7,7 +7,7 @@ core.node.services / NetworkMapService / Update / replyTo

replyTo

- + val replyTo: MessageRecipients


diff --git a/docs/build/html/api/core.node.services/-network-map-service/-update/wire-reg.html b/docs/build/html/api/core.node.services/-network-map-service/-update/wire-reg.html index 9dc209c6e7..59632c699c 100644 --- a/docs/build/html/api/core.node.services/-network-map-service/-update/wire-reg.html +++ b/docs/build/html/api/core.node.services/-network-map-service/-update/wire-reg.html @@ -7,7 +7,7 @@ core.node.services / NetworkMapService / Update / wireReg

wireReg

- + val wireReg: WireNodeRegistration


diff --git a/docs/build/html/api/core.node.services/-network-map-service/logger.html b/docs/build/html/api/core.node.services/-network-map-service/logger.html index 5e5a95482e..53e269b356 100644 --- a/docs/build/html/api/core.node.services/-network-map-service/logger.html +++ b/docs/build/html/api/core.node.services/-network-map-service/logger.html @@ -7,7 +7,7 @@ core.node.services / NetworkMapService / logger

logger

- + val logger: <ERROR CLASS>


diff --git a/docs/build/html/api/core.node.services/-network-map-service/nodes.html b/docs/build/html/api/core.node.services/-network-map-service/nodes.html index b911ca67bf..5b5074a3c5 100644 --- a/docs/build/html/api/core.node.services/-network-map-service/nodes.html +++ b/docs/build/html/api/core.node.services/-network-map-service/nodes.html @@ -7,7 +7,7 @@ core.node.services / NetworkMapService / nodes

nodes

- + abstract val nodes: List<NodeInfo>


diff --git a/docs/build/html/api/core.node.services/-node-attachment-service/-init-.html b/docs/build/html/api/core.node.services/-node-attachment-service/-init-.html index c1a6280724..1e1579ac0a 100644 --- a/docs/build/html/api/core.node.services/-node-attachment-service/-init-.html +++ b/docs/build/html/api/core.node.services/-node-attachment-service/-init-.html @@ -7,7 +7,7 @@ core.node.services / NodeAttachmentService / <init>

<init>

-NodeAttachmentService(storePath: Path, metrics: <ERROR CLASS>)
+NodeAttachmentService(storePath: Path, metrics: <ERROR CLASS>)

Stores attachments in the specified local directory, which must exist. Doesnt allow new attachments to be uploaded.



diff --git a/docs/build/html/api/core.node.services/-node-attachment-service/-on-disk-hash-mismatch/-init-.html b/docs/build/html/api/core.node.services/-node-attachment-service/-on-disk-hash-mismatch/-init-.html index ac35735919..60bb723ad8 100644 --- a/docs/build/html/api/core.node.services/-node-attachment-service/-on-disk-hash-mismatch/-init-.html +++ b/docs/build/html/api/core.node.services/-node-attachment-service/-on-disk-hash-mismatch/-init-.html @@ -7,7 +7,7 @@ core.node.services / NodeAttachmentService / OnDiskHashMismatch / <init>

<init>

-OnDiskHashMismatch(file: Path, actual: SecureHash)
+OnDiskHashMismatch(file: Path, actual: SecureHash)


diff --git a/docs/build/html/api/core.node.services/-node-attachment-service/-on-disk-hash-mismatch/actual.html b/docs/build/html/api/core.node.services/-node-attachment-service/-on-disk-hash-mismatch/actual.html index cdf98db116..11e93886bb 100644 --- a/docs/build/html/api/core.node.services/-node-attachment-service/-on-disk-hash-mismatch/actual.html +++ b/docs/build/html/api/core.node.services/-node-attachment-service/-on-disk-hash-mismatch/actual.html @@ -7,7 +7,7 @@ core.node.services / NodeAttachmentService / OnDiskHashMismatch / actual

actual

- + val actual: SecureHash


diff --git a/docs/build/html/api/core.node.services/-node-attachment-service/-on-disk-hash-mismatch/file.html b/docs/build/html/api/core.node.services/-node-attachment-service/-on-disk-hash-mismatch/file.html index 91ef8e9d8f..b8673e1dcd 100644 --- a/docs/build/html/api/core.node.services/-node-attachment-service/-on-disk-hash-mismatch/file.html +++ b/docs/build/html/api/core.node.services/-node-attachment-service/-on-disk-hash-mismatch/file.html @@ -7,7 +7,7 @@ core.node.services / NodeAttachmentService / OnDiskHashMismatch / file

file

- + val file: Path


diff --git a/docs/build/html/api/core.node.services/-node-attachment-service/-on-disk-hash-mismatch/index.html b/docs/build/html/api/core.node.services/-node-attachment-service/-on-disk-hash-mismatch/index.html index d4f8830675..0cacb4b8ff 100644 --- a/docs/build/html/api/core.node.services/-node-attachment-service/-on-disk-hash-mismatch/index.html +++ b/docs/build/html/api/core.node.services/-node-attachment-service/-on-disk-hash-mismatch/index.html @@ -17,7 +17,7 @@ <init> -OnDiskHashMismatch(file: Path, actual: SecureHash) +OnDiskHashMismatch(file: Path, actual: SecureHash) diff --git a/docs/build/html/api/core.node.services/-node-attachment-service/-on-disk-hash-mismatch/to-string.html b/docs/build/html/api/core.node.services/-node-attachment-service/-on-disk-hash-mismatch/to-string.html index 1216e5b38a..8af7d8cf26 100644 --- a/docs/build/html/api/core.node.services/-node-attachment-service/-on-disk-hash-mismatch/to-string.html +++ b/docs/build/html/api/core.node.services/-node-attachment-service/-on-disk-hash-mismatch/to-string.html @@ -7,7 +7,7 @@ core.node.services / NodeAttachmentService / OnDiskHashMismatch / toString

toString

- + fun toString(): String


diff --git a/docs/build/html/api/core.node.services/-node-attachment-service/acceptable-file-extensions.html b/docs/build/html/api/core.node.services/-node-attachment-service/acceptable-file-extensions.html index 5f3df00398..41299b15da 100644 --- a/docs/build/html/api/core.node.services/-node-attachment-service/acceptable-file-extensions.html +++ b/docs/build/html/api/core.node.services/-node-attachment-service/acceptable-file-extensions.html @@ -7,7 +7,7 @@ core.node.services / NodeAttachmentService / acceptableFileExtensions

acceptableFileExtensions

- + val acceptableFileExtensions: <ERROR CLASS>
Overrides AcceptsFileUpload.acceptableFileExtensions

What file extensions are acceptable for the file to be handed to upload()

diff --git a/docs/build/html/api/core.node.services/-node-attachment-service/automatically-extract-attachments.html b/docs/build/html/api/core.node.services/-node-attachment-service/automatically-extract-attachments.html index e54d99170d..59c487a425 100644 --- a/docs/build/html/api/core.node.services/-node-attachment-service/automatically-extract-attachments.html +++ b/docs/build/html/api/core.node.services/-node-attachment-service/automatically-extract-attachments.html @@ -7,7 +7,7 @@ core.node.services / NodeAttachmentService / automaticallyExtractAttachments

automaticallyExtractAttachments

- + var automaticallyExtractAttachments: Boolean

If true, newly inserted attachments will be unzipped to a subdirectory of the storePath. This is intended for human browsing convenience: the attachment itself will still be the file (that is, edits to the extracted directory diff --git a/docs/build/html/api/core.node.services/-node-attachment-service/check-attachments-on-load.html b/docs/build/html/api/core.node.services/-node-attachment-service/check-attachments-on-load.html index 0b2e54365a..4638d4b805 100644 --- a/docs/build/html/api/core.node.services/-node-attachment-service/check-attachments-on-load.html +++ b/docs/build/html/api/core.node.services/-node-attachment-service/check-attachments-on-load.html @@ -7,7 +7,7 @@ core.node.services / NodeAttachmentService / checkAttachmentsOnLoad

checkAttachmentsOnLoad

- + var checkAttachmentsOnLoad: Boolean


diff --git a/docs/build/html/api/core.node.services/-node-attachment-service/data-type-prefix.html b/docs/build/html/api/core.node.services/-node-attachment-service/data-type-prefix.html index fe164f99d9..118de6a42f 100644 --- a/docs/build/html/api/core.node.services/-node-attachment-service/data-type-prefix.html +++ b/docs/build/html/api/core.node.services/-node-attachment-service/data-type-prefix.html @@ -7,7 +7,7 @@ core.node.services / NodeAttachmentService / dataTypePrefix

dataTypePrefix

- + val dataTypePrefix: String
Overrides AcceptsFileUpload.dataTypePrefix

A string that prefixes the URLs, e.g. "attachments" or "interest-rates". Should be OK for URLs.

diff --git a/docs/build/html/api/core.node.services/-node-attachment-service/import-attachment.html b/docs/build/html/api/core.node.services/-node-attachment-service/import-attachment.html index 68c1d0b6e4..ac8548c84a 100644 --- a/docs/build/html/api/core.node.services/-node-attachment-service/import-attachment.html +++ b/docs/build/html/api/core.node.services/-node-attachment-service/import-attachment.html @@ -7,8 +7,8 @@ core.node.services / NodeAttachmentService / importAttachment

importAttachment

- -fun importAttachment(jar: InputStream): SecureHash
+ +fun importAttachment(jar: InputStream): SecureHash
Overrides AttachmentStorage.importAttachment

Inserts the given attachment into the store, does not close the input stream. This can be an intensive operation due to the need to copy the bytes to disk and hash them along the way.

diff --git a/docs/build/html/api/core.node.services/-node-attachment-service/index.html b/docs/build/html/api/core.node.services/-node-attachment-service/index.html index 67e5aec8a6..8afd0e9ee6 100644 --- a/docs/build/html/api/core.node.services/-node-attachment-service/index.html +++ b/docs/build/html/api/core.node.services/-node-attachment-service/index.html @@ -29,7 +29,7 @@ <init> -NodeAttachmentService(storePath: Path, metrics: <ERROR CLASS>)

Stores attachments in the specified local directory, which must exist. Doesnt allow new attachments to be uploaded.

+NodeAttachmentService(storePath: Path, metrics: <ERROR CLASS>)

Stores attachments in the specified local directory, which must exist. Doesnt allow new attachments to be uploaded.

@@ -87,7 +87,7 @@ will not have any effect).

importAttachment -fun importAttachment(jar: InputStream): SecureHash

Inserts the given attachment into the store, does not close the input stream. This can be an intensive +fun importAttachment(jar: InputStream): SecureHash

Inserts the given attachment into the store, does not close the input stream. This can be an intensive operation due to the need to copy the bytes to disk and hash them along the way.

@@ -95,7 +95,7 @@ operation due to the need to copy the bytes to disk and hash them along the way. openAttachment -fun openAttachment(id: SecureHash): Attachment?

Returns a newly opened stream for the given locally stored attachment, or null if no such attachment is known. +fun openAttachment(id: SecureHash): Attachment?

Returns a newly opened stream for the given locally stored attachment, or null if no such attachment is known. The returned stream must be closed when you are done with it to avoid resource leaks. You should probably wrap the result in a JarInputStream unless youre sending it somewhere, there is a convenience helper for this on Attachment.

@@ -105,7 +105,7 @@ on Attachment.

upload -fun upload(data: InputStream): <ERROR CLASS>

Accepts the data in the given input stream, and returns some sort of useful return message that will be sent +fun upload(data: InputStream): <ERROR CLASS>

Accepts the data in the given input stream, and returns some sort of useful return message that will be sent back to the user in the response.

diff --git a/docs/build/html/api/core.node.services/-node-attachment-service/metrics.html b/docs/build/html/api/core.node.services/-node-attachment-service/metrics.html index 30fa055874..37e9bb688b 100644 --- a/docs/build/html/api/core.node.services/-node-attachment-service/metrics.html +++ b/docs/build/html/api/core.node.services/-node-attachment-service/metrics.html @@ -7,7 +7,7 @@ core.node.services / NodeAttachmentService / metrics

metrics

- + val metrics: <ERROR CLASS>


diff --git a/docs/build/html/api/core.node.services/-node-attachment-service/open-attachment.html b/docs/build/html/api/core.node.services/-node-attachment-service/open-attachment.html index 49c09d80e1..667c160651 100644 --- a/docs/build/html/api/core.node.services/-node-attachment-service/open-attachment.html +++ b/docs/build/html/api/core.node.services/-node-attachment-service/open-attachment.html @@ -7,8 +7,8 @@ core.node.services / NodeAttachmentService / openAttachment

openAttachment

- -fun openAttachment(id: SecureHash): Attachment?
+ +fun openAttachment(id: SecureHash): Attachment?
Overrides AttachmentStorage.openAttachment

Returns a newly opened stream for the given locally stored attachment, or null if no such attachment is known. The returned stream must be closed when you are done with it to avoid resource leaks. You should probably wrap diff --git a/docs/build/html/api/core.node.services/-node-attachment-service/store-path.html b/docs/build/html/api/core.node.services/-node-attachment-service/store-path.html index 65acbfe05d..ec962eca75 100644 --- a/docs/build/html/api/core.node.services/-node-attachment-service/store-path.html +++ b/docs/build/html/api/core.node.services/-node-attachment-service/store-path.html @@ -7,7 +7,7 @@ core.node.services / NodeAttachmentService / storePath

storePath

- + val storePath: Path


diff --git a/docs/build/html/api/core.node.services/-node-attachment-service/upload.html b/docs/build/html/api/core.node.services/-node-attachment-service/upload.html index ef56ff01a4..e8343c8010 100644 --- a/docs/build/html/api/core.node.services/-node-attachment-service/upload.html +++ b/docs/build/html/api/core.node.services/-node-attachment-service/upload.html @@ -7,8 +7,8 @@ core.node.services / NodeAttachmentService / upload

upload

- -fun upload(data: InputStream): <ERROR CLASS>
+ +fun upload(data: InputStream): <ERROR CLASS>
Overrides AcceptsFileUpload.upload

Accepts the data in the given input stream, and returns some sort of useful return message that will be sent back to the user in the response.

diff --git a/docs/build/html/api/core.node.services/-node-interest-rates/-fix-container/-init-.html b/docs/build/html/api/core.node.services/-node-interest-rates/-fix-container/-init-.html index 52a1ef0098..6ec4edde88 100644 --- a/docs/build/html/api/core.node.services/-node-interest-rates/-fix-container/-init-.html +++ b/docs/build/html/api/core.node.services/-node-interest-rates/-fix-container/-init-.html @@ -7,7 +7,7 @@ core.node.services / NodeInterestRates / FixContainer / <init>

<init>

-FixContainer(fixes: List<Fix>, factory: InterpolatorFactory = CubicSplineInterpolator.Factory)
+FixContainer(fixes: List<Fix>, factory: InterpolatorFactory = CubicSplineInterpolator.Factory)

Fix container, for every fix name & date pair stores a tenor to interest rate map - InterpolatingRateMap



diff --git a/docs/build/html/api/core.node.services/-node-interest-rates/-fix-container/factory.html b/docs/build/html/api/core.node.services/-node-interest-rates/-fix-container/factory.html index 5d497810ae..5e80df4e6b 100644 --- a/docs/build/html/api/core.node.services/-node-interest-rates/-fix-container/factory.html +++ b/docs/build/html/api/core.node.services/-node-interest-rates/-fix-container/factory.html @@ -7,7 +7,7 @@ core.node.services / NodeInterestRates / FixContainer / factory

factory

- + val factory: InterpolatorFactory


diff --git a/docs/build/html/api/core.node.services/-node-interest-rates/-fix-container/fixes.html b/docs/build/html/api/core.node.services/-node-interest-rates/-fix-container/fixes.html index 19a56e864b..05a2826015 100644 --- a/docs/build/html/api/core.node.services/-node-interest-rates/-fix-container/fixes.html +++ b/docs/build/html/api/core.node.services/-node-interest-rates/-fix-container/fixes.html @@ -7,7 +7,7 @@ core.node.services / NodeInterestRates / FixContainer / fixes

fixes

- + val fixes: List<Fix>


diff --git a/docs/build/html/api/core.node.services/-node-interest-rates/-fix-container/get.html b/docs/build/html/api/core.node.services/-node-interest-rates/-fix-container/get.html index b63c9640d0..97884ae80f 100644 --- a/docs/build/html/api/core.node.services/-node-interest-rates/-fix-container/get.html +++ b/docs/build/html/api/core.node.services/-node-interest-rates/-fix-container/get.html @@ -7,8 +7,8 @@ core.node.services / NodeInterestRates / FixContainer / get

get

- -operator fun get(fixOf: FixOf): Fix?
+ +operator fun get(fixOf: FixOf): Fix?


diff --git a/docs/build/html/api/core.node.services/-node-interest-rates/-fix-container/index.html b/docs/build/html/api/core.node.services/-node-interest-rates/-fix-container/index.html index 155fed04e4..3ef522d1af 100644 --- a/docs/build/html/api/core.node.services/-node-interest-rates/-fix-container/index.html +++ b/docs/build/html/api/core.node.services/-node-interest-rates/-fix-container/index.html @@ -18,7 +18,7 @@ <init> -FixContainer(fixes: List<Fix>, factory: InterpolatorFactory = CubicSplineInterpolator.Factory)

Fix container, for every fix name & date pair stores a tenor to interest rate map - InterpolatingRateMap

+FixContainer(fixes: List<Fix>, factory: InterpolatorFactory = CubicSplineInterpolator.Factory)

Fix container, for every fix name & date pair stores a tenor to interest rate map - InterpolatingRateMap

@@ -53,7 +53,7 @@ get -operator fun get(fixOf: FixOf): Fix? +operator fun get(fixOf: FixOf): Fix? diff --git a/docs/build/html/api/core.node.services/-node-interest-rates/-fix-container/size.html b/docs/build/html/api/core.node.services/-node-interest-rates/-fix-container/size.html index f26be8ea5e..73077cc2fe 100644 --- a/docs/build/html/api/core.node.services/-node-interest-rates/-fix-container/size.html +++ b/docs/build/html/api/core.node.services/-node-interest-rates/-fix-container/size.html @@ -7,7 +7,7 @@ core.node.services / NodeInterestRates / FixContainer / size

size

- + val size: Int


diff --git a/docs/build/html/api/core.node.services/-node-interest-rates/-interpolating-rate-map/-init-.html b/docs/build/html/api/core.node.services/-node-interest-rates/-interpolating-rate-map/-init-.html index d0a93dcfaf..e3f17ff050 100644 --- a/docs/build/html/api/core.node.services/-node-interest-rates/-interpolating-rate-map/-init-.html +++ b/docs/build/html/api/core.node.services/-node-interest-rates/-interpolating-rate-map/-init-.html @@ -7,7 +7,7 @@ core.node.services / NodeInterestRates / InterpolatingRateMap / <init>

<init>

-InterpolatingRateMap(date: LocalDate, inputRates: Map<Tenor, BigDecimal>, calendar: BusinessCalendar, factory: InterpolatorFactory)
+InterpolatingRateMap(date: LocalDate, inputRates: Map<Tenor, BigDecimal>, calendar: BusinessCalendar, factory: InterpolatorFactory)

Stores a mapping between tenors and interest rates. Interpolates missing values using the provided interpolation mechanism.


diff --git a/docs/build/html/api/core.node.services/-node-interest-rates/-interpolating-rate-map/calendar.html b/docs/build/html/api/core.node.services/-node-interest-rates/-interpolating-rate-map/calendar.html index ea24e81ff8..19957e74af 100644 --- a/docs/build/html/api/core.node.services/-node-interest-rates/-interpolating-rate-map/calendar.html +++ b/docs/build/html/api/core.node.services/-node-interest-rates/-interpolating-rate-map/calendar.html @@ -7,7 +7,7 @@ core.node.services / NodeInterestRates / InterpolatingRateMap / calendar

calendar

- + val calendar: BusinessCalendar


diff --git a/docs/build/html/api/core.node.services/-node-interest-rates/-interpolating-rate-map/date.html b/docs/build/html/api/core.node.services/-node-interest-rates/-interpolating-rate-map/date.html index 14e7b74392..61923337a8 100644 --- a/docs/build/html/api/core.node.services/-node-interest-rates/-interpolating-rate-map/date.html +++ b/docs/build/html/api/core.node.services/-node-interest-rates/-interpolating-rate-map/date.html @@ -7,7 +7,7 @@ core.node.services / NodeInterestRates / InterpolatingRateMap / date

date

- + val date: LocalDate


diff --git a/docs/build/html/api/core.node.services/-node-interest-rates/-interpolating-rate-map/factory.html b/docs/build/html/api/core.node.services/-node-interest-rates/-interpolating-rate-map/factory.html index 19dba977cf..00164ce37f 100644 --- a/docs/build/html/api/core.node.services/-node-interest-rates/-interpolating-rate-map/factory.html +++ b/docs/build/html/api/core.node.services/-node-interest-rates/-interpolating-rate-map/factory.html @@ -7,7 +7,7 @@ core.node.services / NodeInterestRates / InterpolatingRateMap / factory

factory

- + val factory: InterpolatorFactory


diff --git a/docs/build/html/api/core.node.services/-node-interest-rates/-interpolating-rate-map/get-rate.html b/docs/build/html/api/core.node.services/-node-interest-rates/-interpolating-rate-map/get-rate.html index ed2ad3c07b..1645b7e5a2 100644 --- a/docs/build/html/api/core.node.services/-node-interest-rates/-interpolating-rate-map/get-rate.html +++ b/docs/build/html/api/core.node.services/-node-interest-rates/-interpolating-rate-map/get-rate.html @@ -7,8 +7,8 @@ core.node.services / NodeInterestRates / InterpolatingRateMap / getRate

getRate

- -fun getRate(tenor: Tenor): BigDecimal?
+ +fun getRate(tenor: Tenor): BigDecimal?

Returns the interest rate for a given Tenor, or null if the rate is not found and cannot be interpolated


diff --git a/docs/build/html/api/core.node.services/-node-interest-rates/-interpolating-rate-map/index.html b/docs/build/html/api/core.node.services/-node-interest-rates/-interpolating-rate-map/index.html index 86d373d59f..479def94e0 100644 --- a/docs/build/html/api/core.node.services/-node-interest-rates/-interpolating-rate-map/index.html +++ b/docs/build/html/api/core.node.services/-node-interest-rates/-interpolating-rate-map/index.html @@ -19,7 +19,7 @@ Interpolates missing values using the provided interpolation mechanism.

<init> -InterpolatingRateMap(date: LocalDate, inputRates: Map<Tenor, BigDecimal>, calendar: BusinessCalendar, factory: InterpolatorFactory)

Stores a mapping between tenors and interest rates. +InterpolatingRateMap(date: LocalDate, inputRates: Map<Tenor, BigDecimal>, calendar: BusinessCalendar, factory: InterpolatorFactory)

Stores a mapping between tenors and interest rates. Interpolates missing values using the provided interpolation mechanism.

@@ -68,7 +68,7 @@ Interpolates missing values using the provided interpolation mechanism.

getRate -fun getRate(tenor: Tenor): BigDecimal?

Returns the interest rate for a given Tenor, +fun getRate(tenor: Tenor): BigDecimal?

Returns the interest rate for a given Tenor, or null if the rate is not found and cannot be interpolated

diff --git a/docs/build/html/api/core.node.services/-node-interest-rates/-interpolating-rate-map/input-rates.html b/docs/build/html/api/core.node.services/-node-interest-rates/-interpolating-rate-map/input-rates.html index 8baa420cc3..b6e42f853d 100644 --- a/docs/build/html/api/core.node.services/-node-interest-rates/-interpolating-rate-map/input-rates.html +++ b/docs/build/html/api/core.node.services/-node-interest-rates/-interpolating-rate-map/input-rates.html @@ -7,7 +7,7 @@ core.node.services / NodeInterestRates / InterpolatingRateMap / inputRates

inputRates

- + val inputRates: Map<Tenor, BigDecimal>


diff --git a/docs/build/html/api/core.node.services/-node-interest-rates/-interpolating-rate-map/size.html b/docs/build/html/api/core.node.services/-node-interest-rates/-interpolating-rate-map/size.html index a888263ea5..8928663288 100644 --- a/docs/build/html/api/core.node.services/-node-interest-rates/-interpolating-rate-map/size.html +++ b/docs/build/html/api/core.node.services/-node-interest-rates/-interpolating-rate-map/size.html @@ -7,7 +7,7 @@ core.node.services / NodeInterestRates / InterpolatingRateMap / size

size

- + val size: Int

Number of rates excluding the interpolated ones


diff --git a/docs/build/html/api/core.node.services/-node-interest-rates/-oracle/-init-.html b/docs/build/html/api/core.node.services/-node-interest-rates/-oracle/-init-.html index 3db3e9fdc9..6002613617 100644 --- a/docs/build/html/api/core.node.services/-node-interest-rates/-oracle/-init-.html +++ b/docs/build/html/api/core.node.services/-node-interest-rates/-oracle/-init-.html @@ -7,7 +7,7 @@ core.node.services / NodeInterestRates / Oracle / <init>

<init>

-Oracle(identity: Party, signingKey: KeyPair)
+Oracle(identity: Party, signingKey: KeyPair)

An implementation of an interest rate fix oracle which is given data in a simple string format.

The oracle will try to interpolate the missing value of a tenor for the given fix name and date.


diff --git a/docs/build/html/api/core.node.services/-node-interest-rates/-oracle/identity.html b/docs/build/html/api/core.node.services/-node-interest-rates/-oracle/identity.html index 6ddbc6627c..d982d91993 100644 --- a/docs/build/html/api/core.node.services/-node-interest-rates/-oracle/identity.html +++ b/docs/build/html/api/core.node.services/-node-interest-rates/-oracle/identity.html @@ -7,7 +7,7 @@ core.node.services / NodeInterestRates / Oracle / identity

identity

- + val identity: Party


diff --git a/docs/build/html/api/core.node.services/-node-interest-rates/-oracle/index.html b/docs/build/html/api/core.node.services/-node-interest-rates/-oracle/index.html index cbbc7da54c..818ce2acc3 100644 --- a/docs/build/html/api/core.node.services/-node-interest-rates/-oracle/index.html +++ b/docs/build/html/api/core.node.services/-node-interest-rates/-oracle/index.html @@ -21,7 +21,7 @@ <init> -Oracle(identity: Party, signingKey: KeyPair)

An implementation of an interest rate fix oracle which is given data in a simple string format.

+Oracle(identity: Party, signingKey: KeyPair)

An implementation of an interest rate fix oracle which is given data in a simple string format.

@@ -50,13 +50,13 @@ query -fun query(queries: List<FixOf>): List<Fix> +fun query(queries: List<FixOf>): List<Fix> sign -fun sign(wtx: WireTransaction): LegallyIdentifiable +fun sign(wtx: WireTransaction): LegallyIdentifiable diff --git a/docs/build/html/api/core.node.services/-node-interest-rates/-oracle/known-fixes.html b/docs/build/html/api/core.node.services/-node-interest-rates/-oracle/known-fixes.html index 8b47da7570..9d94e72b90 100644 --- a/docs/build/html/api/core.node.services/-node-interest-rates/-oracle/known-fixes.html +++ b/docs/build/html/api/core.node.services/-node-interest-rates/-oracle/known-fixes.html @@ -7,7 +7,7 @@ core.node.services / NodeInterestRates / Oracle / knownFixes

knownFixes

- + var knownFixes: FixContainer


diff --git a/docs/build/html/api/core.node.services/-node-interest-rates/-oracle/query.html b/docs/build/html/api/core.node.services/-node-interest-rates/-oracle/query.html index 93b13745eb..f37ddfa633 100644 --- a/docs/build/html/api/core.node.services/-node-interest-rates/-oracle/query.html +++ b/docs/build/html/api/core.node.services/-node-interest-rates/-oracle/query.html @@ -7,8 +7,8 @@ core.node.services / NodeInterestRates / Oracle / query

query

- -fun query(queries: List<FixOf>): List<Fix>
+ +fun query(queries: List<FixOf>): List<Fix>


diff --git a/docs/build/html/api/core.node.services/-node-interest-rates/-oracle/sign.html b/docs/build/html/api/core.node.services/-node-interest-rates/-oracle/sign.html index e26c60f829..369d19fc70 100644 --- a/docs/build/html/api/core.node.services/-node-interest-rates/-oracle/sign.html +++ b/docs/build/html/api/core.node.services/-node-interest-rates/-oracle/sign.html @@ -7,8 +7,8 @@ core.node.services / NodeInterestRates / Oracle / sign

sign

- -fun sign(wtx: WireTransaction): LegallyIdentifiable
+ +fun sign(wtx: WireTransaction): LegallyIdentifiable


diff --git a/docs/build/html/api/core.node.services/-node-interest-rates/-service/-init-.html b/docs/build/html/api/core.node.services/-node-interest-rates/-service/-init-.html index 541268f247..5a7518254e 100644 --- a/docs/build/html/api/core.node.services/-node-interest-rates/-service/-init-.html +++ b/docs/build/html/api/core.node.services/-node-interest-rates/-service/-init-.html @@ -7,7 +7,7 @@ core.node.services / NodeInterestRates / Service / <init>

<init>

-Service(node: AbstractNode)
+Service(node: AbstractNode)

The Service that wraps Oracle and handles messages/network interaction/request scrubbing.



diff --git a/docs/build/html/api/core.node.services/-node-interest-rates/-service/acceptable-file-extensions.html b/docs/build/html/api/core.node.services/-node-interest-rates/-service/acceptable-file-extensions.html index 482cb21589..6dd8a0d593 100644 --- a/docs/build/html/api/core.node.services/-node-interest-rates/-service/acceptable-file-extensions.html +++ b/docs/build/html/api/core.node.services/-node-interest-rates/-service/acceptable-file-extensions.html @@ -7,7 +7,7 @@ core.node.services / NodeInterestRates / Service / acceptableFileExtensions

acceptableFileExtensions

- + val acceptableFileExtensions: <ERROR CLASS>
Overrides AcceptsFileUpload.acceptableFileExtensions

What file extensions are acceptable for the file to be handed to upload()

diff --git a/docs/build/html/api/core.node.services/-node-interest-rates/-service/data-type-prefix.html b/docs/build/html/api/core.node.services/-node-interest-rates/-service/data-type-prefix.html index 7b6a55cd35..2c68c3444c 100644 --- a/docs/build/html/api/core.node.services/-node-interest-rates/-service/data-type-prefix.html +++ b/docs/build/html/api/core.node.services/-node-interest-rates/-service/data-type-prefix.html @@ -7,7 +7,7 @@ core.node.services / NodeInterestRates / Service / dataTypePrefix

dataTypePrefix

- + val dataTypePrefix: String
Overrides AcceptsFileUpload.dataTypePrefix

A string that prefixes the URLs, e.g. "attachments" or "interest-rates". Should be OK for URLs.

diff --git a/docs/build/html/api/core.node.services/-node-interest-rates/-service/index.html b/docs/build/html/api/core.node.services/-node-interest-rates/-service/index.html index 5a509a9296..c10a49e3a0 100644 --- a/docs/build/html/api/core.node.services/-node-interest-rates/-service/index.html +++ b/docs/build/html/api/core.node.services/-node-interest-rates/-service/index.html @@ -18,7 +18,7 @@ <init> -Service(node: AbstractNode)

The Service that wraps Oracle and handles messages/network interaction/request scrubbing.

+Service(node: AbstractNode)

The Service that wraps Oracle and handles messages/network interaction/request scrubbing.

@@ -72,7 +72,7 @@ upload -fun upload(data: InputStream): String

Accepts the data in the given input stream, and returns some sort of useful return message that will be sent +fun upload(data: InputStream): String

Accepts the data in the given input stream, and returns some sort of useful return message that will be sent back to the user in the response.

@@ -85,9 +85,9 @@ back to the user in the response.

addMessageHandler -fun <Q : AbstractRequestMessage, R : Any> addMessageHandler(topic: String, handler: (Q) -> R, exceptionConsumer: (Message, Exception) -> Unit): Unit

Register a handler for a message topic. In comparison to using net.addMessageHandler() this manages a lot of +fun <Q : AbstractRequestMessage, R : Any> addMessageHandler(topic: String, handler: (Q) -> R, exceptionConsumer: (Message, Exception) -> Unit): Unit

Register a handler for a message topic. In comparison to using net.addMessageHandler() this manages a lot of common boilerplate code. Exceptions are caught and passed to the provided consumer.

-fun <Q : AbstractRequestMessage, R : Any> addMessageHandler(topic: String, handler: (Q) -> R): Unit

Register a handler for a message topic. In comparison to using net.addMessageHandler() this manages a lot of +fun <Q : AbstractRequestMessage, R : Any> addMessageHandler(topic: String, handler: (Q) -> R): Unit

Register a handler for a message topic. In comparison to using net.addMessageHandler() this manages a lot of common boilerplate code. Exceptions are propagated to the messaging layer.

diff --git a/docs/build/html/api/core.node.services/-node-interest-rates/-service/oracle.html b/docs/build/html/api/core.node.services/-node-interest-rates/-service/oracle.html index 28a4984ba4..aa7c3db6c3 100644 --- a/docs/build/html/api/core.node.services/-node-interest-rates/-service/oracle.html +++ b/docs/build/html/api/core.node.services/-node-interest-rates/-service/oracle.html @@ -7,7 +7,7 @@ core.node.services / NodeInterestRates / Service / oracle

oracle

- + val oracle: Oracle


diff --git a/docs/build/html/api/core.node.services/-node-interest-rates/-service/ss.html b/docs/build/html/api/core.node.services/-node-interest-rates/-service/ss.html index ea231a1e30..752bddd7e1 100644 --- a/docs/build/html/api/core.node.services/-node-interest-rates/-service/ss.html +++ b/docs/build/html/api/core.node.services/-node-interest-rates/-service/ss.html @@ -7,7 +7,7 @@ core.node.services / NodeInterestRates / Service / ss

ss

- + val ss: StorageService


diff --git a/docs/build/html/api/core.node.services/-node-interest-rates/-service/upload.html b/docs/build/html/api/core.node.services/-node-interest-rates/-service/upload.html index ff8c7d9459..57605d950d 100644 --- a/docs/build/html/api/core.node.services/-node-interest-rates/-service/upload.html +++ b/docs/build/html/api/core.node.services/-node-interest-rates/-service/upload.html @@ -7,8 +7,8 @@ core.node.services / NodeInterestRates / Service / upload

upload

- -fun upload(data: InputStream): String
+ +fun upload(data: InputStream): String
Overrides AcceptsFileUpload.upload

Accepts the data in the given input stream, and returns some sort of useful return message that will be sent back to the user in the response.

diff --git a/docs/build/html/api/core.node.services/-node-interest-rates/-unknown-fix/-init-.html b/docs/build/html/api/core.node.services/-node-interest-rates/-unknown-fix/-init-.html index efa04ca31a..d4a862ce0b 100644 --- a/docs/build/html/api/core.node.services/-node-interest-rates/-unknown-fix/-init-.html +++ b/docs/build/html/api/core.node.services/-node-interest-rates/-unknown-fix/-init-.html @@ -7,7 +7,7 @@ core.node.services / NodeInterestRates / UnknownFix / <init>

<init>

-UnknownFix(fix: FixOf)
+UnknownFix(fix: FixOf)


diff --git a/docs/build/html/api/core.node.services/-node-interest-rates/-unknown-fix/fix.html b/docs/build/html/api/core.node.services/-node-interest-rates/-unknown-fix/fix.html index 98f7bde4a9..67562c407e 100644 --- a/docs/build/html/api/core.node.services/-node-interest-rates/-unknown-fix/fix.html +++ b/docs/build/html/api/core.node.services/-node-interest-rates/-unknown-fix/fix.html @@ -7,7 +7,7 @@ core.node.services / NodeInterestRates / UnknownFix / fix

fix

- + val fix: FixOf


diff --git a/docs/build/html/api/core.node.services/-node-interest-rates/-unknown-fix/index.html b/docs/build/html/api/core.node.services/-node-interest-rates/-unknown-fix/index.html index 6c2710ffd8..901c64c44a 100644 --- a/docs/build/html/api/core.node.services/-node-interest-rates/-unknown-fix/index.html +++ b/docs/build/html/api/core.node.services/-node-interest-rates/-unknown-fix/index.html @@ -17,7 +17,7 @@ <init> -UnknownFix(fix: FixOf) +UnknownFix(fix: FixOf) diff --git a/docs/build/html/api/core.node.services/-node-interest-rates/-unknown-fix/to-string.html b/docs/build/html/api/core.node.services/-node-interest-rates/-unknown-fix/to-string.html index 1d8e06a529..c56ecf4ceb 100644 --- a/docs/build/html/api/core.node.services/-node-interest-rates/-unknown-fix/to-string.html +++ b/docs/build/html/api/core.node.services/-node-interest-rates/-unknown-fix/to-string.html @@ -7,7 +7,7 @@ core.node.services / NodeInterestRates / UnknownFix / toString

toString

- + fun toString(): String


diff --git a/docs/build/html/api/core.node.services/-node-interest-rates/index.html b/docs/build/html/api/core.node.services/-node-interest-rates/index.html index 7186f8db56..de40d99b61 100644 --- a/docs/build/html/api/core.node.services/-node-interest-rates/index.html +++ b/docs/build/html/api/core.node.services/-node-interest-rates/index.html @@ -76,21 +76,21 @@ Interpolates missing values using the provided interpolation mechanism.

parseFile -fun parseFile(s: String): FixContainer

Parses lines containing fixes

+fun parseFile(s: String): FixContainer

Parses lines containing fixes

parseFix -fun parseFix(s: String): Fix

Parses a string of the form "LIBOR 16-March-2016 1M = 0.678" into a Fix

+fun parseFix(s: String): Fix

Parses a string of the form "LIBOR 16-March-2016 1M = 0.678" into a Fix

parseFixOf -fun parseFixOf(key: String): FixOf

Parses a string of the form "LIBOR 16-March-2016 1M" into a FixOf

+fun parseFixOf(key: String): FixOf

Parses a string of the form "LIBOR 16-March-2016 1M" into a FixOf

diff --git a/docs/build/html/api/core.node.services/-node-interest-rates/parse-file.html b/docs/build/html/api/core.node.services/-node-interest-rates/parse-file.html index 16e2ba9040..890d299484 100644 --- a/docs/build/html/api/core.node.services/-node-interest-rates/parse-file.html +++ b/docs/build/html/api/core.node.services/-node-interest-rates/parse-file.html @@ -7,8 +7,8 @@ core.node.services / NodeInterestRates / parseFile

parseFile

- -fun parseFile(s: String): FixContainer
+ +fun parseFile(s: String): FixContainer

Parses lines containing fixes



diff --git a/docs/build/html/api/core.node.services/-node-interest-rates/parse-fix-of.html b/docs/build/html/api/core.node.services/-node-interest-rates/parse-fix-of.html index cb71e8a137..f8892689e4 100644 --- a/docs/build/html/api/core.node.services/-node-interest-rates/parse-fix-of.html +++ b/docs/build/html/api/core.node.services/-node-interest-rates/parse-fix-of.html @@ -7,8 +7,8 @@ core.node.services / NodeInterestRates / parseFixOf

parseFixOf

- -fun parseFixOf(key: String): FixOf
+ +fun parseFixOf(key: String): FixOf

Parses a string of the form "LIBOR 16-March-2016 1M" into a FixOf



diff --git a/docs/build/html/api/core.node.services/-node-interest-rates/parse-fix.html b/docs/build/html/api/core.node.services/-node-interest-rates/parse-fix.html index a33d1e8df4..8a6009887b 100644 --- a/docs/build/html/api/core.node.services/-node-interest-rates/parse-fix.html +++ b/docs/build/html/api/core.node.services/-node-interest-rates/parse-fix.html @@ -7,8 +7,8 @@ core.node.services / NodeInterestRates / parseFix

parseFix

- -fun parseFix(s: String): Fix
+ +fun parseFix(s: String): Fix

Parses a string of the form "LIBOR 16-March-2016 1M = 0.678" into a Fix



diff --git a/docs/build/html/api/core.node.services/-node-registration/-init-.html b/docs/build/html/api/core.node.services/-node-registration/-init-.html index 5b5fde8852..c540728153 100644 --- a/docs/build/html/api/core.node.services/-node-registration/-init-.html +++ b/docs/build/html/api/core.node.services/-node-registration/-init-.html @@ -7,7 +7,7 @@ core.node.services / NodeRegistration / <init>

<init>

-NodeRegistration(node: NodeInfo, serial: Long, type: AddOrRemove, expires: Instant)
+NodeRegistration(node: NodeInfo, serial: Long, type: AddOrRemove, expires: Instant)

A node registration state in the network map.

Parameters

diff --git a/docs/build/html/api/core.node.services/-node-registration/expires.html b/docs/build/html/api/core.node.services/-node-registration/expires.html index 6c369e0eca..42194d250b 100644 --- a/docs/build/html/api/core.node.services/-node-registration/expires.html +++ b/docs/build/html/api/core.node.services/-node-registration/expires.html @@ -7,7 +7,7 @@ core.node.services / NodeRegistration / expires

expires

- + var expires: Instant


diff --git a/docs/build/html/api/core.node.services/-node-registration/index.html b/docs/build/html/api/core.node.services/-node-registration/index.html index 004a92612f..1e2ff2e034 100644 --- a/docs/build/html/api/core.node.services/-node-registration/index.html +++ b/docs/build/html/api/core.node.services/-node-registration/index.html @@ -33,7 +33,7 @@ going offline).
<init> -NodeRegistration(node: NodeInfo, serial: Long, type: AddOrRemove, expires: Instant)

A node registration state in the network map.

+NodeRegistration(node: NodeInfo, serial: Long, type: AddOrRemove, expires: Instant)

A node registration state in the network map.

@@ -80,7 +80,7 @@ going offline).
toWire -fun toWire(privateKey: PrivateKey): WireNodeRegistration

Build a node registration in wire format.

+fun toWire(privateKey: PrivateKey): WireNodeRegistration

Build a node registration in wire format.

diff --git a/docs/build/html/api/core.node.services/-node-registration/node.html b/docs/build/html/api/core.node.services/-node-registration/node.html index 492077f462..c209c39dee 100644 --- a/docs/build/html/api/core.node.services/-node-registration/node.html +++ b/docs/build/html/api/core.node.services/-node-registration/node.html @@ -7,7 +7,7 @@ core.node.services / NodeRegistration / node

node

- + val node: NodeInfo


diff --git a/docs/build/html/api/core.node.services/-node-registration/serial.html b/docs/build/html/api/core.node.services/-node-registration/serial.html index dd048ae4bf..7ecd326410 100644 --- a/docs/build/html/api/core.node.services/-node-registration/serial.html +++ b/docs/build/html/api/core.node.services/-node-registration/serial.html @@ -7,7 +7,7 @@ core.node.services / NodeRegistration / serial

serial

- + val serial: Long


diff --git a/docs/build/html/api/core.node.services/-node-registration/to-string.html b/docs/build/html/api/core.node.services/-node-registration/to-string.html index 9233eb4fe6..cfd231afdb 100644 --- a/docs/build/html/api/core.node.services/-node-registration/to-string.html +++ b/docs/build/html/api/core.node.services/-node-registration/to-string.html @@ -7,7 +7,7 @@ core.node.services / NodeRegistration / toString

toString

- + fun toString(): String


diff --git a/docs/build/html/api/core.node.services/-node-registration/to-wire.html b/docs/build/html/api/core.node.services/-node-registration/to-wire.html index 1dfa75aaff..bd9cc5e968 100644 --- a/docs/build/html/api/core.node.services/-node-registration/to-wire.html +++ b/docs/build/html/api/core.node.services/-node-registration/to-wire.html @@ -7,8 +7,8 @@ core.node.services / NodeRegistration / toWire

toWire

- -fun toWire(privateKey: PrivateKey): WireNodeRegistration
+ +fun toWire(privateKey: PrivateKey): WireNodeRegistration

Build a node registration in wire format.



diff --git a/docs/build/html/api/core.node.services/-node-registration/type.html b/docs/build/html/api/core.node.services/-node-registration/type.html index a22fbc05af..5cb0f0bfd9 100644 --- a/docs/build/html/api/core.node.services/-node-registration/type.html +++ b/docs/build/html/api/core.node.services/-node-registration/type.html @@ -7,7 +7,7 @@ core.node.services / NodeRegistration / type

type

- + val type: AddOrRemove


diff --git a/docs/build/html/api/core.node.services/-node-timestamper-service/index.html b/docs/build/html/api/core.node.services/-node-timestamper-service/index.html index 9aa52b05d0..e7454c418a 100644 --- a/docs/build/html/api/core.node.services/-node-timestamper-service/index.html +++ b/docs/build/html/api/core.node.services/-node-timestamper-service/index.html @@ -86,9 +86,9 @@ add features like checking against other NTP servers to make sure the clock hasn addMessageHandler -fun <Q : AbstractRequestMessage, R : Any> addMessageHandler(topic: String, handler: (Q) -> R, exceptionConsumer: (Message, Exception) -> Unit): Unit

Register a handler for a message topic. In comparison to using net.addMessageHandler() this manages a lot of +fun <Q : AbstractRequestMessage, R : Any> addMessageHandler(topic: String, handler: (Q) -> R, exceptionConsumer: (Message, Exception) -> Unit): Unit

Register a handler for a message topic. In comparison to using net.addMessageHandler() this manages a lot of common boilerplate code. Exceptions are caught and passed to the provided consumer.

-fun <Q : AbstractRequestMessage, R : Any> addMessageHandler(topic: String, handler: (Q) -> R): Unit

Register a handler for a message topic. In comparison to using net.addMessageHandler() this manages a lot of +fun <Q : AbstractRequestMessage, R : Any> addMessageHandler(topic: String, handler: (Q) -> R): Unit

Register a handler for a message topic. In comparison to using net.addMessageHandler() this manages a lot of common boilerplate code. Exceptions are propagated to the messaging layer.

diff --git a/docs/build/html/api/core.node.services/-wire-node-registration/-init-.html b/docs/build/html/api/core.node.services/-wire-node-registration/-init-.html index 6c5e446136..ee5c29052c 100644 --- a/docs/build/html/api/core.node.services/-wire-node-registration/-init-.html +++ b/docs/build/html/api/core.node.services/-wire-node-registration/-init-.html @@ -7,7 +7,7 @@ core.node.services / WireNodeRegistration / <init>

<init>

-WireNodeRegistration(raw: SerializedBytes<NodeRegistration>, sig: WithKey)
+WireNodeRegistration(raw: SerializedBytes<NodeRegistration>, sig: WithKey)

A node registration and its signature as a pair.



diff --git a/docs/build/html/api/core.node.services/-wire-node-registration/index.html b/docs/build/html/api/core.node.services/-wire-node-registration/index.html index a949646c9e..66830d527d 100644 --- a/docs/build/html/api/core.node.services/-wire-node-registration/index.html +++ b/docs/build/html/api/core.node.services/-wire-node-registration/index.html @@ -18,7 +18,7 @@ <init> -WireNodeRegistration(raw: SerializedBytes<NodeRegistration>, sig: WithKey)

A node registration and its signature as a pair.

+WireNodeRegistration(raw: SerializedBytes<NodeRegistration>, sig: WithKey)

A node registration and its signature as a pair.

@@ -47,7 +47,7 @@ verifyData -fun verifyData(reg: NodeRegistration): Unit

Verify the wrapped data after the signature has been verified and the data deserialised. Provided as an extension +fun verifyData(reg: NodeRegistration): Unit

Verify the wrapped data after the signature has been verified and the data deserialised. Provided as an extension point for subclasses.

diff --git a/docs/build/html/api/core.node.services/-wire-node-registration/verify-data.html b/docs/build/html/api/core.node.services/-wire-node-registration/verify-data.html index 9aed2f3d05..ff82f078ab 100644 --- a/docs/build/html/api/core.node.services/-wire-node-registration/verify-data.html +++ b/docs/build/html/api/core.node.services/-wire-node-registration/verify-data.html @@ -7,8 +7,8 @@ core.node.services / WireNodeRegistration / verifyData

verifyData

- -protected fun verifyData(reg: NodeRegistration): Unit
+ +protected fun verifyData(reg: NodeRegistration): Unit

Verify the wrapped data after the signature has been verified and the data deserialised. Provided as an extension point for subclasses.

Exceptions

diff --git a/docs/build/html/api/core.node.servlets/-attachment-download-servlet/do-get.html b/docs/build/html/api/core.node.servlets/-attachment-download-servlet/do-get.html index 04e6cc252f..e3e0058631 100644 --- a/docs/build/html/api/core.node.servlets/-attachment-download-servlet/do-get.html +++ b/docs/build/html/api/core.node.servlets/-attachment-download-servlet/do-get.html @@ -7,8 +7,8 @@ core.node.servlets / AttachmentDownloadServlet / doGet

doGet

- -fun doGet(req: <ERROR CLASS>, resp: <ERROR CLASS>): Unit
+ +fun doGet(req: <ERROR CLASS>, resp: <ERROR CLASS>): Unit


diff --git a/docs/build/html/api/core.node.servlets/-attachment-download-servlet/index.html b/docs/build/html/api/core.node.servlets/-attachment-download-servlet/index.html index 4e8050ed7c..d4534f2383 100644 --- a/docs/build/html/api/core.node.servlets/-attachment-download-servlet/index.html +++ b/docs/build/html/api/core.node.servlets/-attachment-download-servlet/index.html @@ -37,7 +37,7 @@ TODO: Provide an endpoint that exposes attachment file listings, to make attachm doGet -fun doGet(req: <ERROR CLASS>, resp: <ERROR CLASS>): Unit +fun doGet(req: <ERROR CLASS>, resp: <ERROR CLASS>): Unit diff --git a/docs/build/html/api/core.node.servlets/-data-upload-servlet/do-post.html b/docs/build/html/api/core.node.servlets/-data-upload-servlet/do-post.html index 701d31306e..17e3dea449 100644 --- a/docs/build/html/api/core.node.servlets/-data-upload-servlet/do-post.html +++ b/docs/build/html/api/core.node.servlets/-data-upload-servlet/do-post.html @@ -7,8 +7,8 @@ core.node.servlets / DataUploadServlet / doPost

doPost

- -fun doPost(req: <ERROR CLASS>, resp: <ERROR CLASS>): Unit
+ +fun doPost(req: <ERROR CLASS>, resp: <ERROR CLASS>): Unit


diff --git a/docs/build/html/api/core.node.servlets/-data-upload-servlet/index.html b/docs/build/html/api/core.node.servlets/-data-upload-servlet/index.html index 58f75683e5..f310118184 100644 --- a/docs/build/html/api/core.node.servlets/-data-upload-servlet/index.html +++ b/docs/build/html/api/core.node.servlets/-data-upload-servlet/index.html @@ -30,7 +30,7 @@ doPost -fun doPost(req: <ERROR CLASS>, resp: <ERROR CLASS>): Unit +fun doPost(req: <ERROR CLASS>, resp: <ERROR CLASS>): Unit diff --git a/docs/build/html/api/core.node.storage/-checkpoint-storage/add-checkpoint.html b/docs/build/html/api/core.node.storage/-checkpoint-storage/add-checkpoint.html index 4b677381c6..02d60c835d 100644 --- a/docs/build/html/api/core.node.storage/-checkpoint-storage/add-checkpoint.html +++ b/docs/build/html/api/core.node.storage/-checkpoint-storage/add-checkpoint.html @@ -7,8 +7,8 @@ core.node.storage / CheckpointStorage / addCheckpoint

addCheckpoint

- -abstract fun addCheckpoint(checkpoint: Checkpoint): Unit
+ +abstract fun addCheckpoint(checkpoint: Checkpoint): Unit

Add a new checkpoint to the store.



diff --git a/docs/build/html/api/core.node.storage/-checkpoint-storage/checkpoints.html b/docs/build/html/api/core.node.storage/-checkpoint-storage/checkpoints.html index 404695163d..ddc69710a5 100644 --- a/docs/build/html/api/core.node.storage/-checkpoint-storage/checkpoints.html +++ b/docs/build/html/api/core.node.storage/-checkpoint-storage/checkpoints.html @@ -7,7 +7,7 @@ core.node.storage / CheckpointStorage / checkpoints

checkpoints

- + abstract val checkpoints: Iterable<Checkpoint>

Returns a snapshot of all the checkpoints in the store. This may return more checkpoints than were added to this instance of the store; for example if the store persists diff --git a/docs/build/html/api/core.node.storage/-checkpoint-storage/index.html b/docs/build/html/api/core.node.storage/-checkpoint-storage/index.html index 99faafde78..abc04da2a4 100644 --- a/docs/build/html/api/core.node.storage/-checkpoint-storage/index.html +++ b/docs/build/html/api/core.node.storage/-checkpoint-storage/index.html @@ -32,14 +32,14 @@ checkpoints to disk.

addCheckpoint -abstract fun addCheckpoint(checkpoint: Checkpoint): Unit

Add a new checkpoint to the store.

+abstract fun addCheckpoint(checkpoint: Checkpoint): Unit

Add a new checkpoint to the store.

removeCheckpoint -abstract fun removeCheckpoint(checkpoint: Checkpoint): Unit

Remove existing checkpoint from the store. It is an error to attempt to remove a checkpoint which doesnt exist +abstract fun removeCheckpoint(checkpoint: Checkpoint): Unit

Remove existing checkpoint from the store. It is an error to attempt to remove a checkpoint which doesnt exist in the store. Doing so will throw an IllegalArgumentException.

diff --git a/docs/build/html/api/core.node.storage/-checkpoint-storage/remove-checkpoint.html b/docs/build/html/api/core.node.storage/-checkpoint-storage/remove-checkpoint.html index f8896c21c3..84e909d194 100644 --- a/docs/build/html/api/core.node.storage/-checkpoint-storage/remove-checkpoint.html +++ b/docs/build/html/api/core.node.storage/-checkpoint-storage/remove-checkpoint.html @@ -7,8 +7,8 @@ core.node.storage / CheckpointStorage / removeCheckpoint

removeCheckpoint

- -abstract fun removeCheckpoint(checkpoint: Checkpoint): Unit
+ +abstract fun removeCheckpoint(checkpoint: Checkpoint): Unit

Remove existing checkpoint from the store. It is an error to attempt to remove a checkpoint which doesnt exist in the store. Doing so will throw an IllegalArgumentException.


diff --git a/docs/build/html/api/core.node.storage/-checkpoint/-init-.html b/docs/build/html/api/core.node.storage/-checkpoint/-init-.html index 1498dd58b4..26a7c13ff2 100644 --- a/docs/build/html/api/core.node.storage/-checkpoint/-init-.html +++ b/docs/build/html/api/core.node.storage/-checkpoint/-init-.html @@ -7,7 +7,7 @@ core.node.storage / Checkpoint / <init>

<init>

-Checkpoint(serialisedFiber: SerializedBytes<ProtocolStateMachine<*>>, awaitingTopic: String, awaitingObjectOfType: String)
+Checkpoint(serialisedFiber: SerializedBytes<ProtocolStateMachine<*>>, awaitingTopic: String, awaitingObjectOfType: String)


diff --git a/docs/build/html/api/core.node.storage/-checkpoint/awaiting-object-of-type.html b/docs/build/html/api/core.node.storage/-checkpoint/awaiting-object-of-type.html index 69ce05ad9d..97e4f34002 100644 --- a/docs/build/html/api/core.node.storage/-checkpoint/awaiting-object-of-type.html +++ b/docs/build/html/api/core.node.storage/-checkpoint/awaiting-object-of-type.html @@ -7,7 +7,7 @@ core.node.storage / Checkpoint / awaitingObjectOfType

awaitingObjectOfType

- + val awaitingObjectOfType: String


diff --git a/docs/build/html/api/core.node.storage/-checkpoint/awaiting-topic.html b/docs/build/html/api/core.node.storage/-checkpoint/awaiting-topic.html index 142d1d0de4..eb83d2b19f 100644 --- a/docs/build/html/api/core.node.storage/-checkpoint/awaiting-topic.html +++ b/docs/build/html/api/core.node.storage/-checkpoint/awaiting-topic.html @@ -7,7 +7,7 @@ core.node.storage / Checkpoint / awaitingTopic

awaitingTopic

- + val awaitingTopic: String


diff --git a/docs/build/html/api/core.node.storage/-checkpoint/index.html b/docs/build/html/api/core.node.storage/-checkpoint/index.html index 0d852c63b1..e5a8423d72 100644 --- a/docs/build/html/api/core.node.storage/-checkpoint/index.html +++ b/docs/build/html/api/core.node.storage/-checkpoint/index.html @@ -17,7 +17,7 @@ <init> -Checkpoint(serialisedFiber: SerializedBytes<ProtocolStateMachine<*>>, awaitingTopic: String, awaitingObjectOfType: String) +Checkpoint(serialisedFiber: SerializedBytes<ProtocolStateMachine<*>>, awaitingTopic: String, awaitingObjectOfType: String) diff --git a/docs/build/html/api/core.node.storage/-checkpoint/serialised-fiber.html b/docs/build/html/api/core.node.storage/-checkpoint/serialised-fiber.html index dd05675612..3b816998d1 100644 --- a/docs/build/html/api/core.node.storage/-checkpoint/serialised-fiber.html +++ b/docs/build/html/api/core.node.storage/-checkpoint/serialised-fiber.html @@ -7,7 +7,7 @@ core.node.storage / Checkpoint / serialisedFiber

serialisedFiber

- + val serialisedFiber: SerializedBytes<ProtocolStateMachine<*>>


diff --git a/docs/build/html/api/core.node.storage/-checkpoint/to-string.html b/docs/build/html/api/core.node.storage/-checkpoint/to-string.html index 5e439bf141..e0c0e992d2 100644 --- a/docs/build/html/api/core.node.storage/-checkpoint/to-string.html +++ b/docs/build/html/api/core.node.storage/-checkpoint/to-string.html @@ -7,7 +7,7 @@ core.node.storage / Checkpoint / toString

toString

- + fun toString(): String


diff --git a/docs/build/html/api/core.node.storage/-per-file-checkpoint-storage/-init-.html b/docs/build/html/api/core.node.storage/-per-file-checkpoint-storage/-init-.html index 14726f34e6..36d18122b2 100644 --- a/docs/build/html/api/core.node.storage/-per-file-checkpoint-storage/-init-.html +++ b/docs/build/html/api/core.node.storage/-per-file-checkpoint-storage/-init-.html @@ -7,7 +7,7 @@ core.node.storage / PerFileCheckpointStorage / <init>

<init>

-PerFileCheckpointStorage(storeDir: Path)
+PerFileCheckpointStorage(storeDir: Path)

File-based checkpoint storage, storing checkpoints per file.



diff --git a/docs/build/html/api/core.node.storage/-per-file-checkpoint-storage/add-checkpoint.html b/docs/build/html/api/core.node.storage/-per-file-checkpoint-storage/add-checkpoint.html index b9062b99a1..7d079b3f99 100644 --- a/docs/build/html/api/core.node.storage/-per-file-checkpoint-storage/add-checkpoint.html +++ b/docs/build/html/api/core.node.storage/-per-file-checkpoint-storage/add-checkpoint.html @@ -7,8 +7,8 @@ core.node.storage / PerFileCheckpointStorage / addCheckpoint

addCheckpoint

- -fun addCheckpoint(checkpoint: Checkpoint): Unit
+ +fun addCheckpoint(checkpoint: Checkpoint): Unit
Overrides CheckpointStorage.addCheckpoint

Add a new checkpoint to the store.


diff --git a/docs/build/html/api/core.node.storage/-per-file-checkpoint-storage/checkpoints.html b/docs/build/html/api/core.node.storage/-per-file-checkpoint-storage/checkpoints.html index 7d6e74297e..efa847aa77 100644 --- a/docs/build/html/api/core.node.storage/-per-file-checkpoint-storage/checkpoints.html +++ b/docs/build/html/api/core.node.storage/-per-file-checkpoint-storage/checkpoints.html @@ -7,7 +7,7 @@ core.node.storage / PerFileCheckpointStorage / checkpoints

checkpoints

- + val checkpoints: Iterable<Checkpoint>
Overrides CheckpointStorage.checkpoints

Returns a snapshot of all the checkpoints in the store. diff --git a/docs/build/html/api/core.node.storage/-per-file-checkpoint-storage/index.html b/docs/build/html/api/core.node.storage/-per-file-checkpoint-storage/index.html index be2c2a7dd0..51821cee7a 100644 --- a/docs/build/html/api/core.node.storage/-per-file-checkpoint-storage/index.html +++ b/docs/build/html/api/core.node.storage/-per-file-checkpoint-storage/index.html @@ -18,7 +18,7 @@ <init> -PerFileCheckpointStorage(storeDir: Path)

File-based checkpoint storage, storing checkpoints per file.

+PerFileCheckpointStorage(storeDir: Path)

File-based checkpoint storage, storing checkpoints per file.

@@ -50,14 +50,14 @@ checkpoints to disk.

addCheckpoint -fun addCheckpoint(checkpoint: Checkpoint): Unit

Add a new checkpoint to the store.

+fun addCheckpoint(checkpoint: Checkpoint): Unit

Add a new checkpoint to the store.

removeCheckpoint -fun removeCheckpoint(checkpoint: Checkpoint): Unit

Remove existing checkpoint from the store. It is an error to attempt to remove a checkpoint which doesnt exist +fun removeCheckpoint(checkpoint: Checkpoint): Unit

Remove existing checkpoint from the store. It is an error to attempt to remove a checkpoint which doesnt exist in the store. Doing so will throw an IllegalArgumentException.

diff --git a/docs/build/html/api/core.node.storage/-per-file-checkpoint-storage/remove-checkpoint.html b/docs/build/html/api/core.node.storage/-per-file-checkpoint-storage/remove-checkpoint.html index ad5d915302..e1dfacebbf 100644 --- a/docs/build/html/api/core.node.storage/-per-file-checkpoint-storage/remove-checkpoint.html +++ b/docs/build/html/api/core.node.storage/-per-file-checkpoint-storage/remove-checkpoint.html @@ -7,8 +7,8 @@ core.node.storage / PerFileCheckpointStorage / removeCheckpoint

removeCheckpoint

- -fun removeCheckpoint(checkpoint: Checkpoint): Unit
+ +fun removeCheckpoint(checkpoint: Checkpoint): Unit
Overrides CheckpointStorage.removeCheckpoint

Remove existing checkpoint from the store. It is an error to attempt to remove a checkpoint which doesnt exist in the store. Doing so will throw an IllegalArgumentException.

diff --git a/docs/build/html/api/core.node.storage/-per-file-checkpoint-storage/store-dir.html b/docs/build/html/api/core.node.storage/-per-file-checkpoint-storage/store-dir.html index e917240c96..07cfe5d388 100644 --- a/docs/build/html/api/core.node.storage/-per-file-checkpoint-storage/store-dir.html +++ b/docs/build/html/api/core.node.storage/-per-file-checkpoint-storage/store-dir.html @@ -7,7 +7,7 @@ core.node.storage / PerFileCheckpointStorage / storeDir

storeDir

- + val storeDir: Path


diff --git a/docs/build/html/api/core.node.subsystems/-artemis-messaging-service/-handler/-init-.html b/docs/build/html/api/core.node.subsystems/-artemis-messaging-service/-handler/-init-.html index 3b9fb03c66..34359faf53 100644 --- a/docs/build/html/api/core.node.subsystems/-artemis-messaging-service/-handler/-init-.html +++ b/docs/build/html/api/core.node.subsystems/-artemis-messaging-service/-handler/-init-.html @@ -7,7 +7,7 @@ core.node.subsystems / ArtemisMessagingService / Handler / <init>

<init>

-Handler(executor: Executor?, topic: String, callback: (Message, MessageHandlerRegistration) -> Unit)
+Handler(executor: Executor?, topic: String, callback: (Message, MessageHandlerRegistration) -> Unit)

A registration to handle messages of different types



diff --git a/docs/build/html/api/core.node.subsystems/-artemis-messaging-service/-handler/callback.html b/docs/build/html/api/core.node.subsystems/-artemis-messaging-service/-handler/callback.html index 74322be108..64e06379ab 100644 --- a/docs/build/html/api/core.node.subsystems/-artemis-messaging-service/-handler/callback.html +++ b/docs/build/html/api/core.node.subsystems/-artemis-messaging-service/-handler/callback.html @@ -7,7 +7,7 @@ core.node.subsystems / ArtemisMessagingService / Handler / callback

callback

- + val callback: (Message, MessageHandlerRegistration) -> Unit


diff --git a/docs/build/html/api/core.node.subsystems/-artemis-messaging-service/-handler/executor.html b/docs/build/html/api/core.node.subsystems/-artemis-messaging-service/-handler/executor.html index 529b7d400d..9ad551ba60 100644 --- a/docs/build/html/api/core.node.subsystems/-artemis-messaging-service/-handler/executor.html +++ b/docs/build/html/api/core.node.subsystems/-artemis-messaging-service/-handler/executor.html @@ -7,7 +7,7 @@ core.node.subsystems / ArtemisMessagingService / Handler / executor

executor

- + val executor: Executor?


diff --git a/docs/build/html/api/core.node.subsystems/-artemis-messaging-service/-handler/index.html b/docs/build/html/api/core.node.subsystems/-artemis-messaging-service/-handler/index.html index d1cc75f8ff..a0d8e41f09 100644 --- a/docs/build/html/api/core.node.subsystems/-artemis-messaging-service/-handler/index.html +++ b/docs/build/html/api/core.node.subsystems/-artemis-messaging-service/-handler/index.html @@ -18,7 +18,7 @@ <init> -Handler(executor: Executor?, topic: String, callback: (Message, MessageHandlerRegistration) -> Unit)

A registration to handle messages of different types

+Handler(executor: Executor?, topic: String, callback: (Message, MessageHandlerRegistration) -> Unit)

A registration to handle messages of different types

diff --git a/docs/build/html/api/core.node.subsystems/-artemis-messaging-service/-handler/topic.html b/docs/build/html/api/core.node.subsystems/-artemis-messaging-service/-handler/topic.html index db1ab7bd2b..f4cadb09c0 100644 --- a/docs/build/html/api/core.node.subsystems/-artemis-messaging-service/-handler/topic.html +++ b/docs/build/html/api/core.node.subsystems/-artemis-messaging-service/-handler/topic.html @@ -7,7 +7,7 @@ core.node.subsystems / ArtemisMessagingService / Handler / topic

topic

- + val topic: String


diff --git a/docs/build/html/api/core.node.subsystems/-artemis-messaging-service/-init-.html b/docs/build/html/api/core.node.subsystems/-artemis-messaging-service/-init-.html index 48e9a62f13..f8ea7af678 100644 --- a/docs/build/html/api/core.node.subsystems/-artemis-messaging-service/-init-.html +++ b/docs/build/html/api/core.node.subsystems/-artemis-messaging-service/-init-.html @@ -7,7 +7,7 @@ core.node.subsystems / ArtemisMessagingService / <init>

<init>

-ArtemisMessagingService(directory: Path, myHostPort: <ERROR CLASS>, defaultExecutor: Executor = RunOnCallerThread)
+ArtemisMessagingService(directory: Path, myHostPort: <ERROR CLASS>, defaultExecutor: Executor = RunOnCallerThread)

This class implements the MessagingService API using Apache Artemis, the successor to their ActiveMQ product. Artemis is a message queue broker and here, we embed the entire server inside our own process. Nodes communicate with each other using (by default) an Artemis specific protocol, but it supports other protocols like AQMP/1.0 diff --git a/docs/build/html/api/core.node.subsystems/-artemis-messaging-service/-t-o-p-i-c_-p-r-o-p-e-r-t-y.html b/docs/build/html/api/core.node.subsystems/-artemis-messaging-service/-t-o-p-i-c_-p-r-o-p-e-r-t-y.html index 64bc99cb35..76481d20ed 100644 --- a/docs/build/html/api/core.node.subsystems/-artemis-messaging-service/-t-o-p-i-c_-p-r-o-p-e-r-t-y.html +++ b/docs/build/html/api/core.node.subsystems/-artemis-messaging-service/-t-o-p-i-c_-p-r-o-p-e-r-t-y.html @@ -7,7 +7,7 @@ core.node.subsystems / ArtemisMessagingService / TOPIC_PROPERTY

TOPIC_PROPERTY

- + val TOPIC_PROPERTY: String


diff --git a/docs/build/html/api/core.node.subsystems/-artemis-messaging-service/add-message-handler.html b/docs/build/html/api/core.node.subsystems/-artemis-messaging-service/add-message-handler.html index f61c109bc1..9fa017aaa4 100644 --- a/docs/build/html/api/core.node.subsystems/-artemis-messaging-service/add-message-handler.html +++ b/docs/build/html/api/core.node.subsystems/-artemis-messaging-service/add-message-handler.html @@ -7,8 +7,8 @@ core.node.subsystems / ArtemisMessagingService / addMessageHandler

addMessageHandler

- -fun addMessageHandler(topic: String, executor: Executor?, callback: (Message, MessageHandlerRegistration) -> Unit): MessageHandlerRegistration
+ +fun addMessageHandler(topic: String, executor: Executor?, callback: (Message, MessageHandlerRegistration) -> Unit): MessageHandlerRegistration
Overrides MessagingService.addMessageHandler

The provided function will be invoked for each received message whose topic matches the given string, on the given executor. The topic can be the empty string to match all messages.

diff --git a/docs/build/html/api/core.node.subsystems/-artemis-messaging-service/create-message.html b/docs/build/html/api/core.node.subsystems/-artemis-messaging-service/create-message.html index 9f97187e10..2cb531c9d3 100644 --- a/docs/build/html/api/core.node.subsystems/-artemis-messaging-service/create-message.html +++ b/docs/build/html/api/core.node.subsystems/-artemis-messaging-service/create-message.html @@ -7,8 +7,8 @@ core.node.subsystems / ArtemisMessagingService / createMessage

createMessage

- -fun createMessage(topic: String, data: ByteArray): Message
+ +fun createMessage(topic: String, data: ByteArray): Message
Overrides MessagingService.createMessage

Returns an initialised Message with the current time, etc, already filled in.


diff --git a/docs/build/html/api/core.node.subsystems/-artemis-messaging-service/default-executor.html b/docs/build/html/api/core.node.subsystems/-artemis-messaging-service/default-executor.html index 7b6867f3cb..83c9c390e1 100644 --- a/docs/build/html/api/core.node.subsystems/-artemis-messaging-service/default-executor.html +++ b/docs/build/html/api/core.node.subsystems/-artemis-messaging-service/default-executor.html @@ -7,7 +7,7 @@ core.node.subsystems / ArtemisMessagingService / defaultExecutor

defaultExecutor

- + val defaultExecutor: Executor


diff --git a/docs/build/html/api/core.node.subsystems/-artemis-messaging-service/directory.html b/docs/build/html/api/core.node.subsystems/-artemis-messaging-service/directory.html index 4c57958855..540baf08e2 100644 --- a/docs/build/html/api/core.node.subsystems/-artemis-messaging-service/directory.html +++ b/docs/build/html/api/core.node.subsystems/-artemis-messaging-service/directory.html @@ -7,7 +7,7 @@ core.node.subsystems / ArtemisMessagingService / directory

directory

- + val directory: Path


diff --git a/docs/build/html/api/core.node.subsystems/-artemis-messaging-service/index.html b/docs/build/html/api/core.node.subsystems/-artemis-messaging-service/index.html index fc080f093b..9c86822890 100644 --- a/docs/build/html/api/core.node.subsystems/-artemis-messaging-service/index.html +++ b/docs/build/html/api/core.node.subsystems/-artemis-messaging-service/index.html @@ -47,7 +47,7 @@ a fully connected network, trusted network or on localhost.

<init> -ArtemisMessagingService(directory: Path, myHostPort: <ERROR CLASS>, defaultExecutor: Executor = RunOnCallerThread)

This class implements the MessagingService API using Apache Artemis, the successor to their ActiveMQ product. +ArtemisMessagingService(directory: Path, myHostPort: <ERROR CLASS>, defaultExecutor: Executor = RunOnCallerThread)

This class implements the MessagingService API using Apache Artemis, the successor to their ActiveMQ product. Artemis is a message queue broker and here, we embed the entire server inside our own process. Nodes communicate with each other using (by default) an Artemis specific protocol, but it supports other protocols like AQMP/1.0 as well.

@@ -92,7 +92,7 @@ as well.

addMessageHandler -fun addMessageHandler(topic: String, executor: Executor?, callback: (Message, MessageHandlerRegistration) -> Unit): MessageHandlerRegistration

The provided function will be invoked for each received message whose topic matches the given string, on the given +fun addMessageHandler(topic: String, executor: Executor?, callback: (Message, MessageHandlerRegistration) -> Unit): MessageHandlerRegistration

The provided function will be invoked for each received message whose topic matches the given string, on the given executor. The topic can be the empty string to match all messages.

@@ -100,14 +100,14 @@ executor. The topic can be the empty string to match all messages.

createMessage -fun createMessage(topic: String, data: ByteArray): Message

Returns an initialised Message with the current time, etc, already filled in.

+fun createMessage(topic: String, data: ByteArray): Message

Returns an initialised Message with the current time, etc, already filled in.

removeMessageHandler -fun removeMessageHandler(registration: MessageHandlerRegistration): Unit

Removes a handler given the object returned from addMessageHandler. The callback will no longer be invoked once +fun removeMessageHandler(registration: MessageHandlerRegistration): Unit

Removes a handler given the object returned from addMessageHandler. The callback will no longer be invoked once this method has returned, although executions that are currently in flight will not be interrupted.

@@ -115,7 +115,7 @@ this method has returned, although executions that are currently in flight will send -fun send(message: Message, target: MessageRecipients): Unit

Sends a message to the given receiver. The details of how receivers are identified is up to the messaging +fun send(message: Message, target: MessageRecipients): Unit

Sends a message to the given receiver. The details of how receivers are identified is up to the messaging implementation: the type system provides an opaque high level view, with more fine grained control being available via type casting. Once this function returns the message is queued for delivery but not necessarily delivered: if the recipients are offline then the message could be queued hours or days later.

@@ -159,14 +159,14 @@ delivered: if the recipients are offline then the message could be queued hours makeRecipient -fun makeRecipient(hostAndPort: <ERROR CLASS>): SingleMessageRecipient

Temp helper until network map is established.

-fun makeRecipient(hostname: String): <ERROR CLASS> +fun makeRecipient(hostAndPort: <ERROR CLASS>): SingleMessageRecipient

Temp helper until network map is established.

+fun makeRecipient(hostname: String): <ERROR CLASS> toHostAndPort -fun toHostAndPort(hostname: String): <ERROR CLASS> +fun toHostAndPort(hostname: String): <ERROR CLASS> diff --git a/docs/build/html/api/core.node.subsystems/-artemis-messaging-service/log.html b/docs/build/html/api/core.node.subsystems/-artemis-messaging-service/log.html index 445b93a3ed..7d4300df55 100644 --- a/docs/build/html/api/core.node.subsystems/-artemis-messaging-service/log.html +++ b/docs/build/html/api/core.node.subsystems/-artemis-messaging-service/log.html @@ -7,7 +7,7 @@ core.node.subsystems / ArtemisMessagingService / log

log

- + val log: <ERROR CLASS>


diff --git a/docs/build/html/api/core.node.subsystems/-artemis-messaging-service/make-recipient.html b/docs/build/html/api/core.node.subsystems/-artemis-messaging-service/make-recipient.html index 13621d0cf2..e753d1a715 100644 --- a/docs/build/html/api/core.node.subsystems/-artemis-messaging-service/make-recipient.html +++ b/docs/build/html/api/core.node.subsystems/-artemis-messaging-service/make-recipient.html @@ -7,13 +7,13 @@ core.node.subsystems / ArtemisMessagingService / makeRecipient

makeRecipient

- -fun makeRecipient(hostAndPort: <ERROR CLASS>): SingleMessageRecipient
+ +fun makeRecipient(hostAndPort: <ERROR CLASS>): SingleMessageRecipient

Temp helper until network map is established.



- -fun makeRecipient(hostname: String): <ERROR CLASS>
+ +fun makeRecipient(hostname: String): <ERROR CLASS>


diff --git a/docs/build/html/api/core.node.subsystems/-artemis-messaging-service/my-address.html b/docs/build/html/api/core.node.subsystems/-artemis-messaging-service/my-address.html index 8de9bd3c4d..193e2725ba 100644 --- a/docs/build/html/api/core.node.subsystems/-artemis-messaging-service/my-address.html +++ b/docs/build/html/api/core.node.subsystems/-artemis-messaging-service/my-address.html @@ -7,7 +7,7 @@ core.node.subsystems / ArtemisMessagingService / myAddress

myAddress

- + val myAddress: SingleMessageRecipient
Overrides MessagingService.myAddress

Returns an address that refers to this node.

diff --git a/docs/build/html/api/core.node.subsystems/-artemis-messaging-service/my-host-port.html b/docs/build/html/api/core.node.subsystems/-artemis-messaging-service/my-host-port.html index 92ffa422cf..c9c5dd38fb 100644 --- a/docs/build/html/api/core.node.subsystems/-artemis-messaging-service/my-host-port.html +++ b/docs/build/html/api/core.node.subsystems/-artemis-messaging-service/my-host-port.html @@ -7,7 +7,7 @@ core.node.subsystems / ArtemisMessagingService / myHostPort

myHostPort

- + val myHostPort: <ERROR CLASS>


diff --git a/docs/build/html/api/core.node.subsystems/-artemis-messaging-service/remove-message-handler.html b/docs/build/html/api/core.node.subsystems/-artemis-messaging-service/remove-message-handler.html index 5dd7a82a26..ac9c83cfbb 100644 --- a/docs/build/html/api/core.node.subsystems/-artemis-messaging-service/remove-message-handler.html +++ b/docs/build/html/api/core.node.subsystems/-artemis-messaging-service/remove-message-handler.html @@ -7,8 +7,8 @@ core.node.subsystems / ArtemisMessagingService / removeMessageHandler

removeMessageHandler

- -fun removeMessageHandler(registration: MessageHandlerRegistration): Unit
+ +fun removeMessageHandler(registration: MessageHandlerRegistration): Unit
Overrides MessagingService.removeMessageHandler

Removes a handler given the object returned from addMessageHandler. The callback will no longer be invoked once this method has returned, although executions that are currently in flight will not be interrupted.

diff --git a/docs/build/html/api/core.node.subsystems/-artemis-messaging-service/send.html b/docs/build/html/api/core.node.subsystems/-artemis-messaging-service/send.html index 40b754409e..a52622f6a5 100644 --- a/docs/build/html/api/core.node.subsystems/-artemis-messaging-service/send.html +++ b/docs/build/html/api/core.node.subsystems/-artemis-messaging-service/send.html @@ -7,8 +7,8 @@ core.node.subsystems / ArtemisMessagingService / send

send

- -fun send(message: Message, target: MessageRecipients): Unit
+ +fun send(message: Message, target: MessageRecipients): Unit
Overrides MessagingService.send

Sends a message to the given receiver. The details of how receivers are identified is up to the messaging implementation: the type system provides an opaque high level view, with more fine grained control being diff --git a/docs/build/html/api/core.node.subsystems/-artemis-messaging-service/start.html b/docs/build/html/api/core.node.subsystems/-artemis-messaging-service/start.html index 4048ae83f2..9ba5fb6c2f 100644 --- a/docs/build/html/api/core.node.subsystems/-artemis-messaging-service/start.html +++ b/docs/build/html/api/core.node.subsystems/-artemis-messaging-service/start.html @@ -7,7 +7,7 @@ core.node.subsystems / ArtemisMessagingService / start

start

- + fun start(): Unit


diff --git a/docs/build/html/api/core.node.subsystems/-artemis-messaging-service/stop.html b/docs/build/html/api/core.node.subsystems/-artemis-messaging-service/stop.html index b8c90ec91c..b3b5912818 100644 --- a/docs/build/html/api/core.node.subsystems/-artemis-messaging-service/stop.html +++ b/docs/build/html/api/core.node.subsystems/-artemis-messaging-service/stop.html @@ -7,7 +7,7 @@ core.node.subsystems / ArtemisMessagingService / stop

stop

- + fun stop(): Unit
Overrides MessagingService.stop

diff --git a/docs/build/html/api/core.node.subsystems/-artemis-messaging-service/to-host-and-port.html b/docs/build/html/api/core.node.subsystems/-artemis-messaging-service/to-host-and-port.html index bad3d965c4..1230402350 100644 --- a/docs/build/html/api/core.node.subsystems/-artemis-messaging-service/to-host-and-port.html +++ b/docs/build/html/api/core.node.subsystems/-artemis-messaging-service/to-host-and-port.html @@ -7,8 +7,8 @@ core.node.subsystems / ArtemisMessagingService / toHostAndPort

toHostAndPort

- -fun toHostAndPort(hostname: String): <ERROR CLASS>
+ +fun toHostAndPort(hostname: String): <ERROR CLASS>


diff --git a/docs/build/html/api/core.node.subsystems/-data-vending-service/-init-.html b/docs/build/html/api/core.node.subsystems/-data-vending-service/-init-.html index bb73fa1540..78dd5fee43 100644 --- a/docs/build/html/api/core.node.subsystems/-data-vending-service/-init-.html +++ b/docs/build/html/api/core.node.subsystems/-data-vending-service/-init-.html @@ -7,7 +7,7 @@ core.node.subsystems / DataVendingService / <init>

<init>

-DataVendingService(net: MessagingService, storage: StorageService)
+DataVendingService(net: MessagingService, storage: StorageService)

This class sets up network message handlers for requests from peers for data keyed by hash. It is a piece of simple glue that sits between the network layer and the database layer.

Note that in our data model, to be able to name a thing by hash automatically gives the power to request it. There diff --git a/docs/build/html/api/core.node.subsystems/-data-vending-service/-request/-init-.html b/docs/build/html/api/core.node.subsystems/-data-vending-service/-request/-init-.html index ce3ffc58a6..4ae8553908 100644 --- a/docs/build/html/api/core.node.subsystems/-data-vending-service/-request/-init-.html +++ b/docs/build/html/api/core.node.subsystems/-data-vending-service/-request/-init-.html @@ -7,7 +7,7 @@ core.node.subsystems / DataVendingService / Request / <init>

<init>

-Request(hashes: List<SecureHash>, replyTo: SingleMessageRecipient, sessionID: Long)
+Request(hashes: List<SecureHash>, replyTo: SingleMessageRecipient, sessionID: Long)


diff --git a/docs/build/html/api/core.node.subsystems/-data-vending-service/-request/hashes.html b/docs/build/html/api/core.node.subsystems/-data-vending-service/-request/hashes.html index 0b12bd5fff..2a94f79d94 100644 --- a/docs/build/html/api/core.node.subsystems/-data-vending-service/-request/hashes.html +++ b/docs/build/html/api/core.node.subsystems/-data-vending-service/-request/hashes.html @@ -7,7 +7,7 @@ core.node.subsystems / DataVendingService / Request / hashes

hashes

- + val hashes: List<SecureHash>


diff --git a/docs/build/html/api/core.node.subsystems/-data-vending-service/-request/index.html b/docs/build/html/api/core.node.subsystems/-data-vending-service/-request/index.html index e21760d9ce..6faca64e70 100644 --- a/docs/build/html/api/core.node.subsystems/-data-vending-service/-request/index.html +++ b/docs/build/html/api/core.node.subsystems/-data-vending-service/-request/index.html @@ -17,7 +17,7 @@ <init> -Request(hashes: List<SecureHash>, replyTo: SingleMessageRecipient, sessionID: Long) +Request(hashes: List<SecureHash>, replyTo: SingleMessageRecipient, sessionID: Long) diff --git a/docs/build/html/api/core.node.subsystems/-data-vending-service/index.html b/docs/build/html/api/core.node.subsystems/-data-vending-service/index.html index d8b74cb46d..3eb691a8e5 100644 --- a/docs/build/html/api/core.node.subsystems/-data-vending-service/index.html +++ b/docs/build/html/api/core.node.subsystems/-data-vending-service/index.html @@ -38,7 +38,7 @@ such the hash of a piece of data can be seen as a type of password allowing acce <init> -DataVendingService(net: MessagingService, storage: StorageService)

This class sets up network message handlers for requests from peers for data keyed by hash. It is a piece of simple +DataVendingService(net: MessagingService, storage: StorageService)

This class sets up network message handlers for requests from peers for data keyed by hash. It is a piece of simple glue that sits between the network layer and the database layer.

@@ -62,9 +62,9 @@ glue that sits between the network layer and the database layer.

addMessageHandler -fun <Q : AbstractRequestMessage, R : Any> addMessageHandler(topic: String, handler: (Q) -> R, exceptionConsumer: (Message, Exception) -> Unit): Unit

Register a handler for a message topic. In comparison to using net.addMessageHandler() this manages a lot of +fun <Q : AbstractRequestMessage, R : Any> addMessageHandler(topic: String, handler: (Q) -> R, exceptionConsumer: (Message, Exception) -> Unit): Unit

Register a handler for a message topic. In comparison to using net.addMessageHandler() this manages a lot of common boilerplate code. Exceptions are caught and passed to the provided consumer.

-fun <Q : AbstractRequestMessage, R : Any> addMessageHandler(topic: String, handler: (Q) -> R): Unit

Register a handler for a message topic. In comparison to using net.addMessageHandler() this manages a lot of +fun <Q : AbstractRequestMessage, R : Any> addMessageHandler(topic: String, handler: (Q) -> R): Unit

Register a handler for a message topic. In comparison to using net.addMessageHandler() this manages a lot of common boilerplate code. Exceptions are propagated to the messaging layer.

diff --git a/docs/build/html/api/core.node.subsystems/-data-vending-service/logger.html b/docs/build/html/api/core.node.subsystems/-data-vending-service/logger.html index 7220b16436..67f837e153 100644 --- a/docs/build/html/api/core.node.subsystems/-data-vending-service/logger.html +++ b/docs/build/html/api/core.node.subsystems/-data-vending-service/logger.html @@ -7,7 +7,7 @@ core.node.subsystems / DataVendingService / logger

logger

- + val logger: <ERROR CLASS>


diff --git a/docs/build/html/api/core.node.subsystems/-e2-e-test-key-management-service/fresh-key.html b/docs/build/html/api/core.node.subsystems/-e2-e-test-key-management-service/fresh-key.html index 7abc42d843..da3e7b4df6 100644 --- a/docs/build/html/api/core.node.subsystems/-e2-e-test-key-management-service/fresh-key.html +++ b/docs/build/html/api/core.node.subsystems/-e2-e-test-key-management-service/fresh-key.html @@ -7,7 +7,7 @@ core.node.subsystems / E2ETestKeyManagementService / freshKey

freshKey

- + fun freshKey(): KeyPair
Overrides KeyManagementService.freshKey

Generates a new random key and adds it to the exposed map.

diff --git a/docs/build/html/api/core.node.subsystems/-e2-e-test-key-management-service/index.html b/docs/build/html/api/core.node.subsystems/-e2-e-test-key-management-service/index.html index 321435af12..610a0d983c 100644 --- a/docs/build/html/api/core.node.subsystems/-e2-e-test-key-management-service/index.html +++ b/docs/build/html/api/core.node.subsystems/-e2-e-test-key-management-service/index.html @@ -62,13 +62,13 @@ on a separate/firewalled service.

toKeyPair -open fun toKeyPair(publicKey: PublicKey): KeyPair +open fun toKeyPair(publicKey: PublicKey): KeyPair toPrivate -open fun toPrivate(publicKey: PublicKey): PrivateKey +open fun toPrivate(publicKey: PublicKey): PrivateKey diff --git a/docs/build/html/api/core.node.subsystems/-e2-e-test-key-management-service/keys.html b/docs/build/html/api/core.node.subsystems/-e2-e-test-key-management-service/keys.html index e06ae8a727..5a6c6d1844 100644 --- a/docs/build/html/api/core.node.subsystems/-e2-e-test-key-management-service/keys.html +++ b/docs/build/html/api/core.node.subsystems/-e2-e-test-key-management-service/keys.html @@ -7,7 +7,7 @@ core.node.subsystems / E2ETestKeyManagementService / keys

keys

- + val keys: Map<PublicKey, PrivateKey>
Overrides KeyManagementService.keys

Returns a snapshot of the current pubkey->privkey mapping.

diff --git a/docs/build/html/api/core.node.subsystems/-in-memory-identity-service/index.html b/docs/build/html/api/core.node.subsystems/-in-memory-identity-service/index.html index c5448aff95..07e09b302b 100644 --- a/docs/build/html/api/core.node.subsystems/-in-memory-identity-service/index.html +++ b/docs/build/html/api/core.node.subsystems/-in-memory-identity-service/index.html @@ -30,19 +30,19 @@ partyFromKey -fun partyFromKey(key: PublicKey): Party? +fun partyFromKey(key: PublicKey): Party? partyFromName -fun partyFromName(name: String): Party? +fun partyFromName(name: String): Party? registerIdentity -fun registerIdentity(party: Party): Unit +fun registerIdentity(party: Party): Unit diff --git a/docs/build/html/api/core.node.subsystems/-in-memory-identity-service/party-from-key.html b/docs/build/html/api/core.node.subsystems/-in-memory-identity-service/party-from-key.html index 640f965623..dc18e00b92 100644 --- a/docs/build/html/api/core.node.subsystems/-in-memory-identity-service/party-from-key.html +++ b/docs/build/html/api/core.node.subsystems/-in-memory-identity-service/party-from-key.html @@ -7,8 +7,8 @@ core.node.subsystems / InMemoryIdentityService / partyFromKey

partyFromKey

- -fun partyFromKey(key: PublicKey): Party?
+ +fun partyFromKey(key: PublicKey): Party?
Overrides IdentityService.partyFromKey


diff --git a/docs/build/html/api/core.node.subsystems/-in-memory-identity-service/party-from-name.html b/docs/build/html/api/core.node.subsystems/-in-memory-identity-service/party-from-name.html index c626fd9fd7..624a23a963 100644 --- a/docs/build/html/api/core.node.subsystems/-in-memory-identity-service/party-from-name.html +++ b/docs/build/html/api/core.node.subsystems/-in-memory-identity-service/party-from-name.html @@ -7,8 +7,8 @@ core.node.subsystems / InMemoryIdentityService / partyFromName

partyFromName

- -fun partyFromName(name: String): Party?
+ +fun partyFromName(name: String): Party?
Overrides IdentityService.partyFromName


diff --git a/docs/build/html/api/core.node.subsystems/-in-memory-identity-service/register-identity.html b/docs/build/html/api/core.node.subsystems/-in-memory-identity-service/register-identity.html index c1cca7d334..38270237d0 100644 --- a/docs/build/html/api/core.node.subsystems/-in-memory-identity-service/register-identity.html +++ b/docs/build/html/api/core.node.subsystems/-in-memory-identity-service/register-identity.html @@ -7,8 +7,8 @@ core.node.subsystems / InMemoryIdentityService / registerIdentity

registerIdentity

- -fun registerIdentity(party: Party): Unit
+ +fun registerIdentity(party: Party): Unit
Overrides IdentityService.registerIdentity


diff --git a/docs/build/html/api/core.node.subsystems/-in-memory-network-map-cache/add-map-service.html b/docs/build/html/api/core.node.subsystems/-in-memory-network-map-cache/add-map-service.html index 66c10cb536..0218ff4148 100644 --- a/docs/build/html/api/core.node.subsystems/-in-memory-network-map-cache/add-map-service.html +++ b/docs/build/html/api/core.node.subsystems/-in-memory-network-map-cache/add-map-service.html @@ -7,8 +7,8 @@ core.node.subsystems / InMemoryNetworkMapCache / addMapService

addMapService

- -open fun addMapService(smm: StateMachineManager, net: MessagingService, service: NodeInfo, subscribe: Boolean, ifChangedSinceVer: Int?): <ERROR CLASS><Unit>
+ +open fun addMapService(smm: StateMachineManager, net: MessagingService, service: NodeInfo, subscribe: Boolean, ifChangedSinceVer: Int?): <ERROR CLASS><Unit>
Overrides NetworkMapCache.addMapService

Add a network map service; fetches a copy of the latest map from the service and subscribes to any further updates.

diff --git a/docs/build/html/api/core.node.subsystems/-in-memory-network-map-cache/add-node.html b/docs/build/html/api/core.node.subsystems/-in-memory-network-map-cache/add-node.html index 84e5127876..8a40fdda7a 100644 --- a/docs/build/html/api/core.node.subsystems/-in-memory-network-map-cache/add-node.html +++ b/docs/build/html/api/core.node.subsystems/-in-memory-network-map-cache/add-node.html @@ -7,8 +7,8 @@ core.node.subsystems / InMemoryNetworkMapCache / addNode

addNode

- -open fun addNode(node: NodeInfo): Unit
+ +open fun addNode(node: NodeInfo): Unit
Overrides NetworkMapCache.addNode

Adds a node to the local cache (generally only used for adding ourselves)


diff --git a/docs/build/html/api/core.node.subsystems/-in-memory-network-map-cache/deregister-for-updates.html b/docs/build/html/api/core.node.subsystems/-in-memory-network-map-cache/deregister-for-updates.html index 9c9fdc2361..42ee5d6e5d 100644 --- a/docs/build/html/api/core.node.subsystems/-in-memory-network-map-cache/deregister-for-updates.html +++ b/docs/build/html/api/core.node.subsystems/-in-memory-network-map-cache/deregister-for-updates.html @@ -7,8 +7,8 @@ core.node.subsystems / InMemoryNetworkMapCache / deregisterForUpdates

deregisterForUpdates

- -open fun deregisterForUpdates(smm: StateMachineManager, net: MessagingService, service: NodeInfo): <ERROR CLASS><Unit>
+ +open fun deregisterForUpdates(smm: StateMachineManager, net: MessagingService, service: NodeInfo): <ERROR CLASS><Unit>
Overrides NetworkMapCache.deregisterForUpdates

Unsubscribes from updates from the given map service.

Parameters

diff --git a/docs/build/html/api/core.node.subsystems/-in-memory-network-map-cache/get-recommended.html b/docs/build/html/api/core.node.subsystems/-in-memory-network-map-cache/get-recommended.html index d8bf059350..d2d1579518 100644 --- a/docs/build/html/api/core.node.subsystems/-in-memory-network-map-cache/get-recommended.html +++ b/docs/build/html/api/core.node.subsystems/-in-memory-network-map-cache/get-recommended.html @@ -7,8 +7,8 @@ core.node.subsystems / InMemoryNetworkMapCache / getRecommended

getRecommended

- -open fun getRecommended(type: ServiceType, contract: Contract, vararg party: Party): NodeInfo?
+ +open fun getRecommended(type: ServiceType, contract: Contract, vararg party: Party): NodeInfo?
Overrides NetworkMapCache.getRecommended

Get a recommended node that advertises a service, and is suitable for the specified contract and parties. Implementations might understand, for example, the correct regulator to use for specific contracts/parties, diff --git a/docs/build/html/api/core.node.subsystems/-in-memory-network-map-cache/get.html b/docs/build/html/api/core.node.subsystems/-in-memory-network-map-cache/get.html index 13e793cd33..fa210230d0 100644 --- a/docs/build/html/api/core.node.subsystems/-in-memory-network-map-cache/get.html +++ b/docs/build/html/api/core.node.subsystems/-in-memory-network-map-cache/get.html @@ -7,14 +7,14 @@ core.node.subsystems / InMemoryNetworkMapCache / get

get

- + open fun get(): <ERROR CLASS>
Overrides NetworkMapCache.get

Get a copy of all nodes in the map.



- -open fun get(serviceType: ServiceType): <ERROR CLASS>
+ +open fun get(serviceType: ServiceType): <ERROR CLASS>
Overrides NetworkMapCache.get

Get the collection of nodes which advertise a specific service.


diff --git a/docs/build/html/api/core.node.subsystems/-in-memory-network-map-cache/index.html b/docs/build/html/api/core.node.subsystems/-in-memory-network-map-cache/index.html index 68edb24b12..6bffae14ab 100644 --- a/docs/build/html/api/core.node.subsystems/-in-memory-network-map-cache/index.html +++ b/docs/build/html/api/core.node.subsystems/-in-memory-network-map-cache/index.html @@ -78,7 +78,7 @@ elsewhere.

addMapService -open fun addMapService(smm: StateMachineManager, net: MessagingService, service: NodeInfo, subscribe: Boolean, ifChangedSinceVer: Int?): <ERROR CLASS><Unit>

Add a network map service; fetches a copy of the latest map from the service and subscribes to any further +open fun addMapService(smm: StateMachineManager, net: MessagingService, service: NodeInfo, subscribe: Boolean, ifChangedSinceVer: Int?): <ERROR CLASS><Unit>

Add a network map service; fetches a copy of the latest map from the service and subscribes to any further updates.

@@ -86,14 +86,14 @@ updates.

addNode -open fun addNode(node: NodeInfo): Unit

Adds a node to the local cache (generally only used for adding ourselves)

+open fun addNode(node: NodeInfo): Unit

Adds a node to the local cache (generally only used for adding ourselves)

deregisterForUpdates -open fun deregisterForUpdates(smm: StateMachineManager, net: MessagingService, service: NodeInfo): <ERROR CLASS><Unit>

Unsubscribes from updates from the given map service.

+open fun deregisterForUpdates(smm: StateMachineManager, net: MessagingService, service: NodeInfo): <ERROR CLASS><Unit>

Unsubscribes from updates from the given map service.

@@ -101,14 +101,14 @@ updates.

get open fun get(): <ERROR CLASS>

Get a copy of all nodes in the map.

-open fun get(serviceType: ServiceType): <ERROR CLASS>

Get the collection of nodes which advertise a specific service.

+open fun get(serviceType: ServiceType): <ERROR CLASS>

Get the collection of nodes which advertise a specific service.

getRecommended -open fun getRecommended(type: ServiceType, contract: Contract, vararg party: Party): NodeInfo?

Get a recommended node that advertises a service, and is suitable for the specified contract and parties. +open fun getRecommended(type: ServiceType, contract: Contract, vararg party: Party): NodeInfo?

Get a recommended node that advertises a service, and is suitable for the specified contract and parties. Implementations might understand, for example, the correct regulator to use for specific contracts/parties, or the appropriate oracle for a contract.

@@ -117,13 +117,13 @@ or the appropriate oracle for a contract.

processUpdatePush -fun processUpdatePush(req: Update): Unit +fun processUpdatePush(req: Update): Unit removeNode -open fun removeNode(node: NodeInfo): Unit

Removes a node from the local cache

+open fun removeNode(node: NodeInfo): Unit

Removes a node from the local cache

@@ -135,7 +135,7 @@ or the appropriate oracle for a contract.

nodeForPartyName -open fun nodeForPartyName(name: String): NodeInfo?

Look up the node info for a party.

+open fun nodeForPartyName(name: String): NodeInfo?

Look up the node info for a party.

diff --git a/docs/build/html/api/core.node.subsystems/-in-memory-network-map-cache/network-map-nodes.html b/docs/build/html/api/core.node.subsystems/-in-memory-network-map-cache/network-map-nodes.html index d7dafbda19..2ae136b189 100644 --- a/docs/build/html/api/core.node.subsystems/-in-memory-network-map-cache/network-map-nodes.html +++ b/docs/build/html/api/core.node.subsystems/-in-memory-network-map-cache/network-map-nodes.html @@ -7,7 +7,7 @@ core.node.subsystems / InMemoryNetworkMapCache / networkMapNodes

networkMapNodes

- + open val networkMapNodes: List<NodeInfo>
Overrides NetworkMapCache.networkMapNodes

A list of nodes that advertise a network map service

diff --git a/docs/build/html/api/core.node.subsystems/-in-memory-network-map-cache/party-nodes.html b/docs/build/html/api/core.node.subsystems/-in-memory-network-map-cache/party-nodes.html index 47c7c8a590..9c748bb133 100644 --- a/docs/build/html/api/core.node.subsystems/-in-memory-network-map-cache/party-nodes.html +++ b/docs/build/html/api/core.node.subsystems/-in-memory-network-map-cache/party-nodes.html @@ -7,7 +7,7 @@ core.node.subsystems / InMemoryNetworkMapCache / partyNodes

partyNodes

- + open val partyNodes: List<NodeInfo>
Overrides NetworkMapCache.partyNodes

A list of all nodes the cache is aware of

diff --git a/docs/build/html/api/core.node.subsystems/-in-memory-network-map-cache/process-update-push.html b/docs/build/html/api/core.node.subsystems/-in-memory-network-map-cache/process-update-push.html index 2b428b71c1..6642a91e6d 100644 --- a/docs/build/html/api/core.node.subsystems/-in-memory-network-map-cache/process-update-push.html +++ b/docs/build/html/api/core.node.subsystems/-in-memory-network-map-cache/process-update-push.html @@ -7,8 +7,8 @@ core.node.subsystems / InMemoryNetworkMapCache / processUpdatePush

processUpdatePush

- -fun processUpdatePush(req: Update): Unit
+ +fun processUpdatePush(req: Update): Unit


diff --git a/docs/build/html/api/core.node.subsystems/-in-memory-network-map-cache/rates-oracle-nodes.html b/docs/build/html/api/core.node.subsystems/-in-memory-network-map-cache/rates-oracle-nodes.html index afa1b896e0..90d7d1221e 100644 --- a/docs/build/html/api/core.node.subsystems/-in-memory-network-map-cache/rates-oracle-nodes.html +++ b/docs/build/html/api/core.node.subsystems/-in-memory-network-map-cache/rates-oracle-nodes.html @@ -7,7 +7,7 @@ core.node.subsystems / InMemoryNetworkMapCache / ratesOracleNodes

ratesOracleNodes

- + open val ratesOracleNodes: List<NodeInfo>
Overrides NetworkMapCache.ratesOracleNodes

A list of nodes that advertise a rates oracle service

diff --git a/docs/build/html/api/core.node.subsystems/-in-memory-network-map-cache/registered-nodes.html b/docs/build/html/api/core.node.subsystems/-in-memory-network-map-cache/registered-nodes.html index 0cb416f7b6..a2f68223ee 100644 --- a/docs/build/html/api/core.node.subsystems/-in-memory-network-map-cache/registered-nodes.html +++ b/docs/build/html/api/core.node.subsystems/-in-memory-network-map-cache/registered-nodes.html @@ -7,7 +7,7 @@ core.node.subsystems / InMemoryNetworkMapCache / registeredNodes

registeredNodes

- + protected var registeredNodes: MutableMap<Party, NodeInfo>


diff --git a/docs/build/html/api/core.node.subsystems/-in-memory-network-map-cache/regulators.html b/docs/build/html/api/core.node.subsystems/-in-memory-network-map-cache/regulators.html index 56e1d852a7..1030057e93 100644 --- a/docs/build/html/api/core.node.subsystems/-in-memory-network-map-cache/regulators.html +++ b/docs/build/html/api/core.node.subsystems/-in-memory-network-map-cache/regulators.html @@ -7,7 +7,7 @@ core.node.subsystems / InMemoryNetworkMapCache / regulators

regulators

- + open val regulators: List<NodeInfo>
Overrides NetworkMapCache.regulators

A list of nodes that advertise a regulatory service. Identifying the correct regulator for a trade is outwith diff --git a/docs/build/html/api/core.node.subsystems/-in-memory-network-map-cache/remove-node.html b/docs/build/html/api/core.node.subsystems/-in-memory-network-map-cache/remove-node.html index 4c36d442b0..44c32c3081 100644 --- a/docs/build/html/api/core.node.subsystems/-in-memory-network-map-cache/remove-node.html +++ b/docs/build/html/api/core.node.subsystems/-in-memory-network-map-cache/remove-node.html @@ -7,8 +7,8 @@ core.node.subsystems / InMemoryNetworkMapCache / removeNode

removeNode

- -open fun removeNode(node: NodeInfo): Unit
+ +open fun removeNode(node: NodeInfo): Unit
Overrides NetworkMapCache.removeNode

Removes a node from the local cache


diff --git a/docs/build/html/api/core.node.subsystems/-in-memory-network-map-cache/timestamping-nodes.html b/docs/build/html/api/core.node.subsystems/-in-memory-network-map-cache/timestamping-nodes.html index dabe6abc77..fad499747b 100644 --- a/docs/build/html/api/core.node.subsystems/-in-memory-network-map-cache/timestamping-nodes.html +++ b/docs/build/html/api/core.node.subsystems/-in-memory-network-map-cache/timestamping-nodes.html @@ -7,7 +7,7 @@ core.node.subsystems / InMemoryNetworkMapCache / timestampingNodes

timestampingNodes

- + open val timestampingNodes: List<NodeInfo>
Overrides NetworkMapCache.timestampingNodes

A list of nodes that advertise a timestamping service

diff --git a/docs/build/html/api/core.node.subsystems/-key-management-service/fresh-key.html b/docs/build/html/api/core.node.subsystems/-key-management-service/fresh-key.html index d09ad96e15..5c5c4d8be8 100644 --- a/docs/build/html/api/core.node.subsystems/-key-management-service/fresh-key.html +++ b/docs/build/html/api/core.node.subsystems/-key-management-service/fresh-key.html @@ -7,7 +7,7 @@ core.node.subsystems / KeyManagementService / freshKey

freshKey

- + abstract fun freshKey(): KeyPair

Generates a new random key and adds it to the exposed map.


diff --git a/docs/build/html/api/core.node.subsystems/-key-management-service/index.html b/docs/build/html/api/core.node.subsystems/-key-management-service/index.html index 72babb639d..2105bbffe1 100644 --- a/docs/build/html/api/core.node.subsystems/-key-management-service/index.html +++ b/docs/build/html/api/core.node.subsystems/-key-management-service/index.html @@ -42,13 +42,13 @@ interface if/when one is developed.

toKeyPair -open fun toKeyPair(publicKey: PublicKey): KeyPair +open fun toKeyPair(publicKey: PublicKey): KeyPair toPrivate -open fun toPrivate(publicKey: PublicKey): PrivateKey +open fun toPrivate(publicKey: PublicKey): PrivateKey diff --git a/docs/build/html/api/core.node.subsystems/-key-management-service/keys.html b/docs/build/html/api/core.node.subsystems/-key-management-service/keys.html index 31fbdf88ab..2a08db81a3 100644 --- a/docs/build/html/api/core.node.subsystems/-key-management-service/keys.html +++ b/docs/build/html/api/core.node.subsystems/-key-management-service/keys.html @@ -7,7 +7,7 @@ core.node.subsystems / KeyManagementService / keys

keys

- + abstract val keys: Map<PublicKey, PrivateKey>

Returns a snapshot of the current pubkey->privkey mapping.


diff --git a/docs/build/html/api/core.node.subsystems/-key-management-service/to-key-pair.html b/docs/build/html/api/core.node.subsystems/-key-management-service/to-key-pair.html index 2ced16fe7d..50e803a2bd 100644 --- a/docs/build/html/api/core.node.subsystems/-key-management-service/to-key-pair.html +++ b/docs/build/html/api/core.node.subsystems/-key-management-service/to-key-pair.html @@ -7,8 +7,8 @@ core.node.subsystems / KeyManagementService / toKeyPair

toKeyPair

- -open fun toKeyPair(publicKey: PublicKey): KeyPair
+ +open fun toKeyPair(publicKey: PublicKey): KeyPair


diff --git a/docs/build/html/api/core.node.subsystems/-key-management-service/to-private.html b/docs/build/html/api/core.node.subsystems/-key-management-service/to-private.html index da1d95acdf..87921c8f98 100644 --- a/docs/build/html/api/core.node.subsystems/-key-management-service/to-private.html +++ b/docs/build/html/api/core.node.subsystems/-key-management-service/to-private.html @@ -7,8 +7,8 @@ core.node.subsystems / KeyManagementService / toPrivate

toPrivate

- -open fun toPrivate(publicKey: PublicKey): PrivateKey
+ +open fun toPrivate(publicKey: PublicKey): PrivateKey


diff --git a/docs/build/html/api/core.node.subsystems/-network-map-cache/add-map-service.html b/docs/build/html/api/core.node.subsystems/-network-map-cache/add-map-service.html index 12b1a7a084..9d85880899 100644 --- a/docs/build/html/api/core.node.subsystems/-network-map-cache/add-map-service.html +++ b/docs/build/html/api/core.node.subsystems/-network-map-cache/add-map-service.html @@ -7,8 +7,8 @@ core.node.subsystems / NetworkMapCache / addMapService

addMapService

- -abstract fun addMapService(smm: StateMachineManager, net: MessagingService, service: NodeInfo, subscribe: Boolean, ifChangedSinceVer: Int? = null): <ERROR CLASS><Unit>
+ +abstract fun addMapService(smm: StateMachineManager, net: MessagingService, service: NodeInfo, subscribe: Boolean, ifChangedSinceVer: Int? = null): <ERROR CLASS><Unit>

Add a network map service; fetches a copy of the latest map from the service and subscribes to any further updates.

Parameters

diff --git a/docs/build/html/api/core.node.subsystems/-network-map-cache/add-node.html b/docs/build/html/api/core.node.subsystems/-network-map-cache/add-node.html index be637ccf0b..2859f7da9f 100644 --- a/docs/build/html/api/core.node.subsystems/-network-map-cache/add-node.html +++ b/docs/build/html/api/core.node.subsystems/-network-map-cache/add-node.html @@ -7,8 +7,8 @@ core.node.subsystems / NetworkMapCache / addNode

addNode

- -abstract fun addNode(node: NodeInfo): Unit
+ +abstract fun addNode(node: NodeInfo): Unit

Adds a node to the local cache (generally only used for adding ourselves)



diff --git a/docs/build/html/api/core.node.subsystems/-network-map-cache/deregister-for-updates.html b/docs/build/html/api/core.node.subsystems/-network-map-cache/deregister-for-updates.html index 0d227f1fba..c331425f95 100644 --- a/docs/build/html/api/core.node.subsystems/-network-map-cache/deregister-for-updates.html +++ b/docs/build/html/api/core.node.subsystems/-network-map-cache/deregister-for-updates.html @@ -7,8 +7,8 @@ core.node.subsystems / NetworkMapCache / deregisterForUpdates

deregisterForUpdates

- -abstract fun deregisterForUpdates(smm: StateMachineManager, net: MessagingService, service: NodeInfo): <ERROR CLASS><Unit>
+ +abstract fun deregisterForUpdates(smm: StateMachineManager, net: MessagingService, service: NodeInfo): <ERROR CLASS><Unit>

Deregister from updates from the given map service.

Parameters

diff --git a/docs/build/html/api/core.node.subsystems/-network-map-cache/get-recommended.html b/docs/build/html/api/core.node.subsystems/-network-map-cache/get-recommended.html index a56d77a41d..2926e21c76 100644 --- a/docs/build/html/api/core.node.subsystems/-network-map-cache/get-recommended.html +++ b/docs/build/html/api/core.node.subsystems/-network-map-cache/get-recommended.html @@ -7,8 +7,8 @@ core.node.subsystems / NetworkMapCache / getRecommended

getRecommended

- -abstract fun getRecommended(type: ServiceType, contract: Contract, vararg party: Party): NodeInfo?
+ +abstract fun getRecommended(type: ServiceType, contract: Contract, vararg party: Party): NodeInfo?

Get a recommended node that advertises a service, and is suitable for the specified contract and parties. Implementations might understand, for example, the correct regulator to use for specific contracts/parties, or the appropriate oracle for a contract.

diff --git a/docs/build/html/api/core.node.subsystems/-network-map-cache/get.html b/docs/build/html/api/core.node.subsystems/-network-map-cache/get.html index 0d370e5376..a420d7f560 100644 --- a/docs/build/html/api/core.node.subsystems/-network-map-cache/get.html +++ b/docs/build/html/api/core.node.subsystems/-network-map-cache/get.html @@ -7,13 +7,13 @@ core.node.subsystems / NetworkMapCache / get

get

- + abstract fun get(): Collection<NodeInfo>

Get a copy of all nodes in the map.



- -abstract fun get(serviceType: ServiceType): Collection<NodeInfo>
+ +abstract fun get(serviceType: ServiceType): Collection<NodeInfo>

Get the collection of nodes which advertise a specific service.



diff --git a/docs/build/html/api/core.node.subsystems/-network-map-cache/index.html b/docs/build/html/api/core.node.subsystems/-network-map-cache/index.html index 5668c347c7..32ae6c9de2 100644 --- a/docs/build/html/api/core.node.subsystems/-network-map-cache/index.html +++ b/docs/build/html/api/core.node.subsystems/-network-map-cache/index.html @@ -63,7 +63,7 @@ elsewhere.

addMapService -abstract fun addMapService(smm: StateMachineManager, net: MessagingService, service: NodeInfo, subscribe: Boolean, ifChangedSinceVer: Int? = null): <ERROR CLASS><Unit>

Add a network map service; fetches a copy of the latest map from the service and subscribes to any further +abstract fun addMapService(smm: StateMachineManager, net: MessagingService, service: NodeInfo, subscribe: Boolean, ifChangedSinceVer: Int? = null): <ERROR CLASS><Unit>

Add a network map service; fetches a copy of the latest map from the service and subscribes to any further updates.

@@ -71,14 +71,14 @@ updates.

addNode -abstract fun addNode(node: NodeInfo): Unit

Adds a node to the local cache (generally only used for adding ourselves)

+abstract fun addNode(node: NodeInfo): Unit

Adds a node to the local cache (generally only used for adding ourselves)

deregisterForUpdates -abstract fun deregisterForUpdates(smm: StateMachineManager, net: MessagingService, service: NodeInfo): <ERROR CLASS><Unit>

Deregister from updates from the given map service.

+abstract fun deregisterForUpdates(smm: StateMachineManager, net: MessagingService, service: NodeInfo): <ERROR CLASS><Unit>

Deregister from updates from the given map service.

@@ -86,14 +86,14 @@ updates.

get abstract fun get(): Collection<NodeInfo>

Get a copy of all nodes in the map.

-abstract fun get(serviceType: ServiceType): Collection<NodeInfo>

Get the collection of nodes which advertise a specific service.

+abstract fun get(serviceType: ServiceType): Collection<NodeInfo>

Get the collection of nodes which advertise a specific service.

getRecommended -abstract fun getRecommended(type: ServiceType, contract: Contract, vararg party: Party): NodeInfo?

Get a recommended node that advertises a service, and is suitable for the specified contract and parties. +abstract fun getRecommended(type: ServiceType, contract: Contract, vararg party: Party): NodeInfo?

Get a recommended node that advertises a service, and is suitable for the specified contract and parties. Implementations might understand, for example, the correct regulator to use for specific contracts/parties, or the appropriate oracle for a contract.

@@ -102,14 +102,14 @@ or the appropriate oracle for a contract.

nodeForPartyName -open fun nodeForPartyName(name: String): NodeInfo?

Look up the node info for a party.

+open fun nodeForPartyName(name: String): NodeInfo?

Look up the node info for a party.

removeNode -abstract fun removeNode(node: NodeInfo): Unit

Removes a node from the local cache

+abstract fun removeNode(node: NodeInfo): Unit

Removes a node from the local cache

diff --git a/docs/build/html/api/core.node.subsystems/-network-map-cache/logger.html b/docs/build/html/api/core.node.subsystems/-network-map-cache/logger.html index bc750de9c4..3286f60cf2 100644 --- a/docs/build/html/api/core.node.subsystems/-network-map-cache/logger.html +++ b/docs/build/html/api/core.node.subsystems/-network-map-cache/logger.html @@ -7,7 +7,7 @@ core.node.subsystems / NetworkMapCache / logger

logger

- + val logger: <ERROR CLASS>


diff --git a/docs/build/html/api/core.node.subsystems/-network-map-cache/network-map-nodes.html b/docs/build/html/api/core.node.subsystems/-network-map-cache/network-map-nodes.html index c06e75ff1c..0d128c6504 100644 --- a/docs/build/html/api/core.node.subsystems/-network-map-cache/network-map-nodes.html +++ b/docs/build/html/api/core.node.subsystems/-network-map-cache/network-map-nodes.html @@ -7,7 +7,7 @@ core.node.subsystems / NetworkMapCache / networkMapNodes

networkMapNodes

- + abstract val networkMapNodes: List<NodeInfo>

A list of nodes that advertise a network map service


diff --git a/docs/build/html/api/core.node.subsystems/-network-map-cache/node-for-party-name.html b/docs/build/html/api/core.node.subsystems/-network-map-cache/node-for-party-name.html index be34262f1a..13abc2c522 100644 --- a/docs/build/html/api/core.node.subsystems/-network-map-cache/node-for-party-name.html +++ b/docs/build/html/api/core.node.subsystems/-network-map-cache/node-for-party-name.html @@ -7,8 +7,8 @@ core.node.subsystems / NetworkMapCache / nodeForPartyName

nodeForPartyName

- -open fun nodeForPartyName(name: String): NodeInfo?
+ +open fun nodeForPartyName(name: String): NodeInfo?

Look up the node info for a party.



diff --git a/docs/build/html/api/core.node.subsystems/-network-map-cache/party-nodes.html b/docs/build/html/api/core.node.subsystems/-network-map-cache/party-nodes.html index 9baf0dc160..8752a43a3b 100644 --- a/docs/build/html/api/core.node.subsystems/-network-map-cache/party-nodes.html +++ b/docs/build/html/api/core.node.subsystems/-network-map-cache/party-nodes.html @@ -7,7 +7,7 @@ core.node.subsystems / NetworkMapCache / partyNodes

partyNodes

- + abstract val partyNodes: List<NodeInfo>

A list of all nodes the cache is aware of


diff --git a/docs/build/html/api/core.node.subsystems/-network-map-cache/rates-oracle-nodes.html b/docs/build/html/api/core.node.subsystems/-network-map-cache/rates-oracle-nodes.html index 6e7d3b2771..6b1dde230b 100644 --- a/docs/build/html/api/core.node.subsystems/-network-map-cache/rates-oracle-nodes.html +++ b/docs/build/html/api/core.node.subsystems/-network-map-cache/rates-oracle-nodes.html @@ -7,7 +7,7 @@ core.node.subsystems / NetworkMapCache / ratesOracleNodes

ratesOracleNodes

- + abstract val ratesOracleNodes: List<NodeInfo>

A list of nodes that advertise a rates oracle service


diff --git a/docs/build/html/api/core.node.subsystems/-network-map-cache/regulators.html b/docs/build/html/api/core.node.subsystems/-network-map-cache/regulators.html index 3e5b71200a..52c59175ac 100644 --- a/docs/build/html/api/core.node.subsystems/-network-map-cache/regulators.html +++ b/docs/build/html/api/core.node.subsystems/-network-map-cache/regulators.html @@ -7,7 +7,7 @@ core.node.subsystems / NetworkMapCache / regulators

regulators

- + abstract val regulators: List<NodeInfo>

A list of nodes that advertise a regulatory service. Identifying the correct regulator for a trade is outwith the scope of the network map service, and this is intended solely as a sanity check on configuration stored diff --git a/docs/build/html/api/core.node.subsystems/-network-map-cache/remove-node.html b/docs/build/html/api/core.node.subsystems/-network-map-cache/remove-node.html index da50a028fa..67da524e03 100644 --- a/docs/build/html/api/core.node.subsystems/-network-map-cache/remove-node.html +++ b/docs/build/html/api/core.node.subsystems/-network-map-cache/remove-node.html @@ -7,8 +7,8 @@ core.node.subsystems / NetworkMapCache / removeNode

removeNode

- -abstract fun removeNode(node: NodeInfo): Unit
+ +abstract fun removeNode(node: NodeInfo): Unit

Removes a node from the local cache



diff --git a/docs/build/html/api/core.node.subsystems/-network-map-cache/timestamping-nodes.html b/docs/build/html/api/core.node.subsystems/-network-map-cache/timestamping-nodes.html index 293d2bd027..169d9dff8e 100644 --- a/docs/build/html/api/core.node.subsystems/-network-map-cache/timestamping-nodes.html +++ b/docs/build/html/api/core.node.subsystems/-network-map-cache/timestamping-nodes.html @@ -7,7 +7,7 @@ core.node.subsystems / NetworkMapCache / timestampingNodes

timestampingNodes

- + abstract val timestampingNodes: List<NodeInfo>

A list of nodes that advertise a timestamping service


diff --git a/docs/build/html/api/core.node.subsystems/-node-wallet-service/-init-.html b/docs/build/html/api/core.node.subsystems/-node-wallet-service/-init-.html index f0828687e5..7187fa46f5 100644 --- a/docs/build/html/api/core.node.subsystems/-node-wallet-service/-init-.html +++ b/docs/build/html/api/core.node.subsystems/-node-wallet-service/-init-.html @@ -7,7 +7,7 @@ core.node.subsystems / NodeWalletService / <init>

<init>

-NodeWalletService(services: ServiceHub)
+NodeWalletService(services: ServiceHub)

This class implements a simple, in memory wallet that tracks states that are owned by us, and also has a convenience method to auto-generate some self-issued cash states that can be used for test trading. A real wallet would persist states relevant to us into a database and once such a wallet is implemented, this scaffolding can be removed.

diff --git a/docs/build/html/api/core.node.subsystems/-node-wallet-service/cash-balances.html b/docs/build/html/api/core.node.subsystems/-node-wallet-service/cash-balances.html index 48f1ada4d8..f9786f0336 100644 --- a/docs/build/html/api/core.node.subsystems/-node-wallet-service/cash-balances.html +++ b/docs/build/html/api/core.node.subsystems/-node-wallet-service/cash-balances.html @@ -7,7 +7,7 @@ core.node.subsystems / NodeWalletService / cashBalances

cashBalances

- + val cashBalances: Map<Currency, Amount>
Overrides WalletService.cashBalances

Returns a snapshot of how much cash we have in each currency, ignoring details like issuer. Note: currencies for diff --git a/docs/build/html/api/core.node.subsystems/-node-wallet-service/current-wallet.html b/docs/build/html/api/core.node.subsystems/-node-wallet-service/current-wallet.html index e8a60e9964..142a10e42c 100644 --- a/docs/build/html/api/core.node.subsystems/-node-wallet-service/current-wallet.html +++ b/docs/build/html/api/core.node.subsystems/-node-wallet-service/current-wallet.html @@ -7,7 +7,7 @@ core.node.subsystems / NodeWalletService / currentWallet

currentWallet

- + val currentWallet: Wallet
Overrides WalletService.currentWallet

Returns a read-only snapshot of the wallet at the time the call is made. Note that if you consume states or diff --git a/docs/build/html/api/core.node.subsystems/-node-wallet-service/fill-with-some-test-cash.html b/docs/build/html/api/core.node.subsystems/-node-wallet-service/fill-with-some-test-cash.html index 8823c5c2fa..47fdff1887 100644 --- a/docs/build/html/api/core.node.subsystems/-node-wallet-service/fill-with-some-test-cash.html +++ b/docs/build/html/api/core.node.subsystems/-node-wallet-service/fill-with-some-test-cash.html @@ -7,8 +7,8 @@ core.node.subsystems / NodeWalletService / fillWithSomeTestCash

fillWithSomeTestCash

- -fun fillWithSomeTestCash(howMuch: Amount, atLeastThisManyStates: Int = 3, atMostThisManyStates: Int = 10, rng: Random = Random()): Unit
+ +fun fillWithSomeTestCash(howMuch: Amount, atLeastThisManyStates: Int = 3, atMostThisManyStates: Int = 10, rng: Random = Random()): Unit

Creates a random set of between (by default) 3 and 10 cash states that add up to the given amount and adds them to the wallet.

The cash is self issued with the current nodes identity, as fetched from the storage service. Thus it diff --git a/docs/build/html/api/core.node.subsystems/-node-wallet-service/index.html b/docs/build/html/api/core.node.subsystems/-node-wallet-service/index.html index c5822728e7..18fa6a5b40 100644 --- a/docs/build/html/api/core.node.subsystems/-node-wallet-service/index.html +++ b/docs/build/html/api/core.node.subsystems/-node-wallet-service/index.html @@ -20,7 +20,7 @@ states relevant to us into a database and once such a wallet is implemented, thi <init> -NodeWalletService(services: ServiceHub)

This class implements a simple, in memory wallet that tracks states that are owned by us, and also has a convenience +NodeWalletService(services: ServiceHub)

This class implements a simple, in memory wallet that tracks states that are owned by us, and also has a convenience method to auto-generate some self-issued cash states that can be used for test trading. A real wallet would persist states relevant to us into a database and once such a wallet is implemented, this scaffolding can be removed.

@@ -62,7 +62,7 @@ keys in this wallet, you must inform the wallet service so it can update its int fillWithSomeTestCash -fun fillWithSomeTestCash(howMuch: Amount, atLeastThisManyStates: Int = 3, atMostThisManyStates: Int = 10, rng: Random = Random()): Unit

Creates a random set of between (by default) 3 and 10 cash states that add up to the given amount and adds them +fun fillWithSomeTestCash(howMuch: Amount, atLeastThisManyStates: Int = 3, atMostThisManyStates: Int = 10, rng: Random = Random()): Unit

Creates a random set of between (by default) 3 and 10 cash states that add up to the given amount and adds them to the wallet.

@@ -70,7 +70,7 @@ to the wallet.

notifyAll -fun notifyAll(txns: Iterable<WireTransaction>): Wallet

Possibly update the wallet by marking as spent states that these transactions consume, and adding any relevant +fun notifyAll(txns: Iterable<WireTransaction>): Wallet

Possibly update the wallet by marking as spent states that these transactions consume, and adding any relevant new states that they create. You should only insert transactions that have been successfully verified here

@@ -83,21 +83,21 @@ new states that they create. You should only insert transactions that have been linearHeadsOfType_ -open fun <T : LinearState> linearHeadsOfType_(stateType: Class<T>): Map<SecureHash, StateAndRef<T>>

Returns the linearHeads only when the type of the state would be considered an instanceof the given type.

+open fun <T : LinearState> linearHeadsOfType_(stateType: Class<T>): Map<SecureHash, StateAndRef<T>>

Returns the linearHeads only when the type of the state would be considered an instanceof the given type.

notify -open fun notify(tx: WireTransaction): Wallet

Same as notifyAll but with a single transaction.

+open fun notify(tx: WireTransaction): Wallet

Same as notifyAll but with a single transaction.

statesForRefs -open fun statesForRefs(refs: List<StateRef>): Map<StateRef, ContractState?> +open fun statesForRefs(refs: List<StateRef>): Map<StateRef, ContractState?> diff --git a/docs/build/html/api/core.node.subsystems/-node-wallet-service/linear-heads.html b/docs/build/html/api/core.node.subsystems/-node-wallet-service/linear-heads.html index 98e3ee0274..6209959318 100644 --- a/docs/build/html/api/core.node.subsystems/-node-wallet-service/linear-heads.html +++ b/docs/build/html/api/core.node.subsystems/-node-wallet-service/linear-heads.html @@ -7,7 +7,7 @@ core.node.subsystems / NodeWalletService / linearHeads

linearHeads

- + val linearHeads: Map<SecureHash, StateAndRef<LinearState>>
Overrides WalletService.linearHeads

Returns a snapshot of the heads of LinearStates

diff --git a/docs/build/html/api/core.node.subsystems/-node-wallet-service/notify-all.html b/docs/build/html/api/core.node.subsystems/-node-wallet-service/notify-all.html index d09173bde2..ea329a8b2c 100644 --- a/docs/build/html/api/core.node.subsystems/-node-wallet-service/notify-all.html +++ b/docs/build/html/api/core.node.subsystems/-node-wallet-service/notify-all.html @@ -7,8 +7,8 @@ core.node.subsystems / NodeWalletService / notifyAll

notifyAll

- -fun notifyAll(txns: Iterable<WireTransaction>): Wallet
+ +fun notifyAll(txns: Iterable<WireTransaction>): Wallet
Overrides WalletService.notifyAll

Possibly update the wallet by marking as spent states that these transactions consume, and adding any relevant new states that they create. You should only insert transactions that have been successfully verified here

diff --git a/docs/build/html/api/core.node.subsystems/-storage-service-impl/-init-.html b/docs/build/html/api/core.node.subsystems/-storage-service-impl/-init-.html index 7550d6c34c..b1f2bcf994 100644 --- a/docs/build/html/api/core.node.subsystems/-storage-service-impl/-init-.html +++ b/docs/build/html/api/core.node.subsystems/-storage-service-impl/-init-.html @@ -7,7 +7,7 @@ core.node.subsystems / StorageServiceImpl / <init>

<init>

-StorageServiceImpl(attachments: AttachmentStorage, checkpointStorage: CheckpointStorage, myLegalIdentityKey: KeyPair, myLegalIdentity: Party = Party("Unit test party", myLegalIdentityKey.public), recordingAs: (String) -> String = { tableName -> "" })
+StorageServiceImpl(attachments: AttachmentStorage, checkpointStorage: CheckpointStorage, myLegalIdentityKey: KeyPair, myLegalIdentity: Party = Party("Unit test party", myLegalIdentityKey.public), recordingAs: (String) -> String = { tableName -> "" })


diff --git a/docs/build/html/api/core.node.subsystems/-storage-service-impl/attachments.html b/docs/build/html/api/core.node.subsystems/-storage-service-impl/attachments.html index 03fdb23eee..61bb50bd71 100644 --- a/docs/build/html/api/core.node.subsystems/-storage-service-impl/attachments.html +++ b/docs/build/html/api/core.node.subsystems/-storage-service-impl/attachments.html @@ -7,7 +7,7 @@ core.node.subsystems / StorageServiceImpl / attachments

attachments

- + open val attachments: AttachmentStorage
Overrides StorageService.attachments

Provides access to storage of arbitrary JAR files (which may contain only data, no code).

diff --git a/docs/build/html/api/core.node.subsystems/-storage-service-impl/checkpoint-storage.html b/docs/build/html/api/core.node.subsystems/-storage-service-impl/checkpoint-storage.html index 747ce12016..147bca4fa4 100644 --- a/docs/build/html/api/core.node.subsystems/-storage-service-impl/checkpoint-storage.html +++ b/docs/build/html/api/core.node.subsystems/-storage-service-impl/checkpoint-storage.html @@ -7,7 +7,7 @@ core.node.subsystems / StorageServiceImpl / checkpointStorage

checkpointStorage

- + open val checkpointStorage: CheckpointStorage
Overrides StorageService.checkpointStorage

diff --git a/docs/build/html/api/core.node.subsystems/-storage-service-impl/index.html b/docs/build/html/api/core.node.subsystems/-storage-service-impl/index.html index ec96259268..ef64cfee28 100644 --- a/docs/build/html/api/core.node.subsystems/-storage-service-impl/index.html +++ b/docs/build/html/api/core.node.subsystems/-storage-service-impl/index.html @@ -17,7 +17,7 @@ <init> -StorageServiceImpl(attachments: AttachmentStorage, checkpointStorage: CheckpointStorage, myLegalIdentityKey: KeyPair, myLegalIdentity: Party = Party("Unit test party", myLegalIdentityKey.public), recordingAs: (String) -> String = { tableName -> "" }) +StorageServiceImpl(attachments: AttachmentStorage, checkpointStorage: CheckpointStorage, myLegalIdentityKey: KeyPair, myLegalIdentity: Party = Party("Unit test party", myLegalIdentityKey.public), recordingAs: (String) -> String = { tableName -> "" }) diff --git a/docs/build/html/api/core.node.subsystems/-storage-service-impl/my-legal-identity-key.html b/docs/build/html/api/core.node.subsystems/-storage-service-impl/my-legal-identity-key.html index fb90b5de51..e437f92e24 100644 --- a/docs/build/html/api/core.node.subsystems/-storage-service-impl/my-legal-identity-key.html +++ b/docs/build/html/api/core.node.subsystems/-storage-service-impl/my-legal-identity-key.html @@ -7,7 +7,7 @@ core.node.subsystems / StorageServiceImpl / myLegalIdentityKey

myLegalIdentityKey

- + open val myLegalIdentityKey: KeyPair
Overrides StorageService.myLegalIdentityKey

diff --git a/docs/build/html/api/core.node.subsystems/-storage-service-impl/my-legal-identity.html b/docs/build/html/api/core.node.subsystems/-storage-service-impl/my-legal-identity.html index fb4f5bb586..295ebe542c 100644 --- a/docs/build/html/api/core.node.subsystems/-storage-service-impl/my-legal-identity.html +++ b/docs/build/html/api/core.node.subsystems/-storage-service-impl/my-legal-identity.html @@ -7,7 +7,7 @@ core.node.subsystems / StorageServiceImpl / myLegalIdentity

myLegalIdentity

- + open val myLegalIdentity: Party
Overrides StorageService.myLegalIdentity

Returns the legal identity that this node is configured with. Assumed to be initialised when the node is diff --git a/docs/build/html/api/core.node.subsystems/-storage-service-impl/recording-as.html b/docs/build/html/api/core.node.subsystems/-storage-service-impl/recording-as.html index 8f763ffcc6..91b7bf9e0c 100644 --- a/docs/build/html/api/core.node.subsystems/-storage-service-impl/recording-as.html +++ b/docs/build/html/api/core.node.subsystems/-storage-service-impl/recording-as.html @@ -7,7 +7,7 @@ core.node.subsystems / StorageServiceImpl / recordingAs

recordingAs

- + val recordingAs: (String) -> String


diff --git a/docs/build/html/api/core.node.subsystems/-storage-service-impl/state-machines.html b/docs/build/html/api/core.node.subsystems/-storage-service-impl/state-machines.html index a145cb8b69..e6d7fcdd03 100644 --- a/docs/build/html/api/core.node.subsystems/-storage-service-impl/state-machines.html +++ b/docs/build/html/api/core.node.subsystems/-storage-service-impl/state-machines.html @@ -7,7 +7,7 @@ core.node.subsystems / StorageServiceImpl / stateMachines

stateMachines

- + open val stateMachines: MutableMap<SecureHash, ByteArray>
Overrides StorageService.stateMachines

diff --git a/docs/build/html/api/core.node.subsystems/-storage-service-impl/tables.html b/docs/build/html/api/core.node.subsystems/-storage-service-impl/tables.html index b215205d32..78d3712d8a 100644 --- a/docs/build/html/api/core.node.subsystems/-storage-service-impl/tables.html +++ b/docs/build/html/api/core.node.subsystems/-storage-service-impl/tables.html @@ -7,7 +7,7 @@ core.node.subsystems / StorageServiceImpl / tables

tables

- + protected val tables: HashMap<String, MutableMap<*, *>>


diff --git a/docs/build/html/api/core.node.subsystems/-storage-service-impl/validated-transactions.html b/docs/build/html/api/core.node.subsystems/-storage-service-impl/validated-transactions.html index 5b44811f50..209653f8a1 100644 --- a/docs/build/html/api/core.node.subsystems/-storage-service-impl/validated-transactions.html +++ b/docs/build/html/api/core.node.subsystems/-storage-service-impl/validated-transactions.html @@ -7,7 +7,7 @@ core.node.subsystems / StorageServiceImpl / validatedTransactions

validatedTransactions

- + open val validatedTransactions: MutableMap<SecureHash, SignedTransaction>
Overrides StorageService.validatedTransactions

A map of hash->tx where tx has been signature/contract validated and the states are known to be correct. diff --git a/docs/build/html/api/core.node.subsystems/-storage-service/attachments.html b/docs/build/html/api/core.node.subsystems/-storage-service/attachments.html index cff171927f..ca72960861 100644 --- a/docs/build/html/api/core.node.subsystems/-storage-service/attachments.html +++ b/docs/build/html/api/core.node.subsystems/-storage-service/attachments.html @@ -7,7 +7,7 @@ core.node.subsystems / StorageService / attachments

attachments

- + abstract val attachments: AttachmentStorage

Provides access to storage of arbitrary JAR files (which may contain only data, no code).


diff --git a/docs/build/html/api/core.node.subsystems/-storage-service/checkpoint-storage.html b/docs/build/html/api/core.node.subsystems/-storage-service/checkpoint-storage.html index e40eafd04c..502e6d2259 100644 --- a/docs/build/html/api/core.node.subsystems/-storage-service/checkpoint-storage.html +++ b/docs/build/html/api/core.node.subsystems/-storage-service/checkpoint-storage.html @@ -7,7 +7,7 @@ core.node.subsystems / StorageService / checkpointStorage

checkpointStorage

- + abstract val checkpointStorage: CheckpointStorage


diff --git a/docs/build/html/api/core.node.subsystems/-storage-service/my-legal-identity-key.html b/docs/build/html/api/core.node.subsystems/-storage-service/my-legal-identity-key.html index 644fdd050d..ea5a280147 100644 --- a/docs/build/html/api/core.node.subsystems/-storage-service/my-legal-identity-key.html +++ b/docs/build/html/api/core.node.subsystems/-storage-service/my-legal-identity-key.html @@ -7,7 +7,7 @@ core.node.subsystems / StorageService / myLegalIdentityKey

myLegalIdentityKey

- + abstract val myLegalIdentityKey: KeyPair


diff --git a/docs/build/html/api/core.node.subsystems/-storage-service/my-legal-identity.html b/docs/build/html/api/core.node.subsystems/-storage-service/my-legal-identity.html index cd301f81a3..fc55c7bf88 100644 --- a/docs/build/html/api/core.node.subsystems/-storage-service/my-legal-identity.html +++ b/docs/build/html/api/core.node.subsystems/-storage-service/my-legal-identity.html @@ -7,7 +7,7 @@ core.node.subsystems / StorageService / myLegalIdentity

myLegalIdentity

- + abstract val myLegalIdentity: Party

Returns the legal identity that this node is configured with. Assumed to be initialised when the node is first installed.

diff --git a/docs/build/html/api/core.node.subsystems/-storage-service/state-machines.html b/docs/build/html/api/core.node.subsystems/-storage-service/state-machines.html index 2734f7caa4..771de6d52f 100644 --- a/docs/build/html/api/core.node.subsystems/-storage-service/state-machines.html +++ b/docs/build/html/api/core.node.subsystems/-storage-service/state-machines.html @@ -7,7 +7,7 @@ core.node.subsystems / StorageService / stateMachines

stateMachines

- + abstract val stateMachines: MutableMap<SecureHash, ByteArray>


diff --git a/docs/build/html/api/core.node.subsystems/-storage-service/validated-transactions.html b/docs/build/html/api/core.node.subsystems/-storage-service/validated-transactions.html index 015880b293..fcd1d0427e 100644 --- a/docs/build/html/api/core.node.subsystems/-storage-service/validated-transactions.html +++ b/docs/build/html/api/core.node.subsystems/-storage-service/validated-transactions.html @@ -7,7 +7,7 @@ core.node.subsystems / StorageService / validatedTransactions

validatedTransactions

- + abstract val validatedTransactions: MutableMap<SecureHash, SignedTransaction>

A map of hash->tx where tx has been signature/contract validated and the states are known to be correct. The signatures arent technically needed after that point, but we keep them around so that we can relay diff --git a/docs/build/html/api/core.node.subsystems/-wallet-impl/-init-.html b/docs/build/html/api/core.node.subsystems/-wallet-impl/-init-.html index 0f0afc9f63..fdd9dd7028 100644 --- a/docs/build/html/api/core.node.subsystems/-wallet-impl/-init-.html +++ b/docs/build/html/api/core.node.subsystems/-wallet-impl/-init-.html @@ -7,7 +7,7 @@ core.node.subsystems / WalletImpl / <init>

<init>

-WalletImpl(states: List<StateAndRef<ContractState>>)
+WalletImpl(states: List<StateAndRef<ContractState>>)

A wallet (name may be temporary) wraps a set of states that are useful for us to keep track of, for instance, because we own them. This class represents an immutable, stable state of a wallet: it is guaranteed not to change out from underneath you, even though the canonical currently-best-known wallet may change as we learn diff --git a/docs/build/html/api/core.node.subsystems/-wallet-impl/cash-balances.html b/docs/build/html/api/core.node.subsystems/-wallet-impl/cash-balances.html index 56a4942d67..48fd487479 100644 --- a/docs/build/html/api/core.node.subsystems/-wallet-impl/cash-balances.html +++ b/docs/build/html/api/core.node.subsystems/-wallet-impl/cash-balances.html @@ -7,7 +7,7 @@ core.node.subsystems / WalletImpl / cashBalances

cashBalances

- + val cashBalances: Map<Currency, Amount>
Overrides Wallet.cashBalances

Returns a map of how much cash we have in each currency, ignoring details like issuer. Note: currencies for diff --git a/docs/build/html/api/core.node.subsystems/-wallet-impl/index.html b/docs/build/html/api/core.node.subsystems/-wallet-impl/index.html index 4524f1e404..ff44171b2e 100644 --- a/docs/build/html/api/core.node.subsystems/-wallet-impl/index.html +++ b/docs/build/html/api/core.node.subsystems/-wallet-impl/index.html @@ -24,7 +24,7 @@ about new transactions from our peers and generate new transactions that consume <init> -WalletImpl(states: List<StateAndRef<ContractState>>)

A wallet (name may be temporary) wraps a set of states that are useful for us to keep track of, for instance, +WalletImpl(states: List<StateAndRef<ContractState>>)

A wallet (name may be temporary) wraps a set of states that are useful for us to keep track of, for instance, because we own them. This class represents an immutable, stable state of a wallet: it is guaranteed not to change out from underneath you, even though the canonical currently-best-known wallet may change as we learn about new transactions from our peers and generate new transactions that consume states ourselves.

diff --git a/docs/build/html/api/core.node.subsystems/-wallet-impl/states.html b/docs/build/html/api/core.node.subsystems/-wallet-impl/states.html index 3f52f2ea80..197fd68a12 100644 --- a/docs/build/html/api/core.node.subsystems/-wallet-impl/states.html +++ b/docs/build/html/api/core.node.subsystems/-wallet-impl/states.html @@ -7,7 +7,7 @@ core.node.subsystems / WalletImpl / states

states

- + val states: List<StateAndRef<ContractState>>
Overrides Wallet.states

diff --git a/docs/build/html/api/core.node.subsystems/-wallet-service/cash-balances.html b/docs/build/html/api/core.node.subsystems/-wallet-service/cash-balances.html index 97935c1486..ff9badd791 100644 --- a/docs/build/html/api/core.node.subsystems/-wallet-service/cash-balances.html +++ b/docs/build/html/api/core.node.subsystems/-wallet-service/cash-balances.html @@ -7,7 +7,7 @@ core.node.subsystems / WalletService / cashBalances

cashBalances

- + abstract val cashBalances: Map<Currency, Amount>

Returns a snapshot of how much cash we have in each currency, ignoring details like issuer. Note: currencies for which we have no cash evaluate to null, not 0.

diff --git a/docs/build/html/api/core.node.subsystems/-wallet-service/current-wallet.html b/docs/build/html/api/core.node.subsystems/-wallet-service/current-wallet.html index 1b9a7ca390..770391f65e 100644 --- a/docs/build/html/api/core.node.subsystems/-wallet-service/current-wallet.html +++ b/docs/build/html/api/core.node.subsystems/-wallet-service/current-wallet.html @@ -7,7 +7,7 @@ core.node.subsystems / WalletService / currentWallet

currentWallet

- + abstract val currentWallet: Wallet

Returns a read-only snapshot of the wallet at the time the call is made. Note that if you consume states or keys in this wallet, you must inform the wallet service so it can update its internal state.

diff --git a/docs/build/html/api/core.node.subsystems/-wallet-service/index.html b/docs/build/html/api/core.node.subsystems/-wallet-service/index.html index e9099f5848..05ea875dcc 100644 --- a/docs/build/html/api/core.node.subsystems/-wallet-service/index.html +++ b/docs/build/html/api/core.node.subsystems/-wallet-service/index.html @@ -49,21 +49,21 @@ keys in this wallet, you must inform the wallet service so it can update its int linearHeadsOfType_ -open fun <T : LinearState> linearHeadsOfType_(stateType: Class<T>): Map<SecureHash, StateAndRef<T>>

Returns the linearHeads only when the type of the state would be considered an instanceof the given type.

+open fun <T : LinearState> linearHeadsOfType_(stateType: Class<T>): Map<SecureHash, StateAndRef<T>>

Returns the linearHeads only when the type of the state would be considered an instanceof the given type.

notify -open fun notify(tx: WireTransaction): Wallet

Same as notifyAll but with a single transaction.

+open fun notify(tx: WireTransaction): Wallet

Same as notifyAll but with a single transaction.

notifyAll -abstract fun notifyAll(txns: Iterable<WireTransaction>): Wallet

Possibly update the wallet by marking as spent states that these transactions consume, and adding any relevant +abstract fun notifyAll(txns: Iterable<WireTransaction>): Wallet

Possibly update the wallet by marking as spent states that these transactions consume, and adding any relevant new states that they create. You should only insert transactions that have been successfully verified here

@@ -71,7 +71,7 @@ new states that they create. You should only insert transactions that have been statesForRefs -open fun statesForRefs(refs: List<StateRef>): Map<StateRef, ContractState?> +open fun statesForRefs(refs: List<StateRef>): Map<StateRef, ContractState?> diff --git a/docs/build/html/api/core.node.subsystems/-wallet-service/linear-heads-of-type_.html b/docs/build/html/api/core.node.subsystems/-wallet-service/linear-heads-of-type_.html index 1af12bbe1b..c8e287cfbe 100644 --- a/docs/build/html/api/core.node.subsystems/-wallet-service/linear-heads-of-type_.html +++ b/docs/build/html/api/core.node.subsystems/-wallet-service/linear-heads-of-type_.html @@ -7,8 +7,8 @@ core.node.subsystems / WalletService / linearHeadsOfType_

linearHeadsOfType_

- -open fun <T : LinearState> linearHeadsOfType_(stateType: Class<T>): Map<SecureHash, StateAndRef<T>>
+ +open fun <T : LinearState> linearHeadsOfType_(stateType: Class<T>): Map<SecureHash, StateAndRef<T>>

Returns the linearHeads only when the type of the state would be considered an instanceof the given type.



diff --git a/docs/build/html/api/core.node.subsystems/-wallet-service/linear-heads.html b/docs/build/html/api/core.node.subsystems/-wallet-service/linear-heads.html index 8024fd3d28..a0d1e89bb5 100644 --- a/docs/build/html/api/core.node.subsystems/-wallet-service/linear-heads.html +++ b/docs/build/html/api/core.node.subsystems/-wallet-service/linear-heads.html @@ -7,7 +7,7 @@ core.node.subsystems / WalletService / linearHeads

linearHeads

- + abstract val linearHeads: Map<SecureHash, StateAndRef<LinearState>>

Returns a snapshot of the heads of LinearStates


diff --git a/docs/build/html/api/core.node.subsystems/-wallet-service/notify-all.html b/docs/build/html/api/core.node.subsystems/-wallet-service/notify-all.html index 271e5f2bef..e269d1f735 100644 --- a/docs/build/html/api/core.node.subsystems/-wallet-service/notify-all.html +++ b/docs/build/html/api/core.node.subsystems/-wallet-service/notify-all.html @@ -7,8 +7,8 @@ core.node.subsystems / WalletService / notifyAll

notifyAll

- -abstract fun notifyAll(txns: Iterable<WireTransaction>): Wallet
+ +abstract fun notifyAll(txns: Iterable<WireTransaction>): Wallet

Possibly update the wallet by marking as spent states that these transactions consume, and adding any relevant new states that they create. You should only insert transactions that have been successfully verified here

Returns the new wallet that resulted from applying the transactions (note: it may quickly become out of date).

diff --git a/docs/build/html/api/core.node.subsystems/-wallet-service/notify.html b/docs/build/html/api/core.node.subsystems/-wallet-service/notify.html index 3069039cdf..dad1194de2 100644 --- a/docs/build/html/api/core.node.subsystems/-wallet-service/notify.html +++ b/docs/build/html/api/core.node.subsystems/-wallet-service/notify.html @@ -7,8 +7,8 @@ core.node.subsystems / WalletService / notify

notify

- -open fun notify(tx: WireTransaction): Wallet
+ +open fun notify(tx: WireTransaction): Wallet

Same as notifyAll but with a single transaction.



diff --git a/docs/build/html/api/core.node.subsystems/-wallet-service/states-for-refs.html b/docs/build/html/api/core.node.subsystems/-wallet-service/states-for-refs.html index bf81c71da7..1036821baf 100644 --- a/docs/build/html/api/core.node.subsystems/-wallet-service/states-for-refs.html +++ b/docs/build/html/api/core.node.subsystems/-wallet-service/states-for-refs.html @@ -7,8 +7,8 @@ core.node.subsystems / WalletService / statesForRefs

statesForRefs

- -open fun statesForRefs(refs: List<StateRef>): Map<StateRef, ContractState?>
+ +open fun statesForRefs(refs: List<StateRef>): Map<StateRef, ContractState?>


diff --git a/docs/build/html/api/core.node.subsystems/-wallet/cash-balances.html b/docs/build/html/api/core.node.subsystems/-wallet/cash-balances.html index 2f882a10de..6e980cd7a5 100644 --- a/docs/build/html/api/core.node.subsystems/-wallet/cash-balances.html +++ b/docs/build/html/api/core.node.subsystems/-wallet/cash-balances.html @@ -7,7 +7,7 @@ core.node.subsystems / Wallet / cashBalances

cashBalances

- + abstract val cashBalances: Map<Currency, Amount>

Returns a map of how much cash we have in each currency, ignoring details like issuer. Note: currencies for which we have no cash evaluate to null (not present in map), not 0.

diff --git a/docs/build/html/api/core.node.subsystems/-wallet/states-of-type.html b/docs/build/html/api/core.node.subsystems/-wallet/states-of-type.html index d699ba4b37..37e548eb95 100644 --- a/docs/build/html/api/core.node.subsystems/-wallet/states-of-type.html +++ b/docs/build/html/api/core.node.subsystems/-wallet/states-of-type.html @@ -7,7 +7,7 @@ core.node.subsystems / Wallet / statesOfType

statesOfType

- + inline fun <reified T : OwnableState> statesOfType(): List<StateAndRef<T>>


diff --git a/docs/build/html/api/core.node.subsystems/-wallet/states.html b/docs/build/html/api/core.node.subsystems/-wallet/states.html index 4865d27cba..46439d477f 100644 --- a/docs/build/html/api/core.node.subsystems/-wallet/states.html +++ b/docs/build/html/api/core.node.subsystems/-wallet/states.html @@ -7,7 +7,7 @@ core.node.subsystems / Wallet / states

states

- + abstract val states: List<StateAndRef<ContractState>>


diff --git a/docs/build/html/api/core.node.subsystems/linear-heads-of-type.html b/docs/build/html/api/core.node.subsystems/linear-heads-of-type.html index ea2d8e467b..0d154c5a75 100644 --- a/docs/build/html/api/core.node.subsystems/linear-heads-of-type.html +++ b/docs/build/html/api/core.node.subsystems/linear-heads-of-type.html @@ -7,7 +7,7 @@ core.node.subsystems / linearHeadsOfType

linearHeadsOfType

- + inline fun <reified T : LinearState> WalletService.linearHeadsOfType(): <ERROR CLASS>


diff --git a/docs/build/html/api/core.node/-abstract-node/-init-.html b/docs/build/html/api/core.node/-abstract-node/-init-.html index 42557660c1..9024717e51 100644 --- a/docs/build/html/api/core.node/-abstract-node/-init-.html +++ b/docs/build/html/api/core.node/-abstract-node/-init-.html @@ -7,7 +7,7 @@ core.node / AbstractNode / <init>

<init>

-AbstractNode(dir: Path, configuration: NodeConfiguration, initialNetworkMapAddress: NodeInfo?, advertisedServices: Set<ServiceType>, platformClock: Clock)
+AbstractNode(dir: Path, configuration: NodeConfiguration, initialNetworkMapAddress: NodeInfo?, advertisedServices: Set<ServiceType>, platformClock: Clock)

A base node implementation that can be customised either for production (with real implementations that do real I/O), or a mock implementation suitable for unit test environments.


diff --git a/docs/build/html/api/core.node/-abstract-node/-p-r-i-v-a-t-e_-k-e-y_-f-i-l-e_-n-a-m-e.html b/docs/build/html/api/core.node/-abstract-node/-p-r-i-v-a-t-e_-k-e-y_-f-i-l-e_-n-a-m-e.html index bd8f3475a8..287d331b81 100644 --- a/docs/build/html/api/core.node/-abstract-node/-p-r-i-v-a-t-e_-k-e-y_-f-i-l-e_-n-a-m-e.html +++ b/docs/build/html/api/core.node/-abstract-node/-p-r-i-v-a-t-e_-k-e-y_-f-i-l-e_-n-a-m-e.html @@ -7,7 +7,7 @@ core.node / AbstractNode / PRIVATE_KEY_FILE_NAME

PRIVATE_KEY_FILE_NAME

- + val PRIVATE_KEY_FILE_NAME: String


diff --git a/docs/build/html/api/core.node/-abstract-node/-p-u-b-l-i-c_-i-d-e-n-t-i-t-y_-f-i-l-e_-n-a-m-e.html b/docs/build/html/api/core.node/-abstract-node/-p-u-b-l-i-c_-i-d-e-n-t-i-t-y_-f-i-l-e_-n-a-m-e.html index 10f31803f8..7db4814daf 100644 --- a/docs/build/html/api/core.node/-abstract-node/-p-u-b-l-i-c_-i-d-e-n-t-i-t-y_-f-i-l-e_-n-a-m-e.html +++ b/docs/build/html/api/core.node/-abstract-node/-p-u-b-l-i-c_-i-d-e-n-t-i-t-y_-f-i-l-e_-n-a-m-e.html @@ -7,7 +7,7 @@ core.node / AbstractNode / PUBLIC_IDENTITY_FILE_NAME

PUBLIC_IDENTITY_FILE_NAME

- + val PUBLIC_IDENTITY_FILE_NAME: String


diff --git a/docs/build/html/api/core.node/-abstract-node/_services-that-accept-uploads.html b/docs/build/html/api/core.node/-abstract-node/_services-that-accept-uploads.html index fc519de7f8..aacd303269 100644 --- a/docs/build/html/api/core.node/-abstract-node/_services-that-accept-uploads.html +++ b/docs/build/html/api/core.node/-abstract-node/_services-that-accept-uploads.html @@ -7,7 +7,7 @@ core.node / AbstractNode / _servicesThatAcceptUploads

_servicesThatAcceptUploads

- + protected val _servicesThatAcceptUploads: ArrayList<AcceptsFileUpload>


diff --git a/docs/build/html/api/core.node/-abstract-node/advertised-services.html b/docs/build/html/api/core.node/-abstract-node/advertised-services.html index 6f356071da..b63cdd3b75 100644 --- a/docs/build/html/api/core.node/-abstract-node/advertised-services.html +++ b/docs/build/html/api/core.node/-abstract-node/advertised-services.html @@ -7,7 +7,7 @@ core.node / AbstractNode / advertisedServices

advertisedServices

- + val advertisedServices: Set<ServiceType>


diff --git a/docs/build/html/api/core.node/-abstract-node/api.html b/docs/build/html/api/core.node/-abstract-node/api.html index 60a91f39f6..2fdf8e3166 100644 --- a/docs/build/html/api/core.node/-abstract-node/api.html +++ b/docs/build/html/api/core.node/-abstract-node/api.html @@ -7,7 +7,7 @@ core.node / AbstractNode / api

api

- + lateinit var api: APIServer


diff --git a/docs/build/html/api/core.node/-abstract-node/configuration.html b/docs/build/html/api/core.node/-abstract-node/configuration.html index 769502f9b9..55426c9031 100644 --- a/docs/build/html/api/core.node/-abstract-node/configuration.html +++ b/docs/build/html/api/core.node/-abstract-node/configuration.html @@ -7,7 +7,7 @@ core.node / AbstractNode / configuration

configuration

- + val configuration: NodeConfiguration


diff --git a/docs/build/html/api/core.node/-abstract-node/construct-storage-service.html b/docs/build/html/api/core.node/-abstract-node/construct-storage-service.html index d2c4cff596..58893723f0 100644 --- a/docs/build/html/api/core.node/-abstract-node/construct-storage-service.html +++ b/docs/build/html/api/core.node/-abstract-node/construct-storage-service.html @@ -7,8 +7,8 @@ core.node / AbstractNode / constructStorageService

constructStorageService

- -protected open fun constructStorageService(attachments: NodeAttachmentService, checkpointStorage: CheckpointStorage, keypair: KeyPair, identity: Party): StorageServiceImpl
+ +protected open fun constructStorageService(attachments: NodeAttachmentService, checkpointStorage: CheckpointStorage, keypair: KeyPair, identity: Party): StorageServiceImpl


diff --git a/docs/build/html/api/core.node/-abstract-node/dir.html b/docs/build/html/api/core.node/-abstract-node/dir.html index 418f2aaf09..e08aaaf632 100644 --- a/docs/build/html/api/core.node/-abstract-node/dir.html +++ b/docs/build/html/api/core.node/-abstract-node/dir.html @@ -7,7 +7,7 @@ core.node / AbstractNode / dir

dir

- + val dir: Path


diff --git a/docs/build/html/api/core.node/-abstract-node/find-my-location.html b/docs/build/html/api/core.node/-abstract-node/find-my-location.html index 898e6fd912..13c92b64e0 100644 --- a/docs/build/html/api/core.node/-abstract-node/find-my-location.html +++ b/docs/build/html/api/core.node/-abstract-node/find-my-location.html @@ -7,7 +7,7 @@ core.node / AbstractNode / findMyLocation

findMyLocation

- + protected open fun findMyLocation(): PhysicalLocation?


diff --git a/docs/build/html/api/core.node/-abstract-node/identity.html b/docs/build/html/api/core.node/-abstract-node/identity.html index 686c3fa385..f64530309d 100644 --- a/docs/build/html/api/core.node/-abstract-node/identity.html +++ b/docs/build/html/api/core.node/-abstract-node/identity.html @@ -7,7 +7,7 @@ core.node / AbstractNode / identity

identity

- + lateinit var identity: IdentityService


diff --git a/docs/build/html/api/core.node/-abstract-node/in-node-network-map-service.html b/docs/build/html/api/core.node/-abstract-node/in-node-network-map-service.html index a241257d39..a529693a90 100644 --- a/docs/build/html/api/core.node/-abstract-node/in-node-network-map-service.html +++ b/docs/build/html/api/core.node/-abstract-node/in-node-network-map-service.html @@ -7,7 +7,7 @@ core.node / AbstractNode / inNodeNetworkMapService

inNodeNetworkMapService

- + var inNodeNetworkMapService: NetworkMapService?


diff --git a/docs/build/html/api/core.node/-abstract-node/in-node-timestamping-service.html b/docs/build/html/api/core.node/-abstract-node/in-node-timestamping-service.html index 717307dd29..5d010e8102 100644 --- a/docs/build/html/api/core.node/-abstract-node/in-node-timestamping-service.html +++ b/docs/build/html/api/core.node/-abstract-node/in-node-timestamping-service.html @@ -7,7 +7,7 @@ core.node / AbstractNode / inNodeTimestampingService

inNodeTimestampingService

- + var inNodeTimestampingService: NodeTimestamperService?


diff --git a/docs/build/html/api/core.node/-abstract-node/index.html b/docs/build/html/api/core.node/-abstract-node/index.html index a889f8f8fe..23b23e5b52 100644 --- a/docs/build/html/api/core.node/-abstract-node/index.html +++ b/docs/build/html/api/core.node/-abstract-node/index.html @@ -19,7 +19,7 @@ I/O), or a mock implementation suitable for unit test environments.

<init> -AbstractNode(dir: Path, configuration: NodeConfiguration, initialNetworkMapAddress: NodeInfo?, advertisedServices: Set<ServiceType>, platformClock: Clock)

A base node implementation that can be customised either for production (with real implementations that do real +AbstractNode(dir: Path, configuration: NodeConfiguration, initialNetworkMapAddress: NodeInfo?, advertisedServices: Set<ServiceType>, platformClock: Clock)

A base node implementation that can be customised either for production (with real implementations that do real I/O), or a mock implementation suitable for unit test environments.

@@ -176,7 +176,7 @@ I/O), or a mock implementation suitable for unit test environments.

constructStorageService -open fun constructStorageService(attachments: NodeAttachmentService, checkpointStorage: CheckpointStorage, keypair: KeyPair, identity: Party): StorageServiceImpl +open fun constructStorageService(attachments: NodeAttachmentService, checkpointStorage: CheckpointStorage, keypair: KeyPair, identity: Party): StorageServiceImpl @@ -188,7 +188,7 @@ I/O), or a mock implementation suitable for unit test environments.

initialiseStorageService -open fun initialiseStorageService(dir: Path): StorageService +open fun initialiseStorageService(dir: Path): StorageService diff --git a/docs/build/html/api/core.node/-abstract-node/info.html b/docs/build/html/api/core.node/-abstract-node/info.html index f05c53b167..e05773189a 100644 --- a/docs/build/html/api/core.node/-abstract-node/info.html +++ b/docs/build/html/api/core.node/-abstract-node/info.html @@ -7,7 +7,7 @@ core.node / AbstractNode / info

info

- + val info: NodeInfo


diff --git a/docs/build/html/api/core.node/-abstract-node/initial-network-map-address.html b/docs/build/html/api/core.node/-abstract-node/initial-network-map-address.html index f94843b863..40a119c053 100644 --- a/docs/build/html/api/core.node/-abstract-node/initial-network-map-address.html +++ b/docs/build/html/api/core.node/-abstract-node/initial-network-map-address.html @@ -7,7 +7,7 @@ core.node / AbstractNode / initialNetworkMapAddress

initialNetworkMapAddress

- + val initialNetworkMapAddress: NodeInfo?


diff --git a/docs/build/html/api/core.node/-abstract-node/initialise-storage-service.html b/docs/build/html/api/core.node/-abstract-node/initialise-storage-service.html index 53eda34149..8acf31e677 100644 --- a/docs/build/html/api/core.node/-abstract-node/initialise-storage-service.html +++ b/docs/build/html/api/core.node/-abstract-node/initialise-storage-service.html @@ -7,8 +7,8 @@ core.node / AbstractNode / initialiseStorageService

initialiseStorageService

- -protected open fun initialiseStorageService(dir: Path): StorageService
+ +protected open fun initialiseStorageService(dir: Path): StorageService


diff --git a/docs/build/html/api/core.node/-abstract-node/interest-rates-service.html b/docs/build/html/api/core.node/-abstract-node/interest-rates-service.html index 09980c470f..bbecb5e3c4 100644 --- a/docs/build/html/api/core.node/-abstract-node/interest-rates-service.html +++ b/docs/build/html/api/core.node/-abstract-node/interest-rates-service.html @@ -7,7 +7,7 @@ core.node / AbstractNode / interestRatesService

interestRatesService

- + lateinit var interestRatesService: Service


diff --git a/docs/build/html/api/core.node/-abstract-node/key-management.html b/docs/build/html/api/core.node/-abstract-node/key-management.html index 0875fce5cd..8e7f06df97 100644 --- a/docs/build/html/api/core.node/-abstract-node/key-management.html +++ b/docs/build/html/api/core.node/-abstract-node/key-management.html @@ -7,7 +7,7 @@ core.node / AbstractNode / keyManagement

keyManagement

- + lateinit var keyManagement: E2ETestKeyManagementService


diff --git a/docs/build/html/api/core.node/-abstract-node/log.html b/docs/build/html/api/core.node/-abstract-node/log.html index dfda462656..49ef83722b 100644 --- a/docs/build/html/api/core.node/-abstract-node/log.html +++ b/docs/build/html/api/core.node/-abstract-node/log.html @@ -7,7 +7,7 @@ core.node / AbstractNode / log

log

- + protected abstract val log: <ERROR CLASS>


diff --git a/docs/build/html/api/core.node/-abstract-node/make-identity-service.html b/docs/build/html/api/core.node/-abstract-node/make-identity-service.html index dc6436503c..0145f520b0 100644 --- a/docs/build/html/api/core.node/-abstract-node/make-identity-service.html +++ b/docs/build/html/api/core.node/-abstract-node/make-identity-service.html @@ -7,7 +7,7 @@ core.node / AbstractNode / makeIdentityService

makeIdentityService

- + protected open fun makeIdentityService(): IdentityService


diff --git a/docs/build/html/api/core.node/-abstract-node/make-interest-rates-oracle-service.html b/docs/build/html/api/core.node/-abstract-node/make-interest-rates-oracle-service.html index 116e02f95e..b412f1e6fb 100644 --- a/docs/build/html/api/core.node/-abstract-node/make-interest-rates-oracle-service.html +++ b/docs/build/html/api/core.node/-abstract-node/make-interest-rates-oracle-service.html @@ -7,7 +7,7 @@ core.node / AbstractNode / makeInterestRatesOracleService

makeInterestRatesOracleService

- + protected open fun makeInterestRatesOracleService(): Unit


diff --git a/docs/build/html/api/core.node/-abstract-node/make-messaging-service.html b/docs/build/html/api/core.node/-abstract-node/make-messaging-service.html index 462ad95146..c7a6e3c5a9 100644 --- a/docs/build/html/api/core.node/-abstract-node/make-messaging-service.html +++ b/docs/build/html/api/core.node/-abstract-node/make-messaging-service.html @@ -7,7 +7,7 @@ core.node / AbstractNode / makeMessagingService

makeMessagingService

- + protected abstract fun makeMessagingService(): MessagingService


diff --git a/docs/build/html/api/core.node/-abstract-node/make-network-map-service.html b/docs/build/html/api/core.node/-abstract-node/make-network-map-service.html index 53be475127..381d87f625 100644 --- a/docs/build/html/api/core.node/-abstract-node/make-network-map-service.html +++ b/docs/build/html/api/core.node/-abstract-node/make-network-map-service.html @@ -7,7 +7,7 @@ core.node / AbstractNode / makeNetworkMapService

makeNetworkMapService

- + protected open fun makeNetworkMapService(): Unit


diff --git a/docs/build/html/api/core.node/-abstract-node/make-timestamping-service.html b/docs/build/html/api/core.node/-abstract-node/make-timestamping-service.html index 9653e98668..9c82f529f9 100644 --- a/docs/build/html/api/core.node/-abstract-node/make-timestamping-service.html +++ b/docs/build/html/api/core.node/-abstract-node/make-timestamping-service.html @@ -7,7 +7,7 @@ core.node / AbstractNode / makeTimestampingService

makeTimestampingService

- + protected open fun makeTimestampingService(): Unit


diff --git a/docs/build/html/api/core.node/-abstract-node/net.html b/docs/build/html/api/core.node/-abstract-node/net.html index 1a16b40ba0..b99bd5913e 100644 --- a/docs/build/html/api/core.node/-abstract-node/net.html +++ b/docs/build/html/api/core.node/-abstract-node/net.html @@ -7,7 +7,7 @@ core.node / AbstractNode / net

net

- + lateinit var net: MessagingService


diff --git a/docs/build/html/api/core.node/-abstract-node/network-map-seq.html b/docs/build/html/api/core.node/-abstract-node/network-map-seq.html index 2a5ffc3f39..13e57786aa 100644 --- a/docs/build/html/api/core.node/-abstract-node/network-map-seq.html +++ b/docs/build/html/api/core.node/-abstract-node/network-map-seq.html @@ -7,7 +7,7 @@ core.node / AbstractNode / networkMapSeq

networkMapSeq

- + var networkMapSeq: Long

Sequence number of changes sent to the network map service, when registering/de-registering this node


diff --git a/docs/build/html/api/core.node/-abstract-node/network-map-service-call-timeout.html b/docs/build/html/api/core.node/-abstract-node/network-map-service-call-timeout.html index 2d03f73cb2..a88d4bc3fc 100644 --- a/docs/build/html/api/core.node/-abstract-node/network-map-service-call-timeout.html +++ b/docs/build/html/api/core.node/-abstract-node/network-map-service-call-timeout.html @@ -7,7 +7,7 @@ core.node / AbstractNode / networkMapServiceCallTimeout

networkMapServiceCallTimeout

- + val networkMapServiceCallTimeout: Duration


diff --git a/docs/build/html/api/core.node/-abstract-node/platform-clock.html b/docs/build/html/api/core.node/-abstract-node/platform-clock.html index 23f139cd96..eb234e8e29 100644 --- a/docs/build/html/api/core.node/-abstract-node/platform-clock.html +++ b/docs/build/html/api/core.node/-abstract-node/platform-clock.html @@ -7,7 +7,7 @@ core.node / AbstractNode / platformClock

platformClock

- + val platformClock: Clock


diff --git a/docs/build/html/api/core.node/-abstract-node/server-thread.html b/docs/build/html/api/core.node/-abstract-node/server-thread.html index 2741771fe9..b16f483aea 100644 --- a/docs/build/html/api/core.node/-abstract-node/server-thread.html +++ b/docs/build/html/api/core.node/-abstract-node/server-thread.html @@ -7,7 +7,7 @@ core.node / AbstractNode / serverThread

serverThread

- + protected abstract val serverThread: AffinityExecutor


diff --git a/docs/build/html/api/core.node/-abstract-node/services-that-accept-uploads.html b/docs/build/html/api/core.node/-abstract-node/services-that-accept-uploads.html index 8de63aff7f..5186e6377c 100644 --- a/docs/build/html/api/core.node/-abstract-node/services-that-accept-uploads.html +++ b/docs/build/html/api/core.node/-abstract-node/services-that-accept-uploads.html @@ -7,7 +7,7 @@ core.node / AbstractNode / servicesThatAcceptUploads

servicesThatAcceptUploads

- + val servicesThatAcceptUploads: List<AcceptsFileUpload>


diff --git a/docs/build/html/api/core.node/-abstract-node/services.html b/docs/build/html/api/core.node/-abstract-node/services.html index 941bf394c0..9c09e57715 100644 --- a/docs/build/html/api/core.node/-abstract-node/services.html +++ b/docs/build/html/api/core.node/-abstract-node/services.html @@ -7,7 +7,7 @@ core.node / AbstractNode / services

services

- + val services: ServiceHub


diff --git a/docs/build/html/api/core.node/-abstract-node/smm.html b/docs/build/html/api/core.node/-abstract-node/smm.html index e0b11eeb35..56d3a8585d 100644 --- a/docs/build/html/api/core.node/-abstract-node/smm.html +++ b/docs/build/html/api/core.node/-abstract-node/smm.html @@ -7,7 +7,7 @@ core.node / AbstractNode / smm

smm

- + lateinit var smm: StateMachineManager


diff --git a/docs/build/html/api/core.node/-abstract-node/start-messaging-service.html b/docs/build/html/api/core.node/-abstract-node/start-messaging-service.html index 7060446768..6072392773 100644 --- a/docs/build/html/api/core.node/-abstract-node/start-messaging-service.html +++ b/docs/build/html/api/core.node/-abstract-node/start-messaging-service.html @@ -7,7 +7,7 @@ core.node / AbstractNode / startMessagingService

startMessagingService

- + protected abstract fun startMessagingService(): Unit


diff --git a/docs/build/html/api/core.node/-abstract-node/start.html b/docs/build/html/api/core.node/-abstract-node/start.html index 55ab8d4bf2..14ba8bceb1 100644 --- a/docs/build/html/api/core.node/-abstract-node/start.html +++ b/docs/build/html/api/core.node/-abstract-node/start.html @@ -7,7 +7,7 @@ core.node / AbstractNode / start

start

- + open fun start(): AbstractNode


diff --git a/docs/build/html/api/core.node/-abstract-node/stop.html b/docs/build/html/api/core.node/-abstract-node/stop.html index 56c931528c..38c39218b2 100644 --- a/docs/build/html/api/core.node/-abstract-node/stop.html +++ b/docs/build/html/api/core.node/-abstract-node/stop.html @@ -7,7 +7,7 @@ core.node / AbstractNode / stop

stop

- + open fun stop(): Unit


diff --git a/docs/build/html/api/core.node/-abstract-node/storage.html b/docs/build/html/api/core.node/-abstract-node/storage.html index 317ee5f183..dbd164908e 100644 --- a/docs/build/html/api/core.node/-abstract-node/storage.html +++ b/docs/build/html/api/core.node/-abstract-node/storage.html @@ -7,7 +7,7 @@ core.node / AbstractNode / storage

storage

- + lateinit var storage: StorageService


diff --git a/docs/build/html/api/core.node/-abstract-node/wallet.html b/docs/build/html/api/core.node/-abstract-node/wallet.html index ec058966f0..6c14a6cdab 100644 --- a/docs/build/html/api/core.node/-abstract-node/wallet.html +++ b/docs/build/html/api/core.node/-abstract-node/wallet.html @@ -7,7 +7,7 @@ core.node / AbstractNode / wallet

wallet

- + lateinit var wallet: WalletService


diff --git a/docs/build/html/api/core.node/-accepts-file-upload/acceptable-file-extensions.html b/docs/build/html/api/core.node/-accepts-file-upload/acceptable-file-extensions.html index baa94957fe..daa88f7d33 100644 --- a/docs/build/html/api/core.node/-accepts-file-upload/acceptable-file-extensions.html +++ b/docs/build/html/api/core.node/-accepts-file-upload/acceptable-file-extensions.html @@ -7,7 +7,7 @@ core.node / AcceptsFileUpload / acceptableFileExtensions

acceptableFileExtensions

- + abstract val acceptableFileExtensions: List<String>

What file extensions are acceptable for the file to be handed to upload()


diff --git a/docs/build/html/api/core.node/-accepts-file-upload/data-type-prefix.html b/docs/build/html/api/core.node/-accepts-file-upload/data-type-prefix.html index aafb037fd7..2a2a3ecad4 100644 --- a/docs/build/html/api/core.node/-accepts-file-upload/data-type-prefix.html +++ b/docs/build/html/api/core.node/-accepts-file-upload/data-type-prefix.html @@ -7,7 +7,7 @@ core.node / AcceptsFileUpload / dataTypePrefix

dataTypePrefix

- + abstract val dataTypePrefix: String

A string that prefixes the URLs, e.g. "attachments" or "interest-rates". Should be OK for URLs.


diff --git a/docs/build/html/api/core.node/-accepts-file-upload/index.html b/docs/build/html/api/core.node/-accepts-file-upload/index.html index 9a435410cf..9475a1be74 100644 --- a/docs/build/html/api/core.node/-accepts-file-upload/index.html +++ b/docs/build/html/api/core.node/-accepts-file-upload/index.html @@ -40,7 +40,7 @@ upload -abstract fun upload(data: InputStream): String

Accepts the data in the given input stream, and returns some sort of useful return message that will be sent +abstract fun upload(data: InputStream): String

Accepts the data in the given input stream, and returns some sort of useful return message that will be sent back to the user in the response.

diff --git a/docs/build/html/api/core.node/-accepts-file-upload/upload.html b/docs/build/html/api/core.node/-accepts-file-upload/upload.html index f776240a65..cad874e884 100644 --- a/docs/build/html/api/core.node/-accepts-file-upload/upload.html +++ b/docs/build/html/api/core.node/-accepts-file-upload/upload.html @@ -7,8 +7,8 @@ core.node / AcceptsFileUpload / upload

upload

- -abstract fun upload(data: InputStream): String
+ +abstract fun upload(data: InputStream): String

Accepts the data in the given input stream, and returns some sort of useful return message that will be sent back to the user in the response.


diff --git a/docs/build/html/api/core.node/-configuration-exception/-init-.html b/docs/build/html/api/core.node/-configuration-exception/-init-.html index 2462adf97e..8c8890ce0e 100644 --- a/docs/build/html/api/core.node/-configuration-exception/-init-.html +++ b/docs/build/html/api/core.node/-configuration-exception/-init-.html @@ -7,7 +7,7 @@ core.node / ConfigurationException / <init>

<init>

-ConfigurationException(message: String)
+ConfigurationException(message: String)


diff --git a/docs/build/html/api/core.node/-configuration-exception/index.html b/docs/build/html/api/core.node/-configuration-exception/index.html index da5f0659d3..2c55e86876 100644 --- a/docs/build/html/api/core.node/-configuration-exception/index.html +++ b/docs/build/html/api/core.node/-configuration-exception/index.html @@ -17,7 +17,7 @@ <init> -ConfigurationException(message: String) +ConfigurationException(message: String) diff --git a/docs/build/html/api/core.node/-node-configuration-from-config/-init-.html b/docs/build/html/api/core.node/-node-configuration-from-config/-init-.html index 0ce0342869..a63919919a 100644 --- a/docs/build/html/api/core.node/-node-configuration-from-config/-init-.html +++ b/docs/build/html/api/core.node/-node-configuration-from-config/-init-.html @@ -7,7 +7,7 @@ core.node / NodeConfigurationFromConfig / <init>

<init>

-NodeConfigurationFromConfig(config: <ERROR CLASS> = ConfigFactory.load())
+NodeConfigurationFromConfig(config: <ERROR CLASS> = ConfigFactory.load())


diff --git a/docs/build/html/api/core.node/-node-configuration-from-config/config.html b/docs/build/html/api/core.node/-node-configuration-from-config/config.html index afef8e3ba8..70a9225a29 100644 --- a/docs/build/html/api/core.node/-node-configuration-from-config/config.html +++ b/docs/build/html/api/core.node/-node-configuration-from-config/config.html @@ -7,7 +7,7 @@ core.node / NodeConfigurationFromConfig / config

config

- + val config: <ERROR CLASS>


diff --git a/docs/build/html/api/core.node/-node-configuration-from-config/export-j-m-xto.html b/docs/build/html/api/core.node/-node-configuration-from-config/export-j-m-xto.html index dbe0874cec..5e865e2002 100644 --- a/docs/build/html/api/core.node/-node-configuration-from-config/export-j-m-xto.html +++ b/docs/build/html/api/core.node/-node-configuration-from-config/export-j-m-xto.html @@ -7,7 +7,7 @@ core.node / NodeConfigurationFromConfig / exportJMXto

exportJMXto

- + val exportJMXto: String
Overrides NodeConfiguration.exportJMXto

diff --git a/docs/build/html/api/core.node/-node-configuration-from-config/index.html b/docs/build/html/api/core.node/-node-configuration-from-config/index.html index f6e0e2afb8..2b24c5d872 100644 --- a/docs/build/html/api/core.node/-node-configuration-from-config/index.html +++ b/docs/build/html/api/core.node/-node-configuration-from-config/index.html @@ -17,7 +17,7 @@ <init> -NodeConfigurationFromConfig(config: <ERROR CLASS> = ConfigFactory.load()) +NodeConfigurationFromConfig(config: <ERROR CLASS> = ConfigFactory.load()) diff --git a/docs/build/html/api/core.node/-node-configuration-from-config/my-legal-name.html b/docs/build/html/api/core.node/-node-configuration-from-config/my-legal-name.html index 7fb8dba49b..9807a8e675 100644 --- a/docs/build/html/api/core.node/-node-configuration-from-config/my-legal-name.html +++ b/docs/build/html/api/core.node/-node-configuration-from-config/my-legal-name.html @@ -7,7 +7,7 @@ core.node / NodeConfigurationFromConfig / myLegalName

myLegalName

- + val myLegalName: String
Overrides NodeConfiguration.myLegalName

diff --git a/docs/build/html/api/core.node/-node-configuration-from-config/nearest-city.html b/docs/build/html/api/core.node/-node-configuration-from-config/nearest-city.html index a8c2f549c4..07a45e600e 100644 --- a/docs/build/html/api/core.node/-node-configuration-from-config/nearest-city.html +++ b/docs/build/html/api/core.node/-node-configuration-from-config/nearest-city.html @@ -7,7 +7,7 @@ core.node / NodeConfigurationFromConfig / nearestCity

nearestCity

- + val nearestCity: String
Overrides NodeConfiguration.nearestCity

diff --git a/docs/build/html/api/core.node/-node-configuration/export-j-m-xto.html b/docs/build/html/api/core.node/-node-configuration/export-j-m-xto.html index 9b40116068..986e147573 100644 --- a/docs/build/html/api/core.node/-node-configuration/export-j-m-xto.html +++ b/docs/build/html/api/core.node/-node-configuration/export-j-m-xto.html @@ -7,7 +7,7 @@ core.node / NodeConfiguration / exportJMXto

exportJMXto

- + abstract val exportJMXto: String


diff --git a/docs/build/html/api/core.node/-node-configuration/my-legal-name.html b/docs/build/html/api/core.node/-node-configuration/my-legal-name.html index 3c22314914..21db7bc01e 100644 --- a/docs/build/html/api/core.node/-node-configuration/my-legal-name.html +++ b/docs/build/html/api/core.node/-node-configuration/my-legal-name.html @@ -7,7 +7,7 @@ core.node / NodeConfiguration / myLegalName

myLegalName

- + abstract val myLegalName: String


diff --git a/docs/build/html/api/core.node/-node-configuration/nearest-city.html b/docs/build/html/api/core.node/-node-configuration/nearest-city.html index 1f56299094..60b896270d 100644 --- a/docs/build/html/api/core.node/-node-configuration/nearest-city.html +++ b/docs/build/html/api/core.node/-node-configuration/nearest-city.html @@ -7,7 +7,7 @@ core.node / NodeConfiguration / nearestCity

nearestCity

- + abstract val nearestCity: String


diff --git a/docs/build/html/api/core.node/-node/-d-e-f-a-u-l-t_-p-o-r-t.html b/docs/build/html/api/core.node/-node/-d-e-f-a-u-l-t_-p-o-r-t.html index 7c366d0e50..1d7cc9ece2 100644 --- a/docs/build/html/api/core.node/-node/-d-e-f-a-u-l-t_-p-o-r-t.html +++ b/docs/build/html/api/core.node/-node/-d-e-f-a-u-l-t_-p-o-r-t.html @@ -7,7 +7,7 @@ core.node / Node / DEFAULT_PORT

DEFAULT_PORT

- + val DEFAULT_PORT: Int

The port that is used by default if none is specified. As you know, 31337 is the most elite number.


diff --git a/docs/build/html/api/core.node/-node/-init-.html b/docs/build/html/api/core.node/-node/-init-.html index 9984c17773..e296e244c3 100644 --- a/docs/build/html/api/core.node/-node/-init-.html +++ b/docs/build/html/api/core.node/-node/-init-.html @@ -7,7 +7,7 @@ core.node / Node / <init>

<init>

-Node(dir: Path, p2pAddr: <ERROR CLASS>, configuration: NodeConfiguration, networkMapAddress: NodeInfo?, advertisedServices: Set<ServiceType>, clock: Clock = Clock.systemUTC())
+Node(dir: Path, p2pAddr: <ERROR CLASS>, configuration: NodeConfiguration, networkMapAddress: NodeInfo?, advertisedServices: Set<ServiceType>, clock: Clock = Clock.systemUTC())

A Node manages a standalone server that takes part in the P2P network. It creates the services found in ServiceHub, loads important data off disk and starts listening for connections.

Parameters

diff --git a/docs/build/html/api/core.node/-node/index.html b/docs/build/html/api/core.node/-node/index.html index 6bc01d4570..9253c59a30 100644 --- a/docs/build/html/api/core.node/-node/index.html +++ b/docs/build/html/api/core.node/-node/index.html @@ -40,7 +40,7 @@ but nodes are not required to advertise services they run (hence subset).
<init> -Node(dir: Path, p2pAddr: <ERROR CLASS>, configuration: NodeConfiguration, networkMapAddress: NodeInfo?, advertisedServices: Set<ServiceType>, clock: Clock = Clock.systemUTC())

A Node manages a standalone server that takes part in the P2P network. It creates the services found in ServiceHub, +Node(dir: Path, p2pAddr: <ERROR CLASS>, configuration: NodeConfiguration, networkMapAddress: NodeInfo?, advertisedServices: Set<ServiceType>, clock: Clock = Clock.systemUTC())

A Node manages a standalone server that takes part in the P2P network. It creates the services found in ServiceHub, loads important data off disk and starts listening for connections.

@@ -243,7 +243,7 @@ loads important data off disk and starts listening for connections.

constructStorageService -open fun constructStorageService(attachments: NodeAttachmentService, checkpointStorage: CheckpointStorage, keypair: KeyPair, identity: Party): StorageServiceImpl +open fun constructStorageService(attachments: NodeAttachmentService, checkpointStorage: CheckpointStorage, keypair: KeyPair, identity: Party): StorageServiceImpl @@ -255,7 +255,7 @@ loads important data off disk and starts listening for connections.

initialiseStorageService -open fun initialiseStorageService(dir: Path): StorageService +open fun initialiseStorageService(dir: Path): StorageService diff --git a/docs/build/html/api/core.node/-node/log.html b/docs/build/html/api/core.node/-node/log.html index f1c28c0a26..81fc54cf29 100644 --- a/docs/build/html/api/core.node/-node/log.html +++ b/docs/build/html/api/core.node/-node/log.html @@ -7,7 +7,7 @@ core.node / Node / log

log

- + protected val log: <ERROR CLASS>
Overrides AbstractNode.log

diff --git a/docs/build/html/api/core.node/-node/make-messaging-service.html b/docs/build/html/api/core.node/-node/make-messaging-service.html index a63c87715f..ce8c38852c 100644 --- a/docs/build/html/api/core.node/-node/make-messaging-service.html +++ b/docs/build/html/api/core.node/-node/make-messaging-service.html @@ -7,7 +7,7 @@ core.node / Node / makeMessagingService

makeMessagingService

- + protected fun makeMessagingService(): MessagingService
Overrides AbstractNode.makeMessagingService

diff --git a/docs/build/html/api/core.node/-node/p2p-addr.html b/docs/build/html/api/core.node/-node/p2p-addr.html index 5eb2fd3213..1e66ed177a 100644 --- a/docs/build/html/api/core.node/-node/p2p-addr.html +++ b/docs/build/html/api/core.node/-node/p2p-addr.html @@ -7,7 +7,7 @@ core.node / Node / p2pAddr

p2pAddr

- + val p2pAddr: <ERROR CLASS>


diff --git a/docs/build/html/api/core.node/-node/server-thread.html b/docs/build/html/api/core.node/-node/server-thread.html index fd896b070d..ee22a188d1 100644 --- a/docs/build/html/api/core.node/-node/server-thread.html +++ b/docs/build/html/api/core.node/-node/server-thread.html @@ -7,7 +7,7 @@ core.node / Node / serverThread

serverThread

- + protected val serverThread: ServiceAffinityExecutor
Overrides AbstractNode.serverThread

diff --git a/docs/build/html/api/core.node/-node/start-messaging-service.html b/docs/build/html/api/core.node/-node/start-messaging-service.html index 5de4a813f2..8c0695ad58 100644 --- a/docs/build/html/api/core.node/-node/start-messaging-service.html +++ b/docs/build/html/api/core.node/-node/start-messaging-service.html @@ -7,7 +7,7 @@ core.node / Node / startMessagingService

startMessagingService

- + protected fun startMessagingService(): Unit
Overrides AbstractNode.startMessagingService

diff --git a/docs/build/html/api/core.node/-node/start.html b/docs/build/html/api/core.node/-node/start.html index f059695ccc..cb260b7116 100644 --- a/docs/build/html/api/core.node/-node/start.html +++ b/docs/build/html/api/core.node/-node/start.html @@ -7,7 +7,7 @@ core.node / Node / start

start

- + fun start(): Node
Overrides AbstractNode.start

diff --git a/docs/build/html/api/core.node/-node/stop.html b/docs/build/html/api/core.node/-node/stop.html index 82a2e47b51..b39578eafb 100644 --- a/docs/build/html/api/core.node/-node/stop.html +++ b/docs/build/html/api/core.node/-node/stop.html @@ -7,7 +7,7 @@ core.node / Node / stop

stop

- + fun stop(): Unit
Overrides AbstractNode.stop

diff --git a/docs/build/html/api/core.node/-node/web-server.html b/docs/build/html/api/core.node/-node/web-server.html index e108a48ebe..4c5d13991e 100644 --- a/docs/build/html/api/core.node/-node/web-server.html +++ b/docs/build/html/api/core.node/-node/web-server.html @@ -7,7 +7,7 @@ core.node / Node / webServer

webServer

- + lateinit var webServer: <ERROR CLASS>


diff --git a/docs/build/html/api/core.node/get-value.html b/docs/build/html/api/core.node/get-value.html index f409e40ee4..26a0c71cb2 100644 --- a/docs/build/html/api/core.node/get-value.html +++ b/docs/build/html/api/core.node/get-value.html @@ -7,8 +7,8 @@ core.node / getValue

getValue

- -operator fun <ERROR CLASS>.getValue(receiver: NodeConfigurationFromConfig, metadata: KProperty<*>): <ERROR CLASS>
+ +operator fun <ERROR CLASS>.getValue(receiver: NodeConfigurationFromConfig, metadata: KProperty<*>): <ERROR CLASS>


diff --git a/docs/build/html/api/core.node/index.html b/docs/build/html/api/core.node/index.html index bc6bce267e..d1fb89d8c9 100644 --- a/docs/build/html/api/core.node/index.html +++ b/docs/build/html/api/core.node/index.html @@ -113,7 +113,7 @@ functionality and you dont want to hard-code which types in the interface.

getValue -operator fun <ERROR CLASS>.getValue(receiver: NodeConfigurationFromConfig, metadata: KProperty<*>): <ERROR CLASS> +operator fun <ERROR CLASS>.getValue(receiver: NodeConfigurationFromConfig, metadata: KProperty<*>): <ERROR CLASS> diff --git a/docs/build/html/api/core.protocols/-protocol-state-machine/index.html b/docs/build/html/api/core.protocols/-protocol-state-machine/index.html index 9095742cfc..6a8b2abb4a 100644 --- a/docs/build/html/api/core.protocols/-protocol-state-machine/index.html +++ b/docs/build/html/api/core.protocols/-protocol-state-machine/index.html @@ -73,7 +73,7 @@ For any given flow there is only one PSM, even if that protocol invokes subproto prepareForResumeWith -fun prepareForResumeWith(serviceHub: ServiceHub, withObject: Any?, suspendAction: (FiberRequest, SerializedBytes<ProtocolStateMachine<*>>) -> Unit): Unit +fun prepareForResumeWith(serviceHub: ServiceHub, withObject: Any?, suspendAction: (FiberRequest, SerializedBytes<ProtocolStateMachine<*>>) -> Unit): Unit diff --git a/docs/build/html/api/core.protocols/-protocol-state-machine/prepare-for-resume-with.html b/docs/build/html/api/core.protocols/-protocol-state-machine/prepare-for-resume-with.html index 4cc2f2c5cb..b115a64a11 100644 --- a/docs/build/html/api/core.protocols/-protocol-state-machine/prepare-for-resume-with.html +++ b/docs/build/html/api/core.protocols/-protocol-state-machine/prepare-for-resume-with.html @@ -7,8 +7,8 @@ core.protocols / ProtocolStateMachine / prepareForResumeWith

prepareForResumeWith

- -fun prepareForResumeWith(serviceHub: ServiceHub, withObject: Any?, suspendAction: (FiberRequest, SerializedBytes<ProtocolStateMachine<*>>) -> Unit): Unit
+ +fun prepareForResumeWith(serviceHub: ServiceHub, withObject: Any?, suspendAction: (FiberRequest, SerializedBytes<ProtocolStateMachine<*>>) -> Unit): Unit


diff --git a/docs/build/html/api/core.testing/-i-r-s-simulation/-init-.html b/docs/build/html/api/core.testing/-i-r-s-simulation/-init-.html index 24f576813f..35b41f69b2 100644 --- a/docs/build/html/api/core.testing/-i-r-s-simulation/-init-.html +++ b/docs/build/html/api/core.testing/-i-r-s-simulation/-init-.html @@ -7,7 +7,7 @@ core.testing / IRSSimulation / <init>

<init>

-IRSSimulation(runAsync: Boolean, latencyInjector: LatencyCalculator?)
+IRSSimulation(runAsync: Boolean, latencyInjector: LatencyCalculator?)

A simulation in which banks execute interest rate swaps with each other, including the fixing events.



diff --git a/docs/build/html/api/core.testing/-i-r-s-simulation/index.html b/docs/build/html/api/core.testing/-i-r-s-simulation/index.html index 60f358e42a..7af5903782 100644 --- a/docs/build/html/api/core.testing/-i-r-s-simulation/index.html +++ b/docs/build/html/api/core.testing/-i-r-s-simulation/index.html @@ -18,7 +18,7 @@ <init> -IRSSimulation(runAsync: Boolean, latencyInjector: LatencyCalculator?)

A simulation in which banks execute interest rate swaps with each other, including the fixing events.

+IRSSimulation(runAsync: Boolean, latencyInjector: LatencyCalculator?)

A simulation in which banks execute interest rate swaps with each other, including the fixing events.

@@ -164,19 +164,19 @@ in the UI somewhere.

linkConsensus -fun linkConsensus(nodes: Collection<SimulatedNode>, protocol: ProtocolLogic<*>): Unit +fun linkConsensus(nodes: Collection<SimulatedNode>, protocol: ProtocolLogic<*>): Unit linkProtocolProgress -fun linkProtocolProgress(node: SimulatedNode, protocol: ProtocolLogic<*>): Unit +fun linkProtocolProgress(node: SimulatedNode, protocol: ProtocolLogic<*>): Unit startTradingCircle -fun startTradingCircle(tradeBetween: (Int, Int) -> <ERROR CLASS><out <ERROR CLASS>>): Unit

Given a function that returns a future, iterates that function with arguments like (0, 1), (1, 2), (2, 3) etc +fun startTradingCircle(tradeBetween: (Int, Int) -> <ERROR CLASS><out <ERROR CLASS>>): Unit

Given a function that returns a future, iterates that function with arguments like (0, 1), (1, 2), (2, 3) etc each time the returned future completes.

diff --git a/docs/build/html/api/core.testing/-i-r-s-simulation/iterate.html b/docs/build/html/api/core.testing/-i-r-s-simulation/iterate.html index 8ae7e7d1ce..31b5768070 100644 --- a/docs/build/html/api/core.testing/-i-r-s-simulation/iterate.html +++ b/docs/build/html/api/core.testing/-i-r-s-simulation/iterate.html @@ -7,7 +7,7 @@ core.testing / IRSSimulation / iterate

iterate

- + fun iterate(): Unit
Overrides Simulation.iterate

Iterates the simulation by one step.

diff --git a/docs/build/html/api/core.testing/-i-r-s-simulation/om.html b/docs/build/html/api/core.testing/-i-r-s-simulation/om.html index 1959022bc3..882fae7fda 100644 --- a/docs/build/html/api/core.testing/-i-r-s-simulation/om.html +++ b/docs/build/html/api/core.testing/-i-r-s-simulation/om.html @@ -7,7 +7,7 @@ core.testing / IRSSimulation / om

om

- + val om: <ERROR CLASS>


diff --git a/docs/build/html/api/core.testing/-i-r-s-simulation/start.html b/docs/build/html/api/core.testing/-i-r-s-simulation/start.html index 46e3274d0e..b50e211b43 100644 --- a/docs/build/html/api/core.testing/-i-r-s-simulation/start.html +++ b/docs/build/html/api/core.testing/-i-r-s-simulation/start.html @@ -7,7 +7,7 @@ core.testing / IRSSimulation / start

start

- + fun start(): Unit
Overrides Simulation.start

diff --git a/docs/build/html/api/core.testing/-in-memory-messaging-network/-builder/-init-.html b/docs/build/html/api/core.testing/-in-memory-messaging-network/-builder/-init-.html index c1e02772a7..383e9a6d34 100644 --- a/docs/build/html/api/core.testing/-in-memory-messaging-network/-builder/-init-.html +++ b/docs/build/html/api/core.testing/-in-memory-messaging-network/-builder/-init-.html @@ -7,7 +7,7 @@ core.testing / InMemoryMessagingNetwork / Builder / <init>

<init>

-Builder(manuallyPumped: Boolean, id: Handle)
+Builder(manuallyPumped: Boolean, id: Handle)


diff --git a/docs/build/html/api/core.testing/-in-memory-messaging-network/-builder/id.html b/docs/build/html/api/core.testing/-in-memory-messaging-network/-builder/id.html index f4bd38116f..5df0e4b0e8 100644 --- a/docs/build/html/api/core.testing/-in-memory-messaging-network/-builder/id.html +++ b/docs/build/html/api/core.testing/-in-memory-messaging-network/-builder/id.html @@ -7,7 +7,7 @@ core.testing / InMemoryMessagingNetwork / Builder / id

id

- + val id: Handle


diff --git a/docs/build/html/api/core.testing/-in-memory-messaging-network/-builder/index.html b/docs/build/html/api/core.testing/-in-memory-messaging-network/-builder/index.html index 191b79cf00..1e8a4cd205 100644 --- a/docs/build/html/api/core.testing/-in-memory-messaging-network/-builder/index.html +++ b/docs/build/html/api/core.testing/-in-memory-messaging-network/-builder/index.html @@ -17,7 +17,7 @@ <init> -Builder(manuallyPumped: Boolean, id: Handle) +Builder(manuallyPumped: Boolean, id: Handle) diff --git a/docs/build/html/api/core.testing/-in-memory-messaging-network/-builder/manually-pumped.html b/docs/build/html/api/core.testing/-in-memory-messaging-network/-builder/manually-pumped.html index e241852871..08bfd4f835 100644 --- a/docs/build/html/api/core.testing/-in-memory-messaging-network/-builder/manually-pumped.html +++ b/docs/build/html/api/core.testing/-in-memory-messaging-network/-builder/manually-pumped.html @@ -7,7 +7,7 @@ core.testing / InMemoryMessagingNetwork / Builder / manuallyPumped

manuallyPumped

- + val manuallyPumped: Boolean


diff --git a/docs/build/html/api/core.testing/-in-memory-messaging-network/-builder/start.html b/docs/build/html/api/core.testing/-in-memory-messaging-network/-builder/start.html index f19a7d678f..fd5bf17a5f 100644 --- a/docs/build/html/api/core.testing/-in-memory-messaging-network/-builder/start.html +++ b/docs/build/html/api/core.testing/-in-memory-messaging-network/-builder/start.html @@ -7,7 +7,7 @@ core.testing / InMemoryMessagingNetwork / Builder / start

start

- + fun start(): <ERROR CLASS><InMemoryMessaging>
Overrides MessagingServiceBuilder.start

diff --git a/docs/build/html/api/core.testing/-in-memory-messaging-network/-handle/-init-.html b/docs/build/html/api/core.testing/-in-memory-messaging-network/-handle/-init-.html index 0ad586171c..e6895561c7 100644 --- a/docs/build/html/api/core.testing/-in-memory-messaging-network/-handle/-init-.html +++ b/docs/build/html/api/core.testing/-in-memory-messaging-network/-handle/-init-.html @@ -7,7 +7,7 @@ core.testing / InMemoryMessagingNetwork / Handle / <init>

<init>

-Handle(id: Int)
+Handle(id: Int)


diff --git a/docs/build/html/api/core.testing/-in-memory-messaging-network/-handle/equals.html b/docs/build/html/api/core.testing/-in-memory-messaging-network/-handle/equals.html index ca855e76d3..5f0a877e43 100644 --- a/docs/build/html/api/core.testing/-in-memory-messaging-network/-handle/equals.html +++ b/docs/build/html/api/core.testing/-in-memory-messaging-network/-handle/equals.html @@ -7,8 +7,8 @@ core.testing / InMemoryMessagingNetwork / Handle / equals

equals

- -fun equals(other: Any?): Boolean
+ +fun equals(other: Any?): Boolean


diff --git a/docs/build/html/api/core.testing/-in-memory-messaging-network/-handle/hash-code.html b/docs/build/html/api/core.testing/-in-memory-messaging-network/-handle/hash-code.html index e0990da3d8..9c18471aba 100644 --- a/docs/build/html/api/core.testing/-in-memory-messaging-network/-handle/hash-code.html +++ b/docs/build/html/api/core.testing/-in-memory-messaging-network/-handle/hash-code.html @@ -7,7 +7,7 @@ core.testing / InMemoryMessagingNetwork / Handle / hashCode

hashCode

- + fun hashCode(): Int


diff --git a/docs/build/html/api/core.testing/-in-memory-messaging-network/-handle/id.html b/docs/build/html/api/core.testing/-in-memory-messaging-network/-handle/id.html index b496820a59..d09a7de0f6 100644 --- a/docs/build/html/api/core.testing/-in-memory-messaging-network/-handle/id.html +++ b/docs/build/html/api/core.testing/-in-memory-messaging-network/-handle/id.html @@ -7,7 +7,7 @@ core.testing / InMemoryMessagingNetwork / Handle / id

id

- + val id: Int


diff --git a/docs/build/html/api/core.testing/-in-memory-messaging-network/-handle/index.html b/docs/build/html/api/core.testing/-in-memory-messaging-network/-handle/index.html index c0a09e63f5..b1bb0eb4e4 100644 --- a/docs/build/html/api/core.testing/-in-memory-messaging-network/-handle/index.html +++ b/docs/build/html/api/core.testing/-in-memory-messaging-network/-handle/index.html @@ -17,7 +17,7 @@ <init> -Handle(id: Int) +Handle(id: Int) @@ -39,7 +39,7 @@ equals -fun equals(other: Any?): Boolean +fun equals(other: Any?): Boolean diff --git a/docs/build/html/api/core.testing/-in-memory-messaging-network/-handle/to-string.html b/docs/build/html/api/core.testing/-in-memory-messaging-network/-handle/to-string.html index 4dce75ca1d..7eb1effe4c 100644 --- a/docs/build/html/api/core.testing/-in-memory-messaging-network/-handle/to-string.html +++ b/docs/build/html/api/core.testing/-in-memory-messaging-network/-handle/to-string.html @@ -7,7 +7,7 @@ core.testing / InMemoryMessagingNetwork / Handle / toString

toString

- + fun toString(): String


diff --git a/docs/build/html/api/core.testing/-in-memory-messaging-network/-in-memory-messaging/-handler/-init-.html b/docs/build/html/api/core.testing/-in-memory-messaging-network/-in-memory-messaging/-handler/-init-.html index a1b90bf8b7..b054e56049 100644 --- a/docs/build/html/api/core.testing/-in-memory-messaging-network/-in-memory-messaging/-handler/-init-.html +++ b/docs/build/html/api/core.testing/-in-memory-messaging-network/-in-memory-messaging/-handler/-init-.html @@ -7,7 +7,7 @@ core.testing / InMemoryMessagingNetwork / InMemoryMessaging / Handler / <init>

<init>

-Handler(executor: Executor?, topic: String, callback: (Message, MessageHandlerRegistration) -> Unit)
+Handler(executor: Executor?, topic: String, callback: (Message, MessageHandlerRegistration) -> Unit)


diff --git a/docs/build/html/api/core.testing/-in-memory-messaging-network/-in-memory-messaging/-handler/callback.html b/docs/build/html/api/core.testing/-in-memory-messaging-network/-in-memory-messaging/-handler/callback.html index e808bec54a..1e0f8a11d8 100644 --- a/docs/build/html/api/core.testing/-in-memory-messaging-network/-in-memory-messaging/-handler/callback.html +++ b/docs/build/html/api/core.testing/-in-memory-messaging-network/-in-memory-messaging/-handler/callback.html @@ -7,7 +7,7 @@ core.testing / InMemoryMessagingNetwork / InMemoryMessaging / Handler / callback

callback

- + val callback: (Message, MessageHandlerRegistration) -> Unit


diff --git a/docs/build/html/api/core.testing/-in-memory-messaging-network/-in-memory-messaging/-handler/executor.html b/docs/build/html/api/core.testing/-in-memory-messaging-network/-in-memory-messaging/-handler/executor.html index 38ccc4f263..deb0be47e3 100644 --- a/docs/build/html/api/core.testing/-in-memory-messaging-network/-in-memory-messaging/-handler/executor.html +++ b/docs/build/html/api/core.testing/-in-memory-messaging-network/-in-memory-messaging/-handler/executor.html @@ -7,7 +7,7 @@ core.testing / InMemoryMessagingNetwork / InMemoryMessaging / Handler / executor

executor

- + val executor: Executor?


diff --git a/docs/build/html/api/core.testing/-in-memory-messaging-network/-in-memory-messaging/-handler/index.html b/docs/build/html/api/core.testing/-in-memory-messaging-network/-in-memory-messaging/-handler/index.html index fc9988f7ff..4a11e2cbe4 100644 --- a/docs/build/html/api/core.testing/-in-memory-messaging-network/-in-memory-messaging/-handler/index.html +++ b/docs/build/html/api/core.testing/-in-memory-messaging-network/-in-memory-messaging/-handler/index.html @@ -17,7 +17,7 @@ <init> -Handler(executor: Executor?, topic: String, callback: (Message, MessageHandlerRegistration) -> Unit) +Handler(executor: Executor?, topic: String, callback: (Message, MessageHandlerRegistration) -> Unit) diff --git a/docs/build/html/api/core.testing/-in-memory-messaging-network/-in-memory-messaging/-handler/topic.html b/docs/build/html/api/core.testing/-in-memory-messaging-network/-in-memory-messaging/-handler/topic.html index c1100cdb08..22e1924e9a 100644 --- a/docs/build/html/api/core.testing/-in-memory-messaging-network/-in-memory-messaging/-handler/topic.html +++ b/docs/build/html/api/core.testing/-in-memory-messaging-network/-in-memory-messaging/-handler/topic.html @@ -7,7 +7,7 @@ core.testing / InMemoryMessagingNetwork / InMemoryMessaging / Handler / topic

topic

- + val topic: String


diff --git a/docs/build/html/api/core.testing/-in-memory-messaging-network/-in-memory-messaging/-init-.html b/docs/build/html/api/core.testing/-in-memory-messaging-network/-in-memory-messaging/-init-.html index 372d3d101a..40b73a7d91 100644 --- a/docs/build/html/api/core.testing/-in-memory-messaging-network/-in-memory-messaging/-init-.html +++ b/docs/build/html/api/core.testing/-in-memory-messaging-network/-in-memory-messaging/-init-.html @@ -7,7 +7,7 @@ core.testing / InMemoryMessagingNetwork / InMemoryMessaging / <init>

<init>

-InMemoryMessaging(manuallyPumped: Boolean, handle: Handle)
+InMemoryMessaging(manuallyPumped: Boolean, handle: Handle)

An InMemoryMessaging provides a MessagingService that isnt backed by any kind of network or disk storage system, but just uses regular queues on the heap instead. It is intended for unit testing and developer convenience when all entities on the network are being simulated in-process.

diff --git a/docs/build/html/api/core.testing/-in-memory-messaging-network/-in-memory-messaging/-inner-state/handlers.html b/docs/build/html/api/core.testing/-in-memory-messaging-network/-in-memory-messaging/-inner-state/handlers.html index 0b0004522f..4558d34836 100644 --- a/docs/build/html/api/core.testing/-in-memory-messaging-network/-in-memory-messaging/-inner-state/handlers.html +++ b/docs/build/html/api/core.testing/-in-memory-messaging-network/-in-memory-messaging/-inner-state/handlers.html @@ -7,7 +7,7 @@ core.testing / InMemoryMessagingNetwork / InMemoryMessaging / InnerState / handlers

handlers

- + val handlers: MutableList<Handler>


diff --git a/docs/build/html/api/core.testing/-in-memory-messaging-network/-in-memory-messaging/-inner-state/pending-redelivery.html b/docs/build/html/api/core.testing/-in-memory-messaging-network/-in-memory-messaging/-inner-state/pending-redelivery.html index f85443ddc7..020d3d6da6 100644 --- a/docs/build/html/api/core.testing/-in-memory-messaging-network/-in-memory-messaging/-inner-state/pending-redelivery.html +++ b/docs/build/html/api/core.testing/-in-memory-messaging-network/-in-memory-messaging/-inner-state/pending-redelivery.html @@ -7,7 +7,7 @@ core.testing / InMemoryMessagingNetwork / InMemoryMessaging / InnerState / pendingRedelivery

pendingRedelivery

- + val pendingRedelivery: LinkedList<Message>


diff --git a/docs/build/html/api/core.testing/-in-memory-messaging-network/-in-memory-messaging/add-message-handler.html b/docs/build/html/api/core.testing/-in-memory-messaging-network/-in-memory-messaging/add-message-handler.html index 8677abbf03..0037658b84 100644 --- a/docs/build/html/api/core.testing/-in-memory-messaging-network/-in-memory-messaging/add-message-handler.html +++ b/docs/build/html/api/core.testing/-in-memory-messaging-network/-in-memory-messaging/add-message-handler.html @@ -7,8 +7,8 @@ core.testing / InMemoryMessagingNetwork / InMemoryMessaging / addMessageHandler

addMessageHandler

- -fun addMessageHandler(topic: String, executor: Executor?, callback: (Message, MessageHandlerRegistration) -> Unit): MessageHandlerRegistration
+ +fun addMessageHandler(topic: String, executor: Executor?, callback: (Message, MessageHandlerRegistration) -> Unit): MessageHandlerRegistration
Overrides MessagingService.addMessageHandler

The provided function will be invoked for each received message whose topic matches the given string, on the given executor. The topic can be the empty string to match all messages.

diff --git a/docs/build/html/api/core.testing/-in-memory-messaging-network/-in-memory-messaging/background-thread.html b/docs/build/html/api/core.testing/-in-memory-messaging-network/-in-memory-messaging/background-thread.html index 51d36a939f..752e7ec9d5 100644 --- a/docs/build/html/api/core.testing/-in-memory-messaging-network/-in-memory-messaging/background-thread.html +++ b/docs/build/html/api/core.testing/-in-memory-messaging-network/-in-memory-messaging/background-thread.html @@ -7,7 +7,7 @@ core.testing / InMemoryMessagingNetwork / InMemoryMessaging / backgroundThread

backgroundThread

- + protected val backgroundThread: Nothing?


diff --git a/docs/build/html/api/core.testing/-in-memory-messaging-network/-in-memory-messaging/create-message.html b/docs/build/html/api/core.testing/-in-memory-messaging-network/-in-memory-messaging/create-message.html index 8da74b6702..09ba45a44c 100644 --- a/docs/build/html/api/core.testing/-in-memory-messaging-network/-in-memory-messaging/create-message.html +++ b/docs/build/html/api/core.testing/-in-memory-messaging-network/-in-memory-messaging/create-message.html @@ -7,8 +7,8 @@ core.testing / InMemoryMessagingNetwork / InMemoryMessaging / createMessage

createMessage

- -fun createMessage(topic: String, data: ByteArray): Message
+ +fun createMessage(topic: String, data: ByteArray): Message
Overrides MessagingService.createMessage

Returns the given (topic, data) pair as a newly created message object.


diff --git a/docs/build/html/api/core.testing/-in-memory-messaging-network/-in-memory-messaging/index.html b/docs/build/html/api/core.testing/-in-memory-messaging-network/-in-memory-messaging/index.html index d7cf37d9a8..ab5018e233 100644 --- a/docs/build/html/api/core.testing/-in-memory-messaging-network/-in-memory-messaging/index.html +++ b/docs/build/html/api/core.testing/-in-memory-messaging-network/-in-memory-messaging/index.html @@ -40,7 +40,7 @@ when all entities on the network are being simulated in-process.

<init> -InMemoryMessaging(manuallyPumped: Boolean, handle: Handle)

An InMemoryMessaging provides a MessagingService that isnt backed by any kind of network or disk storage +InMemoryMessaging(manuallyPumped: Boolean, handle: Handle)

An InMemoryMessaging provides a MessagingService that isnt backed by any kind of network or disk storage system, but just uses regular queues on the heap instead. It is intended for unit testing and developer convenience when all entities on the network are being simulated in-process.

@@ -84,7 +84,7 @@ when all entities on the network are being simulated in-process.

addMessageHandler -fun addMessageHandler(topic: String, executor: Executor?, callback: (Message, MessageHandlerRegistration) -> Unit): MessageHandlerRegistration

The provided function will be invoked for each received message whose topic matches the given string, on the given +fun addMessageHandler(topic: String, executor: Executor?, callback: (Message, MessageHandlerRegistration) -> Unit): MessageHandlerRegistration

The provided function will be invoked for each received message whose topic matches the given string, on the given executor. The topic can be the empty string to match all messages.

@@ -92,14 +92,14 @@ executor. The topic can be the empty string to match all messages.

createMessage -fun createMessage(topic: String, data: ByteArray): Message

Returns the given (topic, data) pair as a newly created message object.

+fun createMessage(topic: String, data: ByteArray): Message

Returns the given (topic, data) pair as a newly created message object.

pump -fun pump(block: Boolean): Boolean

Delivers a single message from the internal queue. If there are no messages waiting to be delivered and block +fun pump(block: Boolean): Boolean

Delivers a single message from the internal queue. If there are no messages waiting to be delivered and block is true, waits until one has been provided on a different thread via send. If block is false, the return result indicates whether a message was delivered or not.

@@ -108,7 +108,7 @@ result indicates whether a message was delivered or not.

removeMessageHandler -fun removeMessageHandler(registration: MessageHandlerRegistration): Unit

Removes a handler given the object returned from addMessageHandler. The callback will no longer be invoked once +fun removeMessageHandler(registration: MessageHandlerRegistration): Unit

Removes a handler given the object returned from addMessageHandler. The callback will no longer be invoked once this method has returned, although executions that are currently in flight will not be interrupted.

@@ -116,7 +116,7 @@ this method has returned, although executions that are currently in flight will send -fun send(message: Message, target: MessageRecipients): Unit

Sends a message to the given receiver. The details of how receivers are identified is up to the messaging +fun send(message: Message, target: MessageRecipients): Unit

Sends a message to the given receiver. The details of how receivers are identified is up to the messaging implementation: the type system provides an opaque high level view, with more fine grained control being available via type casting. Once this function returns the message is queued for delivery but not necessarily delivered: if the recipients are offline then the message could be queued hours or days later.

diff --git a/docs/build/html/api/core.testing/-in-memory-messaging-network/-in-memory-messaging/my-address.html b/docs/build/html/api/core.testing/-in-memory-messaging-network/-in-memory-messaging/my-address.html index b571e55acc..22703e14a5 100644 --- a/docs/build/html/api/core.testing/-in-memory-messaging-network/-in-memory-messaging/my-address.html +++ b/docs/build/html/api/core.testing/-in-memory-messaging-network/-in-memory-messaging/my-address.html @@ -7,7 +7,7 @@ core.testing / InMemoryMessagingNetwork / InMemoryMessaging / myAddress

myAddress

- + val myAddress: SingleMessageRecipient
Overrides MessagingService.myAddress

Returns an address that refers to this node.

diff --git a/docs/build/html/api/core.testing/-in-memory-messaging-network/-in-memory-messaging/pump.html b/docs/build/html/api/core.testing/-in-memory-messaging-network/-in-memory-messaging/pump.html index 41dab54118..3cbea0c87e 100644 --- a/docs/build/html/api/core.testing/-in-memory-messaging-network/-in-memory-messaging/pump.html +++ b/docs/build/html/api/core.testing/-in-memory-messaging-network/-in-memory-messaging/pump.html @@ -7,8 +7,8 @@ core.testing / InMemoryMessagingNetwork / InMemoryMessaging / pump

pump

- -fun pump(block: Boolean): Boolean
+ +fun pump(block: Boolean): Boolean

Delivers a single message from the internal queue. If there are no messages waiting to be delivered and block is true, waits until one has been provided on a different thread via send. If block is false, the return result indicates whether a message was delivered or not.

diff --git a/docs/build/html/api/core.testing/-in-memory-messaging-network/-in-memory-messaging/remove-message-handler.html b/docs/build/html/api/core.testing/-in-memory-messaging-network/-in-memory-messaging/remove-message-handler.html index 1d98c1b102..43acb6b0c1 100644 --- a/docs/build/html/api/core.testing/-in-memory-messaging-network/-in-memory-messaging/remove-message-handler.html +++ b/docs/build/html/api/core.testing/-in-memory-messaging-network/-in-memory-messaging/remove-message-handler.html @@ -7,8 +7,8 @@ core.testing / InMemoryMessagingNetwork / InMemoryMessaging / removeMessageHandler

removeMessageHandler

- -fun removeMessageHandler(registration: MessageHandlerRegistration): Unit
+ +fun removeMessageHandler(registration: MessageHandlerRegistration): Unit
Overrides MessagingService.removeMessageHandler

Removes a handler given the object returned from addMessageHandler. The callback will no longer be invoked once this method has returned, although executions that are currently in flight will not be interrupted.

diff --git a/docs/build/html/api/core.testing/-in-memory-messaging-network/-in-memory-messaging/running.html b/docs/build/html/api/core.testing/-in-memory-messaging-network/-in-memory-messaging/running.html index 3e2fb8ae10..4a726a8a95 100644 --- a/docs/build/html/api/core.testing/-in-memory-messaging-network/-in-memory-messaging/running.html +++ b/docs/build/html/api/core.testing/-in-memory-messaging-network/-in-memory-messaging/running.html @@ -7,7 +7,7 @@ core.testing / InMemoryMessagingNetwork / InMemoryMessaging / running

running

- + protected var running: Boolean


diff --git a/docs/build/html/api/core.testing/-in-memory-messaging-network/-in-memory-messaging/send.html b/docs/build/html/api/core.testing/-in-memory-messaging-network/-in-memory-messaging/send.html index 3197cdcb58..dff734a41f 100644 --- a/docs/build/html/api/core.testing/-in-memory-messaging-network/-in-memory-messaging/send.html +++ b/docs/build/html/api/core.testing/-in-memory-messaging-network/-in-memory-messaging/send.html @@ -7,8 +7,8 @@ core.testing / InMemoryMessagingNetwork / InMemoryMessaging / send

send

- -fun send(message: Message, target: MessageRecipients): Unit
+ +fun send(message: Message, target: MessageRecipients): Unit
Overrides MessagingService.send

Sends a message to the given receiver. The details of how receivers are identified is up to the messaging implementation: the type system provides an opaque high level view, with more fine grained control being diff --git a/docs/build/html/api/core.testing/-in-memory-messaging-network/-in-memory-messaging/state.html b/docs/build/html/api/core.testing/-in-memory-messaging-network/-in-memory-messaging/state.html index 652cb9ec49..4356c77a8e 100644 --- a/docs/build/html/api/core.testing/-in-memory-messaging-network/-in-memory-messaging/state.html +++ b/docs/build/html/api/core.testing/-in-memory-messaging-network/-in-memory-messaging/state.html @@ -7,7 +7,7 @@ core.testing / InMemoryMessagingNetwork / InMemoryMessaging / state

state

- + protected val state: ThreadBox<InnerState>


diff --git a/docs/build/html/api/core.testing/-in-memory-messaging-network/-in-memory-messaging/stop.html b/docs/build/html/api/core.testing/-in-memory-messaging-network/-in-memory-messaging/stop.html index 99f0b522b8..424dac20d7 100644 --- a/docs/build/html/api/core.testing/-in-memory-messaging-network/-in-memory-messaging/stop.html +++ b/docs/build/html/api/core.testing/-in-memory-messaging-network/-in-memory-messaging/stop.html @@ -7,7 +7,7 @@ core.testing / InMemoryMessagingNetwork / InMemoryMessaging / stop

stop

- + fun stop(): Unit
Overrides MessagingService.stop

diff --git a/docs/build/html/api/core.testing/-in-memory-messaging-network/-latency-calculator/between.html b/docs/build/html/api/core.testing/-in-memory-messaging-network/-latency-calculator/between.html index c0809d14c9..b70d6e3470 100644 --- a/docs/build/html/api/core.testing/-in-memory-messaging-network/-latency-calculator/between.html +++ b/docs/build/html/api/core.testing/-in-memory-messaging-network/-latency-calculator/between.html @@ -7,8 +7,8 @@ core.testing / InMemoryMessagingNetwork / LatencyCalculator / between

between

- -abstract fun between(sender: SingleMessageRecipient, receiver: SingleMessageRecipient): Duration
+ +abstract fun between(sender: SingleMessageRecipient, receiver: SingleMessageRecipient): Duration


diff --git a/docs/build/html/api/core.testing/-in-memory-messaging-network/-latency-calculator/index.html b/docs/build/html/api/core.testing/-in-memory-messaging-network/-latency-calculator/index.html index 7a66d85289..61e7db2058 100644 --- a/docs/build/html/api/core.testing/-in-memory-messaging-network/-latency-calculator/index.html +++ b/docs/build/html/api/core.testing/-in-memory-messaging-network/-latency-calculator/index.html @@ -17,7 +17,7 @@ between -abstract fun between(sender: SingleMessageRecipient, receiver: SingleMessageRecipient): Duration +abstract fun between(sender: SingleMessageRecipient, receiver: SingleMessageRecipient): Duration diff --git a/docs/build/html/api/core.testing/-in-memory-messaging-network/all-messages.html b/docs/build/html/api/core.testing/-in-memory-messaging-network/all-messages.html index 940beba695..7741d95d49 100644 --- a/docs/build/html/api/core.testing/-in-memory-messaging-network/all-messages.html +++ b/docs/build/html/api/core.testing/-in-memory-messaging-network/all-messages.html @@ -7,7 +7,7 @@ core.testing / InMemoryMessagingNetwork / allMessages

allMessages

- + val allMessages: <ERROR CLASS><<ERROR CLASS><SingleMessageRecipient, Message, MessageRecipients>>

A stream of (sender, message, recipients) triples


diff --git a/docs/build/html/api/core.testing/-in-memory-messaging-network/create-node-with-i-d.html b/docs/build/html/api/core.testing/-in-memory-messaging-network/create-node-with-i-d.html index 6735d4c313..879830c269 100644 --- a/docs/build/html/api/core.testing/-in-memory-messaging-network/create-node-with-i-d.html +++ b/docs/build/html/api/core.testing/-in-memory-messaging-network/create-node-with-i-d.html @@ -7,8 +7,8 @@ core.testing / InMemoryMessagingNetwork / createNodeWithID

createNodeWithID

- -fun createNodeWithID(manuallyPumped: Boolean, id: Int): MessagingServiceBuilder<InMemoryMessaging>
+ +fun createNodeWithID(manuallyPumped: Boolean, id: Int): MessagingServiceBuilder<InMemoryMessaging>

Creates a node at the given address: useful if you want to recreate a node to simulate a restart



diff --git a/docs/build/html/api/core.testing/-in-memory-messaging-network/create-node.html b/docs/build/html/api/core.testing/-in-memory-messaging-network/create-node.html index 5703add566..647d3873ae 100644 --- a/docs/build/html/api/core.testing/-in-memory-messaging-network/create-node.html +++ b/docs/build/html/api/core.testing/-in-memory-messaging-network/create-node.html @@ -7,11 +7,11 @@ core.testing / InMemoryMessagingNetwork / createNode

createNode

- -fun createNode(manuallyPumped: Boolean): <ERROR CLASS><Handle, MessagingServiceBuilder<InMemoryMessaging>>
+ +fun createNode(manuallyPumped: Boolean): <ERROR CLASS><Handle, MessagingServiceBuilder<InMemoryMessaging>>

Creates a node and returns the new object that identifies its location on the network to senders, and the InMemoryMessaging that the recipient/in-memory node uses to receive messages and send messages itself.

-

If manuallyPumped is set to true, then you are expected to call the InMemoryMessaging.pump method on the InMemoryMessaging +

If manuallyPumped is set to true, then you are expected to call the InMemoryMessaging.pump method on the InMemoryMessaging in order to cause the delivery of a single message, which will occur on the thread of the caller. If set to false then this class will set up a background thread to deliver messages asynchronously, if the handler specifies no executor.

diff --git a/docs/build/html/api/core.testing/-in-memory-messaging-network/endpoints.html b/docs/build/html/api/core.testing/-in-memory-messaging-network/endpoints.html index afd3c3571d..f85bf3e528 100644 --- a/docs/build/html/api/core.testing/-in-memory-messaging-network/endpoints.html +++ b/docs/build/html/api/core.testing/-in-memory-messaging-network/endpoints.html @@ -7,7 +7,7 @@ core.testing / InMemoryMessagingNetwork / endpoints

endpoints

- + val endpoints: List<InMemoryMessaging>


diff --git a/docs/build/html/api/core.testing/-in-memory-messaging-network/everyone-online.html b/docs/build/html/api/core.testing/-in-memory-messaging-network/everyone-online.html index 8d64c6aa4e..e0cc41f751 100644 --- a/docs/build/html/api/core.testing/-in-memory-messaging-network/everyone-online.html +++ b/docs/build/html/api/core.testing/-in-memory-messaging-network/everyone-online.html @@ -7,7 +7,7 @@ core.testing / InMemoryMessagingNetwork / everyoneOnline

everyoneOnline

- + val everyoneOnline: AllPossibleRecipients


diff --git a/docs/build/html/api/core.testing/-in-memory-messaging-network/index.html b/docs/build/html/api/core.testing/-in-memory-messaging-network/index.html index 683439837f..14d9d66091 100644 --- a/docs/build/html/api/core.testing/-in-memory-messaging-network/index.html +++ b/docs/build/html/api/core.testing/-in-memory-messaging-network/index.html @@ -101,7 +101,7 @@ testing).

createNode -fun createNode(manuallyPumped: Boolean): <ERROR CLASS><Handle, MessagingServiceBuilder<InMemoryMessaging>>

Creates a node and returns the new object that identifies its location on the network to senders, and the +fun createNode(manuallyPumped: Boolean): <ERROR CLASS><Handle, MessagingServiceBuilder<InMemoryMessaging>>

Creates a node and returns the new object that identifies its location on the network to senders, and the InMemoryMessaging that the recipient/in-memory node uses to receive messages and send messages itself.

@@ -109,14 +109,14 @@ testing).

createNodeWithID -fun createNodeWithID(manuallyPumped: Boolean, id: Int): MessagingServiceBuilder<InMemoryMessaging>

Creates a node at the given address: useful if you want to recreate a node to simulate a restart

+fun createNodeWithID(manuallyPumped: Boolean, id: Int): MessagingServiceBuilder<InMemoryMessaging>

Creates a node at the given address: useful if you want to recreate a node to simulate a restart

setupTimestampingNode -fun setupTimestampingNode(manuallyPumped: Boolean): <ERROR CLASS><NodeInfo, InMemoryMessaging> +fun setupTimestampingNode(manuallyPumped: Boolean): <ERROR CLASS><NodeInfo, InMemoryMessaging> diff --git a/docs/build/html/api/core.testing/-in-memory-messaging-network/latency-calculator.html b/docs/build/html/api/core.testing/-in-memory-messaging-network/latency-calculator.html index 77f5335464..a460270e01 100644 --- a/docs/build/html/api/core.testing/-in-memory-messaging-network/latency-calculator.html +++ b/docs/build/html/api/core.testing/-in-memory-messaging-network/latency-calculator.html @@ -7,7 +7,7 @@ core.testing / InMemoryMessagingNetwork / latencyCalculator

latencyCalculator

- + var latencyCalculator: LatencyCalculator?

This can be set to an object which can inject artificial latency between sender/recipient pairs.


diff --git a/docs/build/html/api/core.testing/-in-memory-messaging-network/setup-timestamping-node.html b/docs/build/html/api/core.testing/-in-memory-messaging-network/setup-timestamping-node.html index 257b2c8b43..e79e36e0f1 100644 --- a/docs/build/html/api/core.testing/-in-memory-messaging-network/setup-timestamping-node.html +++ b/docs/build/html/api/core.testing/-in-memory-messaging-network/setup-timestamping-node.html @@ -7,8 +7,8 @@ core.testing / InMemoryMessagingNetwork / setupTimestampingNode

setupTimestampingNode

- -fun setupTimestampingNode(manuallyPumped: Boolean): <ERROR CLASS><NodeInfo, InMemoryMessaging>
+ +fun setupTimestampingNode(manuallyPumped: Boolean): <ERROR CLASS><NodeInfo, InMemoryMessaging>


diff --git a/docs/build/html/api/core.testing/-in-memory-messaging-network/stop.html b/docs/build/html/api/core.testing/-in-memory-messaging-network/stop.html index 6db908560a..767c9be155 100644 --- a/docs/build/html/api/core.testing/-in-memory-messaging-network/stop.html +++ b/docs/build/html/api/core.testing/-in-memory-messaging-network/stop.html @@ -7,7 +7,7 @@ core.testing / InMemoryMessagingNetwork / stop

stop

- + fun stop(): Unit


diff --git a/docs/build/html/api/core.testing/-mock-identity-service/-init-.html b/docs/build/html/api/core.testing/-mock-identity-service/-init-.html index d3faadd71c..e4053b3cdc 100644 --- a/docs/build/html/api/core.testing/-mock-identity-service/-init-.html +++ b/docs/build/html/api/core.testing/-mock-identity-service/-init-.html @@ -7,7 +7,7 @@ core.testing / MockIdentityService / <init>

<init>

-MockIdentityService(identities: List<Party>)
+MockIdentityService(identities: List<Party>)

Scaffolding: a dummy identity service that just expects to have identities loaded off disk or found elsewhere. This class allows the provided list of identities to be mutated after construction, so it takes the list lock when doing lookups and recalculates the mapping each time. The ability to change the list is used by the diff --git a/docs/build/html/api/core.testing/-mock-identity-service/identities.html b/docs/build/html/api/core.testing/-mock-identity-service/identities.html index 03ed802108..32c0b584d6 100644 --- a/docs/build/html/api/core.testing/-mock-identity-service/identities.html +++ b/docs/build/html/api/core.testing/-mock-identity-service/identities.html @@ -7,7 +7,7 @@ core.testing / MockIdentityService / identities

identities

- + val identities: List<Party>


diff --git a/docs/build/html/api/core.testing/-mock-identity-service/index.html b/docs/build/html/api/core.testing/-mock-identity-service/index.html index a8c820459b..b33c3222b3 100644 --- a/docs/build/html/api/core.testing/-mock-identity-service/index.html +++ b/docs/build/html/api/core.testing/-mock-identity-service/index.html @@ -21,7 +21,7 @@ MockNetwork code.

<init> -MockIdentityService(identities: List<Party>)

Scaffolding: a dummy identity service that just expects to have identities loaded off disk or found elsewhere. +MockIdentityService(identities: List<Party>)

Scaffolding: a dummy identity service that just expects to have identities loaded off disk or found elsewhere. This class allows the provided list of identities to be mutated after construction, so it takes the list lock when doing lookups and recalculates the mapping each time. The ability to change the list is used by the MockNetwork code.

@@ -47,19 +47,19 @@ MockNetwork code.

partyFromKey -fun partyFromKey(key: PublicKey): Party? +fun partyFromKey(key: PublicKey): Party? partyFromName -fun partyFromName(name: String): Party? +fun partyFromName(name: String): Party? registerIdentity -fun registerIdentity(party: Party): Unit +fun registerIdentity(party: Party): Unit diff --git a/docs/build/html/api/core.testing/-mock-identity-service/party-from-key.html b/docs/build/html/api/core.testing/-mock-identity-service/party-from-key.html index 20b8dc25e3..5a9d48f40c 100644 --- a/docs/build/html/api/core.testing/-mock-identity-service/party-from-key.html +++ b/docs/build/html/api/core.testing/-mock-identity-service/party-from-key.html @@ -7,8 +7,8 @@ core.testing / MockIdentityService / partyFromKey

partyFromKey

- -fun partyFromKey(key: PublicKey): Party?
+ +fun partyFromKey(key: PublicKey): Party?
Overrides IdentityService.partyFromKey


diff --git a/docs/build/html/api/core.testing/-mock-identity-service/party-from-name.html b/docs/build/html/api/core.testing/-mock-identity-service/party-from-name.html index 7940872531..f224baebdb 100644 --- a/docs/build/html/api/core.testing/-mock-identity-service/party-from-name.html +++ b/docs/build/html/api/core.testing/-mock-identity-service/party-from-name.html @@ -7,8 +7,8 @@ core.testing / MockIdentityService / partyFromName

partyFromName

- -fun partyFromName(name: String): Party?
+ +fun partyFromName(name: String): Party?
Overrides IdentityService.partyFromName


diff --git a/docs/build/html/api/core.testing/-mock-identity-service/register-identity.html b/docs/build/html/api/core.testing/-mock-identity-service/register-identity.html index e12893370f..9cc82c7ebe 100644 --- a/docs/build/html/api/core.testing/-mock-identity-service/register-identity.html +++ b/docs/build/html/api/core.testing/-mock-identity-service/register-identity.html @@ -7,8 +7,8 @@ core.testing / MockIdentityService / registerIdentity

registerIdentity

- -fun registerIdentity(party: Party): Unit
+ +fun registerIdentity(party: Party): Unit
Overrides IdentityService.registerIdentity


diff --git a/docs/build/html/api/core.testing/-mock-network-map-cache/-mock-address/-init-.html b/docs/build/html/api/core.testing/-mock-network-map-cache/-mock-address/-init-.html index 01aad1210f..f0c2c9049b 100644 --- a/docs/build/html/api/core.testing/-mock-network-map-cache/-mock-address/-init-.html +++ b/docs/build/html/api/core.testing/-mock-network-map-cache/-mock-address/-init-.html @@ -7,7 +7,7 @@ core.testing / MockNetworkMapCache / MockAddress / <init>

<init>

-MockAddress(id: String)
+MockAddress(id: String)


diff --git a/docs/build/html/api/core.testing/-mock-network-map-cache/-mock-address/id.html b/docs/build/html/api/core.testing/-mock-network-map-cache/-mock-address/id.html index c597ab8da0..9b3ed1087a 100644 --- a/docs/build/html/api/core.testing/-mock-network-map-cache/-mock-address/id.html +++ b/docs/build/html/api/core.testing/-mock-network-map-cache/-mock-address/id.html @@ -7,7 +7,7 @@ core.testing / MockNetworkMapCache / MockAddress / id

id

- + val id: String


diff --git a/docs/build/html/api/core.testing/-mock-network-map-cache/-mock-address/index.html b/docs/build/html/api/core.testing/-mock-network-map-cache/-mock-address/index.html index 5be158a945..0dfce161ed 100644 --- a/docs/build/html/api/core.testing/-mock-network-map-cache/-mock-address/index.html +++ b/docs/build/html/api/core.testing/-mock-network-map-cache/-mock-address/index.html @@ -17,7 +17,7 @@ <init> -MockAddress(id: String) +MockAddress(id: String) diff --git a/docs/build/html/api/core.testing/-mock-network-map-cache/add-registration.html b/docs/build/html/api/core.testing/-mock-network-map-cache/add-registration.html index dce318c165..bec0f2bf67 100644 --- a/docs/build/html/api/core.testing/-mock-network-map-cache/add-registration.html +++ b/docs/build/html/api/core.testing/-mock-network-map-cache/add-registration.html @@ -7,8 +7,8 @@ core.testing / MockNetworkMapCache / addRegistration

addRegistration

- -fun addRegistration(node: NodeInfo): Unit
+ +fun addRegistration(node: NodeInfo): Unit

Directly add a registration to the internal cache. DOES NOT fire the change listeners, as its not a change being received.


diff --git a/docs/build/html/api/core.testing/-mock-network-map-cache/delete-registration.html b/docs/build/html/api/core.testing/-mock-network-map-cache/delete-registration.html index 6d0b6aa366..903c79d663 100644 --- a/docs/build/html/api/core.testing/-mock-network-map-cache/delete-registration.html +++ b/docs/build/html/api/core.testing/-mock-network-map-cache/delete-registration.html @@ -7,8 +7,8 @@ core.testing / MockNetworkMapCache / deleteRegistration

deleteRegistration

- -fun deleteRegistration(identity: Party): Boolean
+ +fun deleteRegistration(identity: Party): Boolean

Directly remove a registration from the internal cache. DOES NOT fire the change listeners, as its not a change being received.


diff --git a/docs/build/html/api/core.testing/-mock-network-map-cache/index.html b/docs/build/html/api/core.testing/-mock-network-map-cache/index.html index d5090dee11..115f81bf9a 100644 --- a/docs/build/html/api/core.testing/-mock-network-map-cache/index.html +++ b/docs/build/html/api/core.testing/-mock-network-map-cache/index.html @@ -89,7 +89,7 @@ elsewhere.

addRegistration -fun addRegistration(node: NodeInfo): Unit

Directly add a registration to the internal cache. DOES NOT fire the change listeners, as its +fun addRegistration(node: NodeInfo): Unit

Directly add a registration to the internal cache. DOES NOT fire the change listeners, as its not a change being received.

@@ -97,7 +97,7 @@ not a change being received.

deleteRegistration -fun deleteRegistration(identity: Party): Boolean

Directly remove a registration from the internal cache. DOES NOT fire the change listeners, as its +fun deleteRegistration(identity: Party): Boolean

Directly remove a registration from the internal cache. DOES NOT fire the change listeners, as its not a change being received.

@@ -110,7 +110,7 @@ not a change being received.

addMapService -open fun addMapService(smm: StateMachineManager, net: MessagingService, service: NodeInfo, subscribe: Boolean, ifChangedSinceVer: Int?): <ERROR CLASS><Unit>

Add a network map service; fetches a copy of the latest map from the service and subscribes to any further +open fun addMapService(smm: StateMachineManager, net: MessagingService, service: NodeInfo, subscribe: Boolean, ifChangedSinceVer: Int?): <ERROR CLASS><Unit>

Add a network map service; fetches a copy of the latest map from the service and subscribes to any further updates.

@@ -118,14 +118,14 @@ updates.

addNode -open fun addNode(node: NodeInfo): Unit

Adds a node to the local cache (generally only used for adding ourselves)

+open fun addNode(node: NodeInfo): Unit

Adds a node to the local cache (generally only used for adding ourselves)

deregisterForUpdates -open fun deregisterForUpdates(smm: StateMachineManager, net: MessagingService, service: NodeInfo): <ERROR CLASS><Unit>

Unsubscribes from updates from the given map service.

+open fun deregisterForUpdates(smm: StateMachineManager, net: MessagingService, service: NodeInfo): <ERROR CLASS><Unit>

Unsubscribes from updates from the given map service.

@@ -133,14 +133,14 @@ updates.

get open fun get(): <ERROR CLASS>

Get a copy of all nodes in the map.

-open fun get(serviceType: ServiceType): <ERROR CLASS>

Get the collection of nodes which advertise a specific service.

+open fun get(serviceType: ServiceType): <ERROR CLASS>

Get the collection of nodes which advertise a specific service.

getRecommended -open fun getRecommended(type: ServiceType, contract: Contract, vararg party: Party): NodeInfo?

Get a recommended node that advertises a service, and is suitable for the specified contract and parties. +open fun getRecommended(type: ServiceType, contract: Contract, vararg party: Party): NodeInfo?

Get a recommended node that advertises a service, and is suitable for the specified contract and parties. Implementations might understand, for example, the correct regulator to use for specific contracts/parties, or the appropriate oracle for a contract.

@@ -149,13 +149,13 @@ or the appropriate oracle for a contract.

processUpdatePush -fun processUpdatePush(req: Update): Unit +fun processUpdatePush(req: Update): Unit removeNode -open fun removeNode(node: NodeInfo): Unit

Removes a node from the local cache

+open fun removeNode(node: NodeInfo): Unit

Removes a node from the local cache

diff --git a/docs/build/html/api/core.testing/-mock-network/-default-factory/create.html b/docs/build/html/api/core.testing/-mock-network/-default-factory/create.html index 8b553395d6..65364c0c4a 100644 --- a/docs/build/html/api/core.testing/-mock-network/-default-factory/create.html +++ b/docs/build/html/api/core.testing/-mock-network/-default-factory/create.html @@ -7,8 +7,8 @@ core.testing / MockNetwork / DefaultFactory / create

create

- -fun create(dir: Path, config: NodeConfiguration, network: MockNetwork, networkMapAddr: NodeInfo?, advertisedServices: Set<ServiceType>, id: Int): MockNode
+ +fun create(dir: Path, config: NodeConfiguration, network: MockNetwork, networkMapAddr: NodeInfo?, advertisedServices: Set<ServiceType>, id: Int): MockNode
Overrides Factory.create


diff --git a/docs/build/html/api/core.testing/-mock-network/-default-factory/index.html b/docs/build/html/api/core.testing/-mock-network/-default-factory/index.html index 5afae25ed9..26d80c4b01 100644 --- a/docs/build/html/api/core.testing/-mock-network/-default-factory/index.html +++ b/docs/build/html/api/core.testing/-mock-network/-default-factory/index.html @@ -17,7 +17,7 @@ create -fun create(dir: Path, config: NodeConfiguration, network: MockNetwork, networkMapAddr: NodeInfo?, advertisedServices: Set<ServiceType>, id: Int): MockNode +fun create(dir: Path, config: NodeConfiguration, network: MockNetwork, networkMapAddr: NodeInfo?, advertisedServices: Set<ServiceType>, id: Int): MockNode diff --git a/docs/build/html/api/core.testing/-mock-network/-factory/create.html b/docs/build/html/api/core.testing/-mock-network/-factory/create.html index 582bf40ebd..9b8fad4e6a 100644 --- a/docs/build/html/api/core.testing/-mock-network/-factory/create.html +++ b/docs/build/html/api/core.testing/-mock-network/-factory/create.html @@ -7,8 +7,8 @@ core.testing / MockNetwork / Factory / create

create

- -abstract fun create(dir: Path, config: NodeConfiguration, network: MockNetwork, networkMapAddr: NodeInfo?, advertisedServices: Set<ServiceType>, id: Int): MockNode
+ +abstract fun create(dir: Path, config: NodeConfiguration, network: MockNetwork, networkMapAddr: NodeInfo?, advertisedServices: Set<ServiceType>, id: Int): MockNode


diff --git a/docs/build/html/api/core.testing/-mock-network/-factory/index.html b/docs/build/html/api/core.testing/-mock-network/-factory/index.html index b0a77e930f..eb4cef5b14 100644 --- a/docs/build/html/api/core.testing/-mock-network/-factory/index.html +++ b/docs/build/html/api/core.testing/-mock-network/-factory/index.html @@ -18,7 +18,7 @@ create -abstract fun create(dir: Path, config: NodeConfiguration, network: MockNetwork, networkMapAddr: NodeInfo?, advertisedServices: Set<ServiceType>, id: Int): MockNode +abstract fun create(dir: Path, config: NodeConfiguration, network: MockNetwork, networkMapAddr: NodeInfo?, advertisedServices: Set<ServiceType>, id: Int): MockNode diff --git a/docs/build/html/api/core.testing/-mock-network/-init-.html b/docs/build/html/api/core.testing/-mock-network/-init-.html index a640c171f5..1404e2bd30 100644 --- a/docs/build/html/api/core.testing/-mock-network/-init-.html +++ b/docs/build/html/api/core.testing/-mock-network/-init-.html @@ -7,7 +7,7 @@ core.testing / MockNetwork / <init>

<init>

-MockNetwork(threadPerNode: Boolean = false, defaultFactory: Factory = MockNetwork.DefaultFactory)
+MockNetwork(threadPerNode: Boolean = false, defaultFactory: Factory = MockNetwork.DefaultFactory)

A mock node brings up a suite of in-memory services in a fast manner suitable for unit testing. Components that do IO are either swapped out for mocks, or pointed to a Jimfs in memory filesystem.

Mock network nodes require manual pumping by default: they will not run asynchronous. This means that diff --git a/docs/build/html/api/core.testing/-mock-network/-mock-node/-init-.html b/docs/build/html/api/core.testing/-mock-network/-mock-node/-init-.html index a677a70f7c..cdab3ed8c9 100644 --- a/docs/build/html/api/core.testing/-mock-network/-mock-node/-init-.html +++ b/docs/build/html/api/core.testing/-mock-network/-mock-node/-init-.html @@ -7,7 +7,7 @@ core.testing / MockNetwork / MockNode / <init>

<init>

-MockNode(dir: Path, config: NodeConfiguration, mockNet: MockNetwork, networkMapAddr: NodeInfo?, advertisedServices: Set<ServiceType>, id: Int)
+MockNode(dir: Path, config: NodeConfiguration, mockNet: MockNetwork, networkMapAddr: NodeInfo?, advertisedServices: Set<ServiceType>, id: Int)


diff --git a/docs/build/html/api/core.testing/-mock-network/-mock-node/find-my-location.html b/docs/build/html/api/core.testing/-mock-network/-mock-node/find-my-location.html index eb15f72e02..bcec54a156 100644 --- a/docs/build/html/api/core.testing/-mock-network/-mock-node/find-my-location.html +++ b/docs/build/html/api/core.testing/-mock-network/-mock-node/find-my-location.html @@ -7,7 +7,7 @@ core.testing / MockNetwork / MockNode / findMyLocation

findMyLocation

- + protected open fun findMyLocation(): PhysicalLocation?
Overrides AbstractNode.findMyLocation

diff --git a/docs/build/html/api/core.testing/-mock-network/-mock-node/id.html b/docs/build/html/api/core.testing/-mock-network/-mock-node/id.html index c890864911..cff22a4f37 100644 --- a/docs/build/html/api/core.testing/-mock-network/-mock-node/id.html +++ b/docs/build/html/api/core.testing/-mock-network/-mock-node/id.html @@ -7,7 +7,7 @@ core.testing / MockNetwork / MockNode / id

id

- + val id: Int


diff --git a/docs/build/html/api/core.testing/-mock-network/-mock-node/index.html b/docs/build/html/api/core.testing/-mock-network/-mock-node/index.html index acb46876e5..a4c01929cb 100644 --- a/docs/build/html/api/core.testing/-mock-network/-mock-node/index.html +++ b/docs/build/html/api/core.testing/-mock-network/-mock-node/index.html @@ -17,7 +17,7 @@ <init> -MockNode(dir: Path, config: NodeConfiguration, mockNet: MockNetwork, networkMapAddr: NodeInfo?, advertisedServices: Set<ServiceType>, id: Int) +MockNode(dir: Path, config: NodeConfiguration, mockNet: MockNetwork, networkMapAddr: NodeInfo?, advertisedServices: Set<ServiceType>, id: Int) @@ -230,13 +230,13 @@ constructStorageService -open fun constructStorageService(attachments: NodeAttachmentService, checkpointStorage: CheckpointStorage, keypair: KeyPair, identity: Party): StorageServiceImpl +open fun constructStorageService(attachments: NodeAttachmentService, checkpointStorage: CheckpointStorage, keypair: KeyPair, identity: Party): StorageServiceImpl initialiseStorageService -open fun initialiseStorageService(dir: Path): StorageService +open fun initialiseStorageService(dir: Path): StorageService diff --git a/docs/build/html/api/core.testing/-mock-network/-mock-node/log.html b/docs/build/html/api/core.testing/-mock-network/-mock-node/log.html index d667bd5887..b0df181268 100644 --- a/docs/build/html/api/core.testing/-mock-network/-mock-node/log.html +++ b/docs/build/html/api/core.testing/-mock-network/-mock-node/log.html @@ -7,7 +7,7 @@ core.testing / MockNetwork / MockNode / log

log

- + protected open val log: <ERROR CLASS>
Overrides AbstractNode.log

diff --git a/docs/build/html/api/core.testing/-mock-network/-mock-node/make-identity-service.html b/docs/build/html/api/core.testing/-mock-network/-mock-node/make-identity-service.html index f95b365775..a5b391b134 100644 --- a/docs/build/html/api/core.testing/-mock-network/-mock-node/make-identity-service.html +++ b/docs/build/html/api/core.testing/-mock-network/-mock-node/make-identity-service.html @@ -7,7 +7,7 @@ core.testing / MockNetwork / MockNode / makeIdentityService

makeIdentityService

- + protected open fun makeIdentityService(): MockIdentityService
Overrides AbstractNode.makeIdentityService

diff --git a/docs/build/html/api/core.testing/-mock-network/-mock-node/make-messaging-service.html b/docs/build/html/api/core.testing/-mock-network/-mock-node/make-messaging-service.html index 72427e55f0..471db25b0b 100644 --- a/docs/build/html/api/core.testing/-mock-network/-mock-node/make-messaging-service.html +++ b/docs/build/html/api/core.testing/-mock-network/-mock-node/make-messaging-service.html @@ -7,7 +7,7 @@ core.testing / MockNetwork / MockNode / makeMessagingService

makeMessagingService

- + protected open fun makeMessagingService(): MessagingService
Overrides AbstractNode.makeMessagingService

diff --git a/docs/build/html/api/core.testing/-mock-network/-mock-node/mock-net.html b/docs/build/html/api/core.testing/-mock-network/-mock-node/mock-net.html index 723dc25cd4..9427159247 100644 --- a/docs/build/html/api/core.testing/-mock-network/-mock-node/mock-net.html +++ b/docs/build/html/api/core.testing/-mock-network/-mock-node/mock-net.html @@ -7,7 +7,7 @@ core.testing / MockNetwork / MockNode / mockNet

mockNet

- + val mockNet: MockNetwork


diff --git a/docs/build/html/api/core.testing/-mock-network/-mock-node/place.html b/docs/build/html/api/core.testing/-mock-network/-mock-node/place.html index 672c506e5d..6e60e14804 100644 --- a/docs/build/html/api/core.testing/-mock-network/-mock-node/place.html +++ b/docs/build/html/api/core.testing/-mock-network/-mock-node/place.html @@ -7,7 +7,7 @@ core.testing / MockNetwork / MockNode / place

place

- + val place: PhysicalLocation


diff --git a/docs/build/html/api/core.testing/-mock-network/-mock-node/server-thread.html b/docs/build/html/api/core.testing/-mock-network/-mock-node/server-thread.html index 1138e9de41..581e1b17dd 100644 --- a/docs/build/html/api/core.testing/-mock-network/-mock-node/server-thread.html +++ b/docs/build/html/api/core.testing/-mock-network/-mock-node/server-thread.html @@ -7,7 +7,7 @@ core.testing / MockNetwork / MockNode / serverThread

serverThread

- + protected open val serverThread: AffinityExecutor
Overrides AbstractNode.serverThread

diff --git a/docs/build/html/api/core.testing/-mock-network/-mock-node/start-messaging-service.html b/docs/build/html/api/core.testing/-mock-network/-mock-node/start-messaging-service.html index 4fa954aa81..8d2a02576c 100644 --- a/docs/build/html/api/core.testing/-mock-network/-mock-node/start-messaging-service.html +++ b/docs/build/html/api/core.testing/-mock-network/-mock-node/start-messaging-service.html @@ -7,7 +7,7 @@ core.testing / MockNetwork / MockNode / startMessagingService

startMessagingService

- + protected open fun startMessagingService(): Unit
Overrides AbstractNode.startMessagingService

diff --git a/docs/build/html/api/core.testing/-mock-network/-mock-node/start.html b/docs/build/html/api/core.testing/-mock-network/-mock-node/start.html index 4f65881577..15567142da 100644 --- a/docs/build/html/api/core.testing/-mock-network/-mock-node/start.html +++ b/docs/build/html/api/core.testing/-mock-network/-mock-node/start.html @@ -7,7 +7,7 @@ core.testing / MockNetwork / MockNode / start

start

- + open fun start(): MockNode
Overrides AbstractNode.start

diff --git a/docs/build/html/api/core.testing/-mock-network/address-to-node.html b/docs/build/html/api/core.testing/-mock-network/address-to-node.html index 82d88f3ff3..fb048b556a 100644 --- a/docs/build/html/api/core.testing/-mock-network/address-to-node.html +++ b/docs/build/html/api/core.testing/-mock-network/address-to-node.html @@ -7,8 +7,8 @@ core.testing / MockNetwork / addressToNode

addressToNode

- -fun addressToNode(address: SingleMessageRecipient): MockNode
+ +fun addressToNode(address: SingleMessageRecipient): MockNode


diff --git a/docs/build/html/api/core.testing/-mock-network/create-node.html b/docs/build/html/api/core.testing/-mock-network/create-node.html index d4fe73d33a..aff33c3157 100644 --- a/docs/build/html/api/core.testing/-mock-network/create-node.html +++ b/docs/build/html/api/core.testing/-mock-network/create-node.html @@ -7,8 +7,8 @@ core.testing / MockNetwork / createNode

createNode

- -fun createNode(networkMapAddress: NodeInfo? = null, forcedID: Int = -1, nodeFactory: Factory = defaultFactory, vararg advertisedServices: ServiceType): MockNode
+ +fun createNode(networkMapAddress: NodeInfo? = null, forcedID: Int = -1, nodeFactory: Factory = defaultFactory, vararg advertisedServices: ServiceType): MockNode

Returns a started node, optionally created by the passed factory method



diff --git a/docs/build/html/api/core.testing/-mock-network/create-two-nodes.html b/docs/build/html/api/core.testing/-mock-network/create-two-nodes.html index 5c36b5e577..89eca68656 100644 --- a/docs/build/html/api/core.testing/-mock-network/create-two-nodes.html +++ b/docs/build/html/api/core.testing/-mock-network/create-two-nodes.html @@ -7,8 +7,8 @@ core.testing / MockNetwork / createTwoNodes

createTwoNodes

- -fun createTwoNodes(nodeFactory: Factory = defaultFactory): <ERROR CLASS><MockNode, MockNode>
+ +fun createTwoNodes(nodeFactory: Factory = defaultFactory): <ERROR CLASS><MockNode, MockNode>

Sets up a two node network, in which the first node runs network map and timestamping services and the other doesnt.


diff --git a/docs/build/html/api/core.testing/-mock-network/filesystem.html b/docs/build/html/api/core.testing/-mock-network/filesystem.html index f555202525..5bfb5467c4 100644 --- a/docs/build/html/api/core.testing/-mock-network/filesystem.html +++ b/docs/build/html/api/core.testing/-mock-network/filesystem.html @@ -7,7 +7,7 @@ core.testing / MockNetwork / filesystem

filesystem

- + val filesystem: <ERROR CLASS>


diff --git a/docs/build/html/api/core.testing/-mock-network/identities.html b/docs/build/html/api/core.testing/-mock-network/identities.html index 014ec2e23f..d36ee6e043 100644 --- a/docs/build/html/api/core.testing/-mock-network/identities.html +++ b/docs/build/html/api/core.testing/-mock-network/identities.html @@ -7,7 +7,7 @@ core.testing / MockNetwork / identities

identities

- + val identities: ArrayList<Party>


diff --git a/docs/build/html/api/core.testing/-mock-network/index.html b/docs/build/html/api/core.testing/-mock-network/index.html index 337ed8ba2f..ad3e46f4a4 100644 --- a/docs/build/html/api/core.testing/-mock-network/index.html +++ b/docs/build/html/api/core.testing/-mock-network/index.html @@ -48,7 +48,7 @@ method.

<init> -MockNetwork(threadPerNode: Boolean = false, defaultFactory: Factory = MockNetwork.DefaultFactory)

A mock node brings up a suite of in-memory services in a fast manner suitable for unit testing. +MockNetwork(threadPerNode: Boolean = false, defaultFactory: Factory = MockNetwork.DefaultFactory)

A mock node brings up a suite of in-memory services in a fast manner suitable for unit testing. Components that do IO are either swapped out for mocks, or pointed to a Jimfs in memory filesystem.

@@ -91,20 +91,20 @@ Components that do IO are either swapped out for mocks, or pointed to a addressToNode -fun addressToNode(address: SingleMessageRecipient): MockNode +fun addressToNode(address: SingleMessageRecipient): MockNode createNode -fun createNode(networkMapAddress: NodeInfo? = null, forcedID: Int = -1, nodeFactory: Factory = defaultFactory, vararg advertisedServices: ServiceType): MockNode

Returns a started node, optionally created by the passed factory method

+fun createNode(networkMapAddress: NodeInfo? = null, forcedID: Int = -1, nodeFactory: Factory = defaultFactory, vararg advertisedServices: ServiceType): MockNode

Returns a started node, optionally created by the passed factory method

createTwoNodes -fun createTwoNodes(nodeFactory: Factory = defaultFactory): <ERROR CLASS><MockNode, MockNode>

Sets up a two node network, in which the first node runs network map and timestamping services and the other +fun createTwoNodes(nodeFactory: Factory = defaultFactory): <ERROR CLASS><MockNode, MockNode>

Sets up a two node network, in which the first node runs network map and timestamping services and the other doesnt.

@@ -112,8 +112,8 @@ doesnt.

runNetwork -fun runNetwork(rounds: Int = -1): Unit

Asks every node in order to process any queued up inbound messages. This may in turn result in nodes -sending more messages to each other, thus, a typical usage is to call runNetwork with the rounds +fun runNetwork(rounds: Int = -1): Unit

Asks every node in order to process any queued up inbound messages. This may in turn result in nodes +sending more messages to each other, thus, a typical usage is to call runNetwork with the rounds parameter set to -1 (the default) which simply runs as many rounds as necessary to result in network stability (no nodes sent any messages in the last round).

diff --git a/docs/build/html/api/core.testing/-mock-network/messaging-network.html b/docs/build/html/api/core.testing/-mock-network/messaging-network.html index 0ef8581db8..02b898c1ef 100644 --- a/docs/build/html/api/core.testing/-mock-network/messaging-network.html +++ b/docs/build/html/api/core.testing/-mock-network/messaging-network.html @@ -7,7 +7,7 @@ core.testing / MockNetwork / messagingNetwork

messagingNetwork

- + val messagingNetwork: InMemoryMessagingNetwork


diff --git a/docs/build/html/api/core.testing/-mock-network/nodes.html b/docs/build/html/api/core.testing/-mock-network/nodes.html index 46381893f7..6c0b1adc5f 100644 --- a/docs/build/html/api/core.testing/-mock-network/nodes.html +++ b/docs/build/html/api/core.testing/-mock-network/nodes.html @@ -7,7 +7,7 @@ core.testing / MockNetwork / nodes

nodes

- + val nodes: List<MockNode>

A read only view of the current set of executing nodes.


diff --git a/docs/build/html/api/core.testing/-mock-network/run-network.html b/docs/build/html/api/core.testing/-mock-network/run-network.html index 6d92852d14..1565b7df8b 100644 --- a/docs/build/html/api/core.testing/-mock-network/run-network.html +++ b/docs/build/html/api/core.testing/-mock-network/run-network.html @@ -7,10 +7,10 @@ core.testing / MockNetwork / runNetwork

runNetwork

- -fun runNetwork(rounds: Int = -1): Unit
+ +fun runNetwork(rounds: Int = -1): Unit

Asks every node in order to process any queued up inbound messages. This may in turn result in nodes -sending more messages to each other, thus, a typical usage is to call runNetwork with the rounds +sending more messages to each other, thus, a typical usage is to call runNetwork with the rounds parameter set to -1 (the default) which simply runs as many rounds as necessary to result in network stability (no nodes sent any messages in the last round).


diff --git a/docs/build/html/api/core.testing/-simulation/-bank-factory/counter.html b/docs/build/html/api/core.testing/-simulation/-bank-factory/counter.html index d369268411..660557053f 100644 --- a/docs/build/html/api/core.testing/-simulation/-bank-factory/counter.html +++ b/docs/build/html/api/core.testing/-simulation/-bank-factory/counter.html @@ -7,7 +7,7 @@ core.testing / Simulation / BankFactory / counter

counter

- + var counter: Int


diff --git a/docs/build/html/api/core.testing/-simulation/-bank-factory/create-all.html b/docs/build/html/api/core.testing/-simulation/-bank-factory/create-all.html index fa782fea0a..f859b25aae 100644 --- a/docs/build/html/api/core.testing/-simulation/-bank-factory/create-all.html +++ b/docs/build/html/api/core.testing/-simulation/-bank-factory/create-all.html @@ -7,7 +7,7 @@ core.testing / Simulation / BankFactory / createAll

createAll

- + fun createAll(): List<SimulatedNode>


diff --git a/docs/build/html/api/core.testing/-simulation/-bank-factory/create.html b/docs/build/html/api/core.testing/-simulation/-bank-factory/create.html index 73dc8dfd50..4524ec8e97 100644 --- a/docs/build/html/api/core.testing/-simulation/-bank-factory/create.html +++ b/docs/build/html/api/core.testing/-simulation/-bank-factory/create.html @@ -7,8 +7,8 @@ core.testing / Simulation / BankFactory / create

create

- -fun create(dir: Path, config: NodeConfiguration, network: MockNetwork, networkMapAddr: NodeInfo?, advertisedServices: Set<ServiceType>, id: Int): MockNode
+ +fun create(dir: Path, config: NodeConfiguration, network: MockNetwork, networkMapAddr: NodeInfo?, advertisedServices: Set<ServiceType>, id: Int): MockNode
Overrides Factory.create


diff --git a/docs/build/html/api/core.testing/-simulation/-bank-factory/index.html b/docs/build/html/api/core.testing/-simulation/-bank-factory/index.html index 53ab792516..6402326b10 100644 --- a/docs/build/html/api/core.testing/-simulation/-bank-factory/index.html +++ b/docs/build/html/api/core.testing/-simulation/-bank-factory/index.html @@ -39,7 +39,7 @@ create -fun create(dir: Path, config: NodeConfiguration, network: MockNetwork, networkMapAddr: NodeInfo?, advertisedServices: Set<ServiceType>, id: Int): MockNode +fun create(dir: Path, config: NodeConfiguration, network: MockNetwork, networkMapAddr: NodeInfo?, advertisedServices: Set<ServiceType>, id: Int): MockNode diff --git a/docs/build/html/api/core.testing/-simulation/-init-.html b/docs/build/html/api/core.testing/-simulation/-init-.html index 70eda4e879..1e0830f649 100644 --- a/docs/build/html/api/core.testing/-simulation/-init-.html +++ b/docs/build/html/api/core.testing/-simulation/-init-.html @@ -7,7 +7,7 @@ core.testing / Simulation / <init>

<init>

-Simulation(runAsync: Boolean, latencyInjector: LatencyCalculator?)
+Simulation(runAsync: Boolean, latencyInjector: LatencyCalculator?)

Base class for network simulations that are based on the unit test / mock environment.

Sets up some nodes that can run protocols between each other, and exposes their progress trackers. Provides banks in a few cities around the world.

diff --git a/docs/build/html/api/core.testing/-simulation/-network-map-node-factory/create.html b/docs/build/html/api/core.testing/-simulation/-network-map-node-factory/create.html index 46d5bbfa95..b154281ed8 100644 --- a/docs/build/html/api/core.testing/-simulation/-network-map-node-factory/create.html +++ b/docs/build/html/api/core.testing/-simulation/-network-map-node-factory/create.html @@ -7,8 +7,8 @@ core.testing / Simulation / NetworkMapNodeFactory / create

create

- -fun create(dir: Path, config: NodeConfiguration, network: MockNetwork, networkMapAddr: NodeInfo?, advertisedServices: Set<ServiceType>, id: Int): MockNode
+ +fun create(dir: Path, config: NodeConfiguration, network: MockNetwork, networkMapAddr: NodeInfo?, advertisedServices: Set<ServiceType>, id: Int): MockNode
Overrides Factory.create


diff --git a/docs/build/html/api/core.testing/-simulation/-network-map-node-factory/index.html b/docs/build/html/api/core.testing/-simulation/-network-map-node-factory/index.html index 1f3e20fdcd..9b06fe2a25 100644 --- a/docs/build/html/api/core.testing/-simulation/-network-map-node-factory/index.html +++ b/docs/build/html/api/core.testing/-simulation/-network-map-node-factory/index.html @@ -17,7 +17,7 @@ create -fun create(dir: Path, config: NodeConfiguration, network: MockNetwork, networkMapAddr: NodeInfo?, advertisedServices: Set<ServiceType>, id: Int): MockNode +fun create(dir: Path, config: NodeConfiguration, network: MockNetwork, networkMapAddr: NodeInfo?, advertisedServices: Set<ServiceType>, id: Int): MockNode diff --git a/docs/build/html/api/core.testing/-simulation/-rates-oracle-factory/create.html b/docs/build/html/api/core.testing/-simulation/-rates-oracle-factory/create.html index 3cb9a85be4..7cfa398f28 100644 --- a/docs/build/html/api/core.testing/-simulation/-rates-oracle-factory/create.html +++ b/docs/build/html/api/core.testing/-simulation/-rates-oracle-factory/create.html @@ -7,8 +7,8 @@ core.testing / Simulation / RatesOracleFactory / create

create

- -fun create(dir: Path, config: NodeConfiguration, network: MockNetwork, networkMapAddr: NodeInfo?, advertisedServices: Set<ServiceType>, id: Int): MockNode
+ +fun create(dir: Path, config: NodeConfiguration, network: MockNetwork, networkMapAddr: NodeInfo?, advertisedServices: Set<ServiceType>, id: Int): MockNode
Overrides Factory.create


diff --git a/docs/build/html/api/core.testing/-simulation/-rates-oracle-factory/index.html b/docs/build/html/api/core.testing/-simulation/-rates-oracle-factory/index.html index 3f0abf513d..ff365982dd 100644 --- a/docs/build/html/api/core.testing/-simulation/-rates-oracle-factory/index.html +++ b/docs/build/html/api/core.testing/-simulation/-rates-oracle-factory/index.html @@ -17,7 +17,7 @@ create -fun create(dir: Path, config: NodeConfiguration, network: MockNetwork, networkMapAddr: NodeInfo?, advertisedServices: Set<ServiceType>, id: Int): MockNode +fun create(dir: Path, config: NodeConfiguration, network: MockNetwork, networkMapAddr: NodeInfo?, advertisedServices: Set<ServiceType>, id: Int): MockNode diff --git a/docs/build/html/api/core.testing/-simulation/-regulator-factory/create.html b/docs/build/html/api/core.testing/-simulation/-regulator-factory/create.html index 420828e891..aa66d32143 100644 --- a/docs/build/html/api/core.testing/-simulation/-regulator-factory/create.html +++ b/docs/build/html/api/core.testing/-simulation/-regulator-factory/create.html @@ -7,8 +7,8 @@ core.testing / Simulation / RegulatorFactory / create

create

- -fun create(dir: Path, config: NodeConfiguration, network: MockNetwork, networkMapAddr: NodeInfo?, advertisedServices: Set<ServiceType>, id: Int): MockNode
+ +fun create(dir: Path, config: NodeConfiguration, network: MockNetwork, networkMapAddr: NodeInfo?, advertisedServices: Set<ServiceType>, id: Int): MockNode
Overrides Factory.create


diff --git a/docs/build/html/api/core.testing/-simulation/-regulator-factory/index.html b/docs/build/html/api/core.testing/-simulation/-regulator-factory/index.html index 457fd3265e..9622c3770b 100644 --- a/docs/build/html/api/core.testing/-simulation/-regulator-factory/index.html +++ b/docs/build/html/api/core.testing/-simulation/-regulator-factory/index.html @@ -17,7 +17,7 @@ create -fun create(dir: Path, config: NodeConfiguration, network: MockNetwork, networkMapAddr: NodeInfo?, advertisedServices: Set<ServiceType>, id: Int): MockNode +fun create(dir: Path, config: NodeConfiguration, network: MockNetwork, networkMapAddr: NodeInfo?, advertisedServices: Set<ServiceType>, id: Int): MockNode diff --git a/docs/build/html/api/core.testing/-simulation/-simulated-node/-init-.html b/docs/build/html/api/core.testing/-simulation/-simulated-node/-init-.html index 269717799b..e4c8c9b600 100644 --- a/docs/build/html/api/core.testing/-simulation/-simulated-node/-init-.html +++ b/docs/build/html/api/core.testing/-simulation/-simulated-node/-init-.html @@ -7,7 +7,7 @@ core.testing / Simulation / SimulatedNode / <init>

<init>

-SimulatedNode(dir: Path, config: NodeConfiguration, mockNet: MockNetwork, networkMapAddress: NodeInfo?, advertisedServices: Set<ServiceType>, id: Int)
+SimulatedNode(dir: Path, config: NodeConfiguration, mockNet: MockNetwork, networkMapAddress: NodeInfo?, advertisedServices: Set<ServiceType>, id: Int)


diff --git a/docs/build/html/api/core.testing/-simulation/-simulated-node/find-my-location.html b/docs/build/html/api/core.testing/-simulation/-simulated-node/find-my-location.html index e0933721c2..253438e867 100644 --- a/docs/build/html/api/core.testing/-simulation/-simulated-node/find-my-location.html +++ b/docs/build/html/api/core.testing/-simulation/-simulated-node/find-my-location.html @@ -7,7 +7,7 @@ core.testing / Simulation / SimulatedNode / findMyLocation

findMyLocation

- + protected open fun findMyLocation(): PhysicalLocation?
Overrides MockNode.findMyLocation

diff --git a/docs/build/html/api/core.testing/-simulation/-simulated-node/index.html b/docs/build/html/api/core.testing/-simulation/-simulated-node/index.html index 6eddc0eddd..1609411a7d 100644 --- a/docs/build/html/api/core.testing/-simulation/-simulated-node/index.html +++ b/docs/build/html/api/core.testing/-simulation/-simulated-node/index.html @@ -17,7 +17,7 @@ <init> -SimulatedNode(dir: Path, config: NodeConfiguration, mockNet: MockNetwork, networkMapAddress: NodeInfo?, advertisedServices: Set<ServiceType>, id: Int) +SimulatedNode(dir: Path, config: NodeConfiguration, mockNet: MockNetwork, networkMapAddress: NodeInfo?, advertisedServices: Set<ServiceType>, id: Int) diff --git a/docs/build/html/api/core.testing/-simulation/-timestamping-node-factory/create.html b/docs/build/html/api/core.testing/-simulation/-timestamping-node-factory/create.html index ea6005515c..877bb3d00d 100644 --- a/docs/build/html/api/core.testing/-simulation/-timestamping-node-factory/create.html +++ b/docs/build/html/api/core.testing/-simulation/-timestamping-node-factory/create.html @@ -7,8 +7,8 @@ core.testing / Simulation / TimestampingNodeFactory / create

create

- -fun create(dir: Path, config: NodeConfiguration, network: MockNetwork, networkMapAddr: NodeInfo?, advertisedServices: Set<ServiceType>, id: Int): MockNode
+ +fun create(dir: Path, config: NodeConfiguration, network: MockNetwork, networkMapAddr: NodeInfo?, advertisedServices: Set<ServiceType>, id: Int): MockNode
Overrides Factory.create


diff --git a/docs/build/html/api/core.testing/-simulation/-timestamping-node-factory/index.html b/docs/build/html/api/core.testing/-simulation/-timestamping-node-factory/index.html index 1c2517853a..cb27a851e4 100644 --- a/docs/build/html/api/core.testing/-simulation/-timestamping-node-factory/index.html +++ b/docs/build/html/api/core.testing/-simulation/-timestamping-node-factory/index.html @@ -17,7 +17,7 @@ create -fun create(dir: Path, config: NodeConfiguration, network: MockNetwork, networkMapAddr: NodeInfo?, advertisedServices: Set<ServiceType>, id: Int): MockNode +fun create(dir: Path, config: NodeConfiguration, network: MockNetwork, networkMapAddr: NodeInfo?, advertisedServices: Set<ServiceType>, id: Int): MockNode diff --git a/docs/build/html/api/core.testing/-simulation/all-protocol-steps.html b/docs/build/html/api/core.testing/-simulation/all-protocol-steps.html index 6f1811c960..ef1027edd3 100644 --- a/docs/build/html/api/core.testing/-simulation/all-protocol-steps.html +++ b/docs/build/html/api/core.testing/-simulation/all-protocol-steps.html @@ -7,7 +7,7 @@ core.testing / Simulation / allProtocolSteps

allProtocolSteps

- + val allProtocolSteps: <ERROR CLASS><<ERROR CLASS><SimulatedNode, Change>>


diff --git a/docs/build/html/api/core.testing/-simulation/bank-factory.html b/docs/build/html/api/core.testing/-simulation/bank-factory.html index 34e947fdfc..1f2bd2cc2d 100644 --- a/docs/build/html/api/core.testing/-simulation/bank-factory.html +++ b/docs/build/html/api/core.testing/-simulation/bank-factory.html @@ -7,7 +7,7 @@ core.testing / Simulation / bankFactory

bankFactory

- + val bankFactory: BankFactory


diff --git a/docs/build/html/api/core.testing/-simulation/bank-locations.html b/docs/build/html/api/core.testing/-simulation/bank-locations.html index 678ea3e1d2..db827ee0e7 100644 --- a/docs/build/html/api/core.testing/-simulation/bank-locations.html +++ b/docs/build/html/api/core.testing/-simulation/bank-locations.html @@ -7,7 +7,7 @@ core.testing / Simulation / bankLocations

bankLocations

- + val bankLocations: <ERROR CLASS>


diff --git a/docs/build/html/api/core.testing/-simulation/banks.html b/docs/build/html/api/core.testing/-simulation/banks.html index 327c39b2d9..7059f725ec 100644 --- a/docs/build/html/api/core.testing/-simulation/banks.html +++ b/docs/build/html/api/core.testing/-simulation/banks.html @@ -7,7 +7,7 @@ core.testing / Simulation / banks

banks

- + val banks: List<SimulatedNode>


diff --git a/docs/build/html/api/core.testing/-simulation/current-day.html b/docs/build/html/api/core.testing/-simulation/current-day.html index ccc1842d22..c240d26375 100644 --- a/docs/build/html/api/core.testing/-simulation/current-day.html +++ b/docs/build/html/api/core.testing/-simulation/current-day.html @@ -7,7 +7,7 @@ core.testing / Simulation / currentDay

currentDay

- + var currentDay: LocalDate

The current simulated date. By default this never changes. If you want it to change, you should do so from within your overridden iterate call. Changes in the current day surface in the dateChanges observable.

diff --git a/docs/build/html/api/core.testing/-simulation/date-changes.html b/docs/build/html/api/core.testing/-simulation/date-changes.html index 9e4ef67ebc..cf1eec7556 100644 --- a/docs/build/html/api/core.testing/-simulation/date-changes.html +++ b/docs/build/html/api/core.testing/-simulation/date-changes.html @@ -7,7 +7,7 @@ core.testing / Simulation / dateChanges

dateChanges

- + val dateChanges: <ERROR CLASS><LocalDate>


diff --git a/docs/build/html/api/core.testing/-simulation/done-steps.html b/docs/build/html/api/core.testing/-simulation/done-steps.html index a931f01cfb..92476cd437 100644 --- a/docs/build/html/api/core.testing/-simulation/done-steps.html +++ b/docs/build/html/api/core.testing/-simulation/done-steps.html @@ -7,7 +7,7 @@ core.testing / Simulation / doneSteps

doneSteps

- + val doneSteps: <ERROR CLASS><Collection<SimulatedNode>>


diff --git a/docs/build/html/api/core.testing/-simulation/extra-node-labels.html b/docs/build/html/api/core.testing/-simulation/extra-node-labels.html index f20204204b..6419256659 100644 --- a/docs/build/html/api/core.testing/-simulation/extra-node-labels.html +++ b/docs/build/html/api/core.testing/-simulation/extra-node-labels.html @@ -7,7 +7,7 @@ core.testing / Simulation / extraNodeLabels

extraNodeLabels

- + val extraNodeLabels: MutableMap<SimulatedNode, String>

A place for simulations to stash human meaningful text about what the node is "thinking", which might appear in the UI somewhere.

diff --git a/docs/build/html/api/core.testing/-simulation/index.html b/docs/build/html/api/core.testing/-simulation/index.html index e87ab68b37..92d937b976 100644 --- a/docs/build/html/api/core.testing/-simulation/index.html +++ b/docs/build/html/api/core.testing/-simulation/index.html @@ -63,7 +63,7 @@ in a few cities around the world.

<init> -Simulation(runAsync: Boolean, latencyInjector: LatencyCalculator?)

Base class for network simulations that are based on the unit test / mock environment.

+Simulation(runAsync: Boolean, latencyInjector: LatencyCalculator?)

Base class for network simulations that are based on the unit test / mock environment.

@@ -187,13 +187,13 @@ in the UI somewhere.

linkConsensus -fun linkConsensus(nodes: Collection<SimulatedNode>, protocol: ProtocolLogic<*>): Unit +fun linkConsensus(nodes: Collection<SimulatedNode>, protocol: ProtocolLogic<*>): Unit linkProtocolProgress -fun linkProtocolProgress(node: SimulatedNode, protocol: ProtocolLogic<*>): Unit +fun linkProtocolProgress(node: SimulatedNode, protocol: ProtocolLogic<*>): Unit @@ -205,7 +205,7 @@ in the UI somewhere.

startTradingCircle -fun startTradingCircle(tradeBetween: (Int, Int) -> <ERROR CLASS><out <ERROR CLASS>>): Unit

Given a function that returns a future, iterates that function with arguments like (0, 1), (1, 2), (2, 3) etc +fun startTradingCircle(tradeBetween: (Int, Int) -> <ERROR CLASS><out <ERROR CLASS>>): Unit

Given a function that returns a future, iterates that function with arguments like (0, 1), (1, 2), (2, 3) etc each time the returned future completes.

diff --git a/docs/build/html/api/core.testing/-simulation/iterate.html b/docs/build/html/api/core.testing/-simulation/iterate.html index e8971cfd88..dbf3135c30 100644 --- a/docs/build/html/api/core.testing/-simulation/iterate.html +++ b/docs/build/html/api/core.testing/-simulation/iterate.html @@ -7,7 +7,7 @@ core.testing / Simulation / iterate

iterate

- + open fun iterate(): Unit

Iterates the simulation by one step.

The default implementation circles around the nodes, pumping until one of them handles a message. The next call diff --git a/docs/build/html/api/core.testing/-simulation/latency-injector.html b/docs/build/html/api/core.testing/-simulation/latency-injector.html index 60b97e0b0a..eaa4152e8d 100644 --- a/docs/build/html/api/core.testing/-simulation/latency-injector.html +++ b/docs/build/html/api/core.testing/-simulation/latency-injector.html @@ -7,7 +7,7 @@ core.testing / Simulation / latencyInjector

latencyInjector

- + val latencyInjector: LatencyCalculator?


diff --git a/docs/build/html/api/core.testing/-simulation/link-consensus.html b/docs/build/html/api/core.testing/-simulation/link-consensus.html index d531ec62b4..0ebc392770 100644 --- a/docs/build/html/api/core.testing/-simulation/link-consensus.html +++ b/docs/build/html/api/core.testing/-simulation/link-consensus.html @@ -7,8 +7,8 @@ core.testing / Simulation / linkConsensus

linkConsensus

- -protected fun linkConsensus(nodes: Collection<SimulatedNode>, protocol: ProtocolLogic<*>): Unit
+ +protected fun linkConsensus(nodes: Collection<SimulatedNode>, protocol: ProtocolLogic<*>): Unit


diff --git a/docs/build/html/api/core.testing/-simulation/link-protocol-progress.html b/docs/build/html/api/core.testing/-simulation/link-protocol-progress.html index a87f8be26d..17d1ecc875 100644 --- a/docs/build/html/api/core.testing/-simulation/link-protocol-progress.html +++ b/docs/build/html/api/core.testing/-simulation/link-protocol-progress.html @@ -7,8 +7,8 @@ core.testing / Simulation / linkProtocolProgress

linkProtocolProgress

- -protected fun linkProtocolProgress(node: SimulatedNode, protocol: ProtocolLogic<*>): Unit
+ +protected fun linkProtocolProgress(node: SimulatedNode, protocol: ProtocolLogic<*>): Unit


diff --git a/docs/build/html/api/core.testing/-simulation/network-map.html b/docs/build/html/api/core.testing/-simulation/network-map.html index 0e6267bfe7..2c400bcc84 100644 --- a/docs/build/html/api/core.testing/-simulation/network-map.html +++ b/docs/build/html/api/core.testing/-simulation/network-map.html @@ -7,7 +7,7 @@ core.testing / Simulation / networkMap

networkMap

- + val networkMap: SimulatedNode


diff --git a/docs/build/html/api/core.testing/-simulation/network.html b/docs/build/html/api/core.testing/-simulation/network.html index 7969e71dca..a1d378ace3 100644 --- a/docs/build/html/api/core.testing/-simulation/network.html +++ b/docs/build/html/api/core.testing/-simulation/network.html @@ -7,7 +7,7 @@ core.testing / Simulation / network

network

- + val network: MockNetwork


diff --git a/docs/build/html/api/core.testing/-simulation/rates-oracle.html b/docs/build/html/api/core.testing/-simulation/rates-oracle.html index 6c44429d76..b694a64d0f 100644 --- a/docs/build/html/api/core.testing/-simulation/rates-oracle.html +++ b/docs/build/html/api/core.testing/-simulation/rates-oracle.html @@ -7,7 +7,7 @@ core.testing / Simulation / ratesOracle

ratesOracle

- + val ratesOracle: SimulatedNode


diff --git a/docs/build/html/api/core.testing/-simulation/regulators.html b/docs/build/html/api/core.testing/-simulation/regulators.html index 73eefc9f84..5707b0f37a 100644 --- a/docs/build/html/api/core.testing/-simulation/regulators.html +++ b/docs/build/html/api/core.testing/-simulation/regulators.html @@ -7,7 +7,7 @@ core.testing / Simulation / regulators

regulators

- + val regulators: List<SimulatedNode>


diff --git a/docs/build/html/api/core.testing/-simulation/run-async.html b/docs/build/html/api/core.testing/-simulation/run-async.html index 089def887d..a27cb3e5fe 100644 --- a/docs/build/html/api/core.testing/-simulation/run-async.html +++ b/docs/build/html/api/core.testing/-simulation/run-async.html @@ -7,7 +7,7 @@ core.testing / Simulation / runAsync

runAsync

- + val runAsync: Boolean


diff --git a/docs/build/html/api/core.testing/-simulation/service-providers.html b/docs/build/html/api/core.testing/-simulation/service-providers.html index 6064a096c8..6523d6de47 100644 --- a/docs/build/html/api/core.testing/-simulation/service-providers.html +++ b/docs/build/html/api/core.testing/-simulation/service-providers.html @@ -7,7 +7,7 @@ core.testing / Simulation / serviceProviders

serviceProviders

- + val serviceProviders: List<SimulatedNode>


diff --git a/docs/build/html/api/core.testing/-simulation/start-trading-circle.html b/docs/build/html/api/core.testing/-simulation/start-trading-circle.html index 2d7c99f73c..5ec052fb3c 100644 --- a/docs/build/html/api/core.testing/-simulation/start-trading-circle.html +++ b/docs/build/html/api/core.testing/-simulation/start-trading-circle.html @@ -7,8 +7,8 @@ core.testing / Simulation / startTradingCircle

startTradingCircle

- -fun startTradingCircle(tradeBetween: (Int, Int) -> <ERROR CLASS><out <ERROR CLASS>>): Unit
+ +fun startTradingCircle(tradeBetween: (Int, Int) -> <ERROR CLASS><out <ERROR CLASS>>): Unit

Given a function that returns a future, iterates that function with arguments like (0, 1), (1, 2), (2, 3) etc each time the returned future completes.


diff --git a/docs/build/html/api/core.testing/-simulation/start.html b/docs/build/html/api/core.testing/-simulation/start.html index eadfabecd7..6ca7d43305 100644 --- a/docs/build/html/api/core.testing/-simulation/start.html +++ b/docs/build/html/api/core.testing/-simulation/start.html @@ -7,7 +7,7 @@ core.testing / Simulation / start

start

- + open fun start(): Unit


diff --git a/docs/build/html/api/core.testing/-simulation/stop.html b/docs/build/html/api/core.testing/-simulation/stop.html index 4061571a45..dc2d4a06f2 100644 --- a/docs/build/html/api/core.testing/-simulation/stop.html +++ b/docs/build/html/api/core.testing/-simulation/stop.html @@ -7,7 +7,7 @@ core.testing / Simulation / stop

stop

- + fun stop(): Unit


diff --git a/docs/build/html/api/core.testing/-simulation/timestamper.html b/docs/build/html/api/core.testing/-simulation/timestamper.html index cbe0c85086..30dd54082b 100644 --- a/docs/build/html/api/core.testing/-simulation/timestamper.html +++ b/docs/build/html/api/core.testing/-simulation/timestamper.html @@ -7,7 +7,7 @@ core.testing / Simulation / timestamper

timestamper

- + val timestamper: SimulatedNode


diff --git a/docs/build/html/api/core.testing/-trade-simulation/-init-.html b/docs/build/html/api/core.testing/-trade-simulation/-init-.html index a534d1b0bb..bb3c19a726 100644 --- a/docs/build/html/api/core.testing/-trade-simulation/-init-.html +++ b/docs/build/html/api/core.testing/-trade-simulation/-init-.html @@ -7,7 +7,7 @@ core.testing / TradeSimulation / <init>

<init>

-TradeSimulation(runAsync: Boolean, latencyInjector: LatencyCalculator?)
+TradeSimulation(runAsync: Boolean, latencyInjector: LatencyCalculator?)

Simulates a never ending series of trades that go pair-wise through the banks (e.g. A and B trade with each other, then B and C trade with each other, then C and A etc).


diff --git a/docs/build/html/api/core.testing/-trade-simulation/index.html b/docs/build/html/api/core.testing/-trade-simulation/index.html index d2401c5cec..a11130f762 100644 --- a/docs/build/html/api/core.testing/-trade-simulation/index.html +++ b/docs/build/html/api/core.testing/-trade-simulation/index.html @@ -19,7 +19,7 @@ then B and C trade with each other, then C and A etc).

<init> -TradeSimulation(runAsync: Boolean, latencyInjector: LatencyCalculator?)

Simulates a never ending series of trades that go pair-wise through the banks (e.g. A and B trade with each other, +TradeSimulation(runAsync: Boolean, latencyInjector: LatencyCalculator?)

Simulates a never ending series of trades that go pair-wise through the banks (e.g. A and B trade with each other, then B and C trade with each other, then C and A etc).

@@ -155,19 +155,19 @@ in the UI somewhere.

linkConsensus -fun linkConsensus(nodes: Collection<SimulatedNode>, protocol: ProtocolLogic<*>): Unit +fun linkConsensus(nodes: Collection<SimulatedNode>, protocol: ProtocolLogic<*>): Unit linkProtocolProgress -fun linkProtocolProgress(node: SimulatedNode, protocol: ProtocolLogic<*>): Unit +fun linkProtocolProgress(node: SimulatedNode, protocol: ProtocolLogic<*>): Unit startTradingCircle -fun startTradingCircle(tradeBetween: (Int, Int) -> <ERROR CLASS><out <ERROR CLASS>>): Unit

Given a function that returns a future, iterates that function with arguments like (0, 1), (1, 2), (2, 3) etc +fun startTradingCircle(tradeBetween: (Int, Int) -> <ERROR CLASS><out <ERROR CLASS>>): Unit

Given a function that returns a future, iterates that function with arguments like (0, 1), (1, 2), (2, 3) etc each time the returned future completes.

diff --git a/docs/build/html/api/core.testing/-trade-simulation/start.html b/docs/build/html/api/core.testing/-trade-simulation/start.html index 52c44ce7ab..1df2e8ae8f 100644 --- a/docs/build/html/api/core.testing/-trade-simulation/start.html +++ b/docs/build/html/api/core.testing/-trade-simulation/start.html @@ -7,7 +7,7 @@ core.testing / TradeSimulation / start

start

- + fun start(): Unit
Overrides Simulation.start

diff --git a/docs/build/html/api/core.utilities/-a-n-s-i-progress-renderer/progress-tracker.html b/docs/build/html/api/core.utilities/-a-n-s-i-progress-renderer/progress-tracker.html index 7e37f12890..c1cce1d269 100644 --- a/docs/build/html/api/core.utilities/-a-n-s-i-progress-renderer/progress-tracker.html +++ b/docs/build/html/api/core.utilities/-a-n-s-i-progress-renderer/progress-tracker.html @@ -7,7 +7,7 @@ core.utilities / ANSIProgressRenderer / progressTracker

progressTracker

- + var progressTracker: ProgressTracker?


diff --git a/docs/build/html/api/core.utilities/-affinity-executor/-gate/-init-.html b/docs/build/html/api/core.utilities/-affinity-executor/-gate/-init-.html index 80062a2c6f..1181b98183 100644 --- a/docs/build/html/api/core.utilities/-affinity-executor/-gate/-init-.html +++ b/docs/build/html/api/core.utilities/-affinity-executor/-gate/-init-.html @@ -7,7 +7,7 @@ core.utilities / AffinityExecutor / Gate / <init>

<init>

-Gate(alwaysQueue: Boolean = false)
+Gate(alwaysQueue: Boolean = false)

An executor useful for unit tests: allows the current thread to block until a command arrives from another thread, which is then executed. Inbound closures/commands stack up until they are cleared by looping.

Parameters

diff --git a/docs/build/html/api/core.utilities/-affinity-executor/-gate/execute.html b/docs/build/html/api/core.utilities/-affinity-executor/-gate/execute.html index 762d8ce916..46116b5916 100644 --- a/docs/build/html/api/core.utilities/-affinity-executor/-gate/execute.html +++ b/docs/build/html/api/core.utilities/-affinity-executor/-gate/execute.html @@ -7,8 +7,8 @@ core.utilities / AffinityExecutor / Gate / execute

execute

- -fun execute(command: Runnable): Unit
+ +fun execute(command: Runnable): Unit


diff --git a/docs/build/html/api/core.utilities/-affinity-executor/-gate/index.html b/docs/build/html/api/core.utilities/-affinity-executor/-gate/index.html index 0193716541..740559855f 100644 --- a/docs/build/html/api/core.utilities/-affinity-executor/-gate/index.html +++ b/docs/build/html/api/core.utilities/-affinity-executor/-gate/index.html @@ -22,7 +22,7 @@ thread, which is then executed. Inbound closures/commands stack up until they ar <init> -Gate(alwaysQueue: Boolean = false)

An executor useful for unit tests: allows the current thread to block until a command arrives from another +Gate(alwaysQueue: Boolean = false)

An executor useful for unit tests: allows the current thread to block until a command arrives from another thread, which is then executed. Inbound closures/commands stack up until they are cleared by looping.

@@ -53,7 +53,7 @@ thread, which is then executed. Inbound closures/commands stack up until they ar execute -fun execute(command: Runnable): Unit +fun execute(command: Runnable): Unit @@ -77,14 +77,14 @@ thread, which is then executed. Inbound closures/commands stack up until they ar executeASAP -open fun executeASAP(runnable: () -> Unit): Unit

If isOnThread() then runnable is invoked immediately, otherwise the closure is queued onto the backing thread.

+open fun executeASAP(runnable: () -> Unit): Unit

If isOnThread() then runnable is invoked immediately, otherwise the closure is queued onto the backing thread.

fetchFrom -open fun <T> fetchFrom(fetcher: () -> T): T

Runs the given function on the executor, blocking until the result is available. Be careful not to deadlock this +open fun <T> fetchFrom(fetcher: () -> T): T

Runs the given function on the executor, blocking until the result is available. Be careful not to deadlock this way Make sure the executor cant possibly be waiting for the calling thread.

diff --git a/docs/build/html/api/core.utilities/-affinity-executor/-gate/is-on-thread.html b/docs/build/html/api/core.utilities/-affinity-executor/-gate/is-on-thread.html index 916f62897a..da2413cd7c 100644 --- a/docs/build/html/api/core.utilities/-affinity-executor/-gate/is-on-thread.html +++ b/docs/build/html/api/core.utilities/-affinity-executor/-gate/is-on-thread.html @@ -7,7 +7,7 @@ core.utilities / AffinityExecutor / Gate / isOnThread

isOnThread

- + val isOnThread: Boolean
Overrides AffinityExecutor.isOnThread

Returns true if the current thread is equal to the thread this executor is backed by.

diff --git a/docs/build/html/api/core.utilities/-affinity-executor/-gate/task-queue-size.html b/docs/build/html/api/core.utilities/-affinity-executor/-gate/task-queue-size.html index 79ab88d13b..33451fcce0 100644 --- a/docs/build/html/api/core.utilities/-affinity-executor/-gate/task-queue-size.html +++ b/docs/build/html/api/core.utilities/-affinity-executor/-gate/task-queue-size.html @@ -7,7 +7,7 @@ core.utilities / AffinityExecutor / Gate / taskQueueSize

taskQueueSize

- + val taskQueueSize: Int


diff --git a/docs/build/html/api/core.utilities/-affinity-executor/-gate/wait-and-run.html b/docs/build/html/api/core.utilities/-affinity-executor/-gate/wait-and-run.html index 9f04059860..a2a3865c4f 100644 --- a/docs/build/html/api/core.utilities/-affinity-executor/-gate/wait-and-run.html +++ b/docs/build/html/api/core.utilities/-affinity-executor/-gate/wait-and-run.html @@ -7,7 +7,7 @@ core.utilities / AffinityExecutor / Gate / waitAndRun

waitAndRun

- + fun waitAndRun(): Unit


diff --git a/docs/build/html/api/core.utilities/-affinity-executor/-s-a-m-e_-t-h-r-e-a-d.html b/docs/build/html/api/core.utilities/-affinity-executor/-s-a-m-e_-t-h-r-e-a-d.html index 116d1a630d..32c338ce55 100644 --- a/docs/build/html/api/core.utilities/-affinity-executor/-s-a-m-e_-t-h-r-e-a-d.html +++ b/docs/build/html/api/core.utilities/-affinity-executor/-s-a-m-e_-t-h-r-e-a-d.html @@ -7,7 +7,7 @@ core.utilities / AffinityExecutor / SAME_THREAD

SAME_THREAD

- + val SAME_THREAD: AffinityExecutor


diff --git a/docs/build/html/api/core.utilities/-affinity-executor/-service-affinity-executor/-init-.html b/docs/build/html/api/core.utilities/-affinity-executor/-service-affinity-executor/-init-.html index 2c36d61ab8..50167ff139 100644 --- a/docs/build/html/api/core.utilities/-affinity-executor/-service-affinity-executor/-init-.html +++ b/docs/build/html/api/core.utilities/-affinity-executor/-service-affinity-executor/-init-.html @@ -7,7 +7,7 @@ core.utilities / AffinityExecutor / ServiceAffinityExecutor / <init>

<init>

-ServiceAffinityExecutor(threadName: String, numThreads: Int)
+ServiceAffinityExecutor(threadName: String, numThreads: Int)

An executor backed by thread pool (which may often have a single thread) which makes it easy to schedule tasks in the future and verify code is running on the executor.


diff --git a/docs/build/html/api/core.utilities/-affinity-executor/-service-affinity-executor/after-execute.html b/docs/build/html/api/core.utilities/-affinity-executor/-service-affinity-executor/after-execute.html index 6e22ad5b7d..0c676d2ca7 100644 --- a/docs/build/html/api/core.utilities/-affinity-executor/-service-affinity-executor/after-execute.html +++ b/docs/build/html/api/core.utilities/-affinity-executor/-service-affinity-executor/after-execute.html @@ -7,8 +7,8 @@ core.utilities / AffinityExecutor / ServiceAffinityExecutor / afterExecute

afterExecute

- -protected fun afterExecute(r: Runnable, t: Throwable?): Unit
+ +protected fun afterExecute(r: Runnable, t: Throwable?): Unit


diff --git a/docs/build/html/api/core.utilities/-affinity-executor/-service-affinity-executor/index.html b/docs/build/html/api/core.utilities/-affinity-executor/-service-affinity-executor/index.html index cfec5ab733..d5f202e67e 100644 --- a/docs/build/html/api/core.utilities/-affinity-executor/-service-affinity-executor/index.html +++ b/docs/build/html/api/core.utilities/-affinity-executor/-service-affinity-executor/index.html @@ -19,7 +19,7 @@ tasks in the future and verify code is running on the executor.

<init> -ServiceAffinityExecutor(threadName: String, numThreads: Int)

An executor backed by thread pool (which may often have a single thread) which makes it easy to schedule +ServiceAffinityExecutor(threadName: String, numThreads: Int)

An executor backed by thread pool (which may often have a single thread) which makes it easy to schedule tasks in the future and verify code is running on the executor.

@@ -50,7 +50,7 @@ tasks in the future and verify code is running on the executor.

afterExecute -fun afterExecute(r: Runnable, t: Throwable?): Unit +fun afterExecute(r: Runnable, t: Throwable?): Unit @@ -68,14 +68,14 @@ tasks in the future and verify code is running on the executor.

executeASAP -open fun executeASAP(runnable: () -> Unit): Unit

If isOnThread() then runnable is invoked immediately, otherwise the closure is queued onto the backing thread.

+open fun executeASAP(runnable: () -> Unit): Unit

If isOnThread() then runnable is invoked immediately, otherwise the closure is queued onto the backing thread.

fetchFrom -open fun <T> fetchFrom(fetcher: () -> T): T

Runs the given function on the executor, blocking until the result is available. Be careful not to deadlock this +open fun <T> fetchFrom(fetcher: () -> T): T

Runs the given function on the executor, blocking until the result is available. Be careful not to deadlock this way Make sure the executor cant possibly be waiting for the calling thread.

diff --git a/docs/build/html/api/core.utilities/-affinity-executor/-service-affinity-executor/is-on-thread.html b/docs/build/html/api/core.utilities/-affinity-executor/-service-affinity-executor/is-on-thread.html index 540d7ad02a..545c9e7b31 100644 --- a/docs/build/html/api/core.utilities/-affinity-executor/-service-affinity-executor/is-on-thread.html +++ b/docs/build/html/api/core.utilities/-affinity-executor/-service-affinity-executor/is-on-thread.html @@ -7,7 +7,7 @@ core.utilities / AffinityExecutor / ServiceAffinityExecutor / isOnThread

isOnThread

- + val isOnThread: Boolean
Overrides AffinityExecutor.isOnThread

Returns true if the current thread is equal to the thread this executor is backed by.

diff --git a/docs/build/html/api/core.utilities/-affinity-executor/-service-affinity-executor/logger.html b/docs/build/html/api/core.utilities/-affinity-executor/-service-affinity-executor/logger.html index cb5083da7a..52b845dbcd 100644 --- a/docs/build/html/api/core.utilities/-affinity-executor/-service-affinity-executor/logger.html +++ b/docs/build/html/api/core.utilities/-affinity-executor/-service-affinity-executor/logger.html @@ -7,7 +7,7 @@ core.utilities / AffinityExecutor / ServiceAffinityExecutor / logger

logger

- + val logger: <ERROR CLASS>


diff --git a/docs/build/html/api/core.utilities/-affinity-executor/-service-affinity-executor/threads.html b/docs/build/html/api/core.utilities/-affinity-executor/-service-affinity-executor/threads.html index 131f2831fb..f9895cf6b1 100644 --- a/docs/build/html/api/core.utilities/-affinity-executor/-service-affinity-executor/threads.html +++ b/docs/build/html/api/core.utilities/-affinity-executor/-service-affinity-executor/threads.html @@ -7,7 +7,7 @@ core.utilities / AffinityExecutor / ServiceAffinityExecutor / threads

threads

- + protected val threads: MutableSet<Thread>


diff --git a/docs/build/html/api/core.utilities/-affinity-executor/check-on-thread.html b/docs/build/html/api/core.utilities/-affinity-executor/check-on-thread.html index 3e741168f2..3668e4acff 100644 --- a/docs/build/html/api/core.utilities/-affinity-executor/check-on-thread.html +++ b/docs/build/html/api/core.utilities/-affinity-executor/check-on-thread.html @@ -7,7 +7,7 @@ core.utilities / AffinityExecutor / checkOnThread

checkOnThread

- + open fun checkOnThread(): Unit

Throws an IllegalStateException if the current thread is not one of the threads this executor is backed by.


diff --git a/docs/build/html/api/core.utilities/-affinity-executor/execute-a-s-a-p.html b/docs/build/html/api/core.utilities/-affinity-executor/execute-a-s-a-p.html index ef2b92cc21..8aa52be3b2 100644 --- a/docs/build/html/api/core.utilities/-affinity-executor/execute-a-s-a-p.html +++ b/docs/build/html/api/core.utilities/-affinity-executor/execute-a-s-a-p.html @@ -7,8 +7,8 @@ core.utilities / AffinityExecutor / executeASAP

executeASAP

- -open fun executeASAP(runnable: () -> Unit): Unit
+ +open fun executeASAP(runnable: () -> Unit): Unit

If isOnThread() then runnable is invoked immediately, otherwise the closure is queued onto the backing thread.



diff --git a/docs/build/html/api/core.utilities/-affinity-executor/fetch-from.html b/docs/build/html/api/core.utilities/-affinity-executor/fetch-from.html index 0d61bdcd88..5071b552bc 100644 --- a/docs/build/html/api/core.utilities/-affinity-executor/fetch-from.html +++ b/docs/build/html/api/core.utilities/-affinity-executor/fetch-from.html @@ -7,8 +7,8 @@ core.utilities / AffinityExecutor / fetchFrom

fetchFrom

- -open fun <T> fetchFrom(fetcher: () -> T): T
+ +open fun <T> fetchFrom(fetcher: () -> T): T

Runs the given function on the executor, blocking until the result is available. Be careful not to deadlock this way Make sure the executor cant possibly be waiting for the calling thread.


diff --git a/docs/build/html/api/core.utilities/-affinity-executor/flush.html b/docs/build/html/api/core.utilities/-affinity-executor/flush.html index 585d8888de..2976adb566 100644 --- a/docs/build/html/api/core.utilities/-affinity-executor/flush.html +++ b/docs/build/html/api/core.utilities/-affinity-executor/flush.html @@ -7,7 +7,7 @@ core.utilities / AffinityExecutor / flush

flush

- + open fun flush(): Unit

Posts a no-op task to the executor and blocks this thread waiting for it to complete. This can be useful in tests when you want to be sure that a previous task submitted via execute has completed.

diff --git a/docs/build/html/api/core.utilities/-affinity-executor/index.html b/docs/build/html/api/core.utilities/-affinity-executor/index.html index c911c81f1b..9f9b90d695 100644 --- a/docs/build/html/api/core.utilities/-affinity-executor/index.html +++ b/docs/build/html/api/core.utilities/-affinity-executor/index.html @@ -59,14 +59,14 @@ tasks in the future and verify code is running on the executor.

executeASAP -open fun executeASAP(runnable: () -> Unit): Unit

If isOnThread() then runnable is invoked immediately, otherwise the closure is queued onto the backing thread.

+open fun executeASAP(runnable: () -> Unit): Unit

If isOnThread() then runnable is invoked immediately, otherwise the closure is queued onto the backing thread.

fetchFrom -open fun <T> fetchFrom(fetcher: () -> T): T

Runs the given function on the executor, blocking until the result is available. Be careful not to deadlock this +open fun <T> fetchFrom(fetcher: () -> T): T

Runs the given function on the executor, blocking until the result is available. Be careful not to deadlock this way Make sure the executor cant possibly be waiting for the calling thread.

diff --git a/docs/build/html/api/core.utilities/-affinity-executor/is-on-thread.html b/docs/build/html/api/core.utilities/-affinity-executor/is-on-thread.html index d8d7a70a7b..2c01605a26 100644 --- a/docs/build/html/api/core.utilities/-affinity-executor/is-on-thread.html +++ b/docs/build/html/api/core.utilities/-affinity-executor/is-on-thread.html @@ -7,7 +7,7 @@ core.utilities / AffinityExecutor / isOnThread

isOnThread

- + abstract val isOnThread: Boolean

Returns true if the current thread is equal to the thread this executor is backed by.


diff --git a/docs/build/html/api/core.utilities/-json-support/-calendar-deserializer/deserialize.html b/docs/build/html/api/core.utilities/-json-support/-calendar-deserializer/deserialize.html index f84a775a8f..278602f17f 100644 --- a/docs/build/html/api/core.utilities/-json-support/-calendar-deserializer/deserialize.html +++ b/docs/build/html/api/core.utilities/-json-support/-calendar-deserializer/deserialize.html @@ -7,8 +7,8 @@ core.utilities / JsonSupport / CalendarDeserializer / deserialize

deserialize

- -fun deserialize(parser: <ERROR CLASS>, context: <ERROR CLASS>): BusinessCalendar
+ +fun deserialize(parser: <ERROR CLASS>, context: <ERROR CLASS>): BusinessCalendar


diff --git a/docs/build/html/api/core.utilities/-json-support/-calendar-deserializer/index.html b/docs/build/html/api/core.utilities/-json-support/-calendar-deserializer/index.html index 880e0eb658..d90be12223 100644 --- a/docs/build/html/api/core.utilities/-json-support/-calendar-deserializer/index.html +++ b/docs/build/html/api/core.utilities/-json-support/-calendar-deserializer/index.html @@ -17,7 +17,7 @@ deserialize -fun deserialize(parser: <ERROR CLASS>, context: <ERROR CLASS>): BusinessCalendar +fun deserialize(parser: <ERROR CLASS>, context: <ERROR CLASS>): BusinessCalendar diff --git a/docs/build/html/api/core.utilities/-json-support/-local-date-deserializer/deserialize.html b/docs/build/html/api/core.utilities/-json-support/-local-date-deserializer/deserialize.html index d37c9d3fb2..3e55ca9a7b 100644 --- a/docs/build/html/api/core.utilities/-json-support/-local-date-deserializer/deserialize.html +++ b/docs/build/html/api/core.utilities/-json-support/-local-date-deserializer/deserialize.html @@ -7,8 +7,8 @@ core.utilities / JsonSupport / LocalDateDeserializer / deserialize

deserialize

- -fun deserialize(parser: <ERROR CLASS>, context: <ERROR CLASS>): LocalDate
+ +fun deserialize(parser: <ERROR CLASS>, context: <ERROR CLASS>): LocalDate


diff --git a/docs/build/html/api/core.utilities/-json-support/-local-date-deserializer/index.html b/docs/build/html/api/core.utilities/-json-support/-local-date-deserializer/index.html index 214de2e71f..274def104c 100644 --- a/docs/build/html/api/core.utilities/-json-support/-local-date-deserializer/index.html +++ b/docs/build/html/api/core.utilities/-json-support/-local-date-deserializer/index.html @@ -17,7 +17,7 @@ deserialize -fun deserialize(parser: <ERROR CLASS>, context: <ERROR CLASS>): LocalDate +fun deserialize(parser: <ERROR CLASS>, context: <ERROR CLASS>): LocalDate diff --git a/docs/build/html/api/core.utilities/-json-support/-local-date-key-deserializer/deserialize-key.html b/docs/build/html/api/core.utilities/-json-support/-local-date-key-deserializer/deserialize-key.html index e50468d71c..ee4101f83f 100644 --- a/docs/build/html/api/core.utilities/-json-support/-local-date-key-deserializer/deserialize-key.html +++ b/docs/build/html/api/core.utilities/-json-support/-local-date-key-deserializer/deserialize-key.html @@ -7,8 +7,8 @@ core.utilities / JsonSupport / LocalDateKeyDeserializer / deserializeKey

deserializeKey

- -fun deserializeKey(text: String, p1: <ERROR CLASS>): Any?
+ +fun deserializeKey(text: String, p1: <ERROR CLASS>): Any?


diff --git a/docs/build/html/api/core.utilities/-json-support/-local-date-key-deserializer/index.html b/docs/build/html/api/core.utilities/-json-support/-local-date-key-deserializer/index.html index 990c2b7c6e..80f9ee960b 100644 --- a/docs/build/html/api/core.utilities/-json-support/-local-date-key-deserializer/index.html +++ b/docs/build/html/api/core.utilities/-json-support/-local-date-key-deserializer/index.html @@ -17,7 +17,7 @@ deserializeKey -fun deserializeKey(text: String, p1: <ERROR CLASS>): Any? +fun deserializeKey(text: String, p1: <ERROR CLASS>): Any? diff --git a/docs/build/html/api/core.utilities/-json-support/-party-deserializer/deserialize.html b/docs/build/html/api/core.utilities/-json-support/-party-deserializer/deserialize.html index c68cf8b545..460ae0c9b2 100644 --- a/docs/build/html/api/core.utilities/-json-support/-party-deserializer/deserialize.html +++ b/docs/build/html/api/core.utilities/-json-support/-party-deserializer/deserialize.html @@ -7,8 +7,8 @@ core.utilities / JsonSupport / PartyDeserializer / deserialize

deserialize

- -fun deserialize(parser: <ERROR CLASS>, context: <ERROR CLASS>): Party
+ +fun deserialize(parser: <ERROR CLASS>, context: <ERROR CLASS>): Party


diff --git a/docs/build/html/api/core.utilities/-json-support/-party-deserializer/index.html b/docs/build/html/api/core.utilities/-json-support/-party-deserializer/index.html index 6da655e7d9..fe24fab30f 100644 --- a/docs/build/html/api/core.utilities/-json-support/-party-deserializer/index.html +++ b/docs/build/html/api/core.utilities/-json-support/-party-deserializer/index.html @@ -17,7 +17,7 @@ deserialize -fun deserialize(parser: <ERROR CLASS>, context: <ERROR CLASS>): Party +fun deserialize(parser: <ERROR CLASS>, context: <ERROR CLASS>): Party diff --git a/docs/build/html/api/core.utilities/-json-support/-party-serializer/index.html b/docs/build/html/api/core.utilities/-json-support/-party-serializer/index.html index c2279c24e2..f205bedcb5 100644 --- a/docs/build/html/api/core.utilities/-json-support/-party-serializer/index.html +++ b/docs/build/html/api/core.utilities/-json-support/-party-serializer/index.html @@ -17,7 +17,7 @@ serialize -fun serialize(obj: Party, generator: <ERROR CLASS>, provider: <ERROR CLASS>): Unit +fun serialize(obj: Party, generator: <ERROR CLASS>, provider: <ERROR CLASS>): Unit diff --git a/docs/build/html/api/core.utilities/-json-support/-party-serializer/serialize.html b/docs/build/html/api/core.utilities/-json-support/-party-serializer/serialize.html index 13cf63beb6..fa3256f293 100644 --- a/docs/build/html/api/core.utilities/-json-support/-party-serializer/serialize.html +++ b/docs/build/html/api/core.utilities/-json-support/-party-serializer/serialize.html @@ -7,8 +7,8 @@ core.utilities / JsonSupport / PartySerializer / serialize

serialize

- -fun serialize(obj: Party, generator: <ERROR CLASS>, provider: <ERROR CLASS>): Unit
+ +fun serialize(obj: Party, generator: <ERROR CLASS>, provider: <ERROR CLASS>): Unit


diff --git a/docs/build/html/api/core.utilities/-json-support/-secure-hash-deserializer/deserialize.html b/docs/build/html/api/core.utilities/-json-support/-secure-hash-deserializer/deserialize.html index 30f8f963c6..9264337714 100644 --- a/docs/build/html/api/core.utilities/-json-support/-secure-hash-deserializer/deserialize.html +++ b/docs/build/html/api/core.utilities/-json-support/-secure-hash-deserializer/deserialize.html @@ -7,8 +7,8 @@ core.utilities / JsonSupport / SecureHashDeserializer / deserialize

deserialize

- -fun deserialize(parser: <ERROR CLASS>, context: <ERROR CLASS>): T
+ +fun deserialize(parser: <ERROR CLASS>, context: <ERROR CLASS>): T


diff --git a/docs/build/html/api/core.utilities/-json-support/-secure-hash-deserializer/index.html b/docs/build/html/api/core.utilities/-json-support/-secure-hash-deserializer/index.html index 041a0f03b7..bfc5d550d1 100644 --- a/docs/build/html/api/core.utilities/-json-support/-secure-hash-deserializer/index.html +++ b/docs/build/html/api/core.utilities/-json-support/-secure-hash-deserializer/index.html @@ -30,7 +30,7 @@ deserialize -fun deserialize(parser: <ERROR CLASS>, context: <ERROR CLASS>): T +fun deserialize(parser: <ERROR CLASS>, context: <ERROR CLASS>): T diff --git a/docs/build/html/api/core.utilities/-json-support/-secure-hash-serializer/index.html b/docs/build/html/api/core.utilities/-json-support/-secure-hash-serializer/index.html index 2b33a2ba62..94143dd09c 100644 --- a/docs/build/html/api/core.utilities/-json-support/-secure-hash-serializer/index.html +++ b/docs/build/html/api/core.utilities/-json-support/-secure-hash-serializer/index.html @@ -17,7 +17,7 @@ serialize -fun serialize(obj: SecureHash, generator: <ERROR CLASS>, provider: <ERROR CLASS>): Unit +fun serialize(obj: SecureHash, generator: <ERROR CLASS>, provider: <ERROR CLASS>): Unit diff --git a/docs/build/html/api/core.utilities/-json-support/-secure-hash-serializer/serialize.html b/docs/build/html/api/core.utilities/-json-support/-secure-hash-serializer/serialize.html index 1a05012083..42754a6051 100644 --- a/docs/build/html/api/core.utilities/-json-support/-secure-hash-serializer/serialize.html +++ b/docs/build/html/api/core.utilities/-json-support/-secure-hash-serializer/serialize.html @@ -7,8 +7,8 @@ core.utilities / JsonSupport / SecureHashSerializer / serialize

serialize

- -fun serialize(obj: SecureHash, generator: <ERROR CLASS>, provider: <ERROR CLASS>): Unit
+ +fun serialize(obj: SecureHash, generator: <ERROR CLASS>, provider: <ERROR CLASS>): Unit


diff --git a/docs/build/html/api/core.utilities/-json-support/-service-hub-object-mapper/-init-.html b/docs/build/html/api/core.utilities/-json-support/-service-hub-object-mapper/-init-.html index 47967d5bbc..4ed2b36406 100644 --- a/docs/build/html/api/core.utilities/-json-support/-service-hub-object-mapper/-init-.html +++ b/docs/build/html/api/core.utilities/-json-support/-service-hub-object-mapper/-init-.html @@ -7,7 +7,7 @@ core.utilities / JsonSupport / ServiceHubObjectMapper / <init>

<init>

-ServiceHubObjectMapper(identities: IdentityService)
+ServiceHubObjectMapper(identities: IdentityService)


diff --git a/docs/build/html/api/core.utilities/-json-support/-service-hub-object-mapper/identities.html b/docs/build/html/api/core.utilities/-json-support/-service-hub-object-mapper/identities.html index f6d3707147..0aedeab517 100644 --- a/docs/build/html/api/core.utilities/-json-support/-service-hub-object-mapper/identities.html +++ b/docs/build/html/api/core.utilities/-json-support/-service-hub-object-mapper/identities.html @@ -7,7 +7,7 @@ core.utilities / JsonSupport / ServiceHubObjectMapper / identities

identities

- + val identities: IdentityService


diff --git a/docs/build/html/api/core.utilities/-json-support/-service-hub-object-mapper/index.html b/docs/build/html/api/core.utilities/-json-support/-service-hub-object-mapper/index.html index 4dd6b5f75b..b00d847843 100644 --- a/docs/build/html/api/core.utilities/-json-support/-service-hub-object-mapper/index.html +++ b/docs/build/html/api/core.utilities/-json-support/-service-hub-object-mapper/index.html @@ -17,7 +17,7 @@ <init> -ServiceHubObjectMapper(identities: IdentityService) +ServiceHubObjectMapper(identities: IdentityService) diff --git a/docs/build/html/api/core.utilities/-json-support/-to-string-serializer/index.html b/docs/build/html/api/core.utilities/-json-support/-to-string-serializer/index.html index de4d71944a..be38bf4a38 100644 --- a/docs/build/html/api/core.utilities/-json-support/-to-string-serializer/index.html +++ b/docs/build/html/api/core.utilities/-json-support/-to-string-serializer/index.html @@ -17,7 +17,7 @@ serialize -fun serialize(obj: Any, generator: <ERROR CLASS>, provider: <ERROR CLASS>): Unit +fun serialize(obj: Any, generator: <ERROR CLASS>, provider: <ERROR CLASS>): Unit diff --git a/docs/build/html/api/core.utilities/-json-support/-to-string-serializer/serialize.html b/docs/build/html/api/core.utilities/-json-support/-to-string-serializer/serialize.html index f922a020db..d9522ea5c6 100644 --- a/docs/build/html/api/core.utilities/-json-support/-to-string-serializer/serialize.html +++ b/docs/build/html/api/core.utilities/-json-support/-to-string-serializer/serialize.html @@ -7,8 +7,8 @@ core.utilities / JsonSupport / ToStringSerializer / serialize

serialize

- -fun serialize(obj: Any, generator: <ERROR CLASS>, provider: <ERROR CLASS>): Unit
+ +fun serialize(obj: Any, generator: <ERROR CLASS>, provider: <ERROR CLASS>): Unit


diff --git a/docs/build/html/api/core.utilities/-json-support/create-default-mapper.html b/docs/build/html/api/core.utilities/-json-support/create-default-mapper.html index 41df616812..9cdfffc069 100644 --- a/docs/build/html/api/core.utilities/-json-support/create-default-mapper.html +++ b/docs/build/html/api/core.utilities/-json-support/create-default-mapper.html @@ -7,8 +7,8 @@ core.utilities / JsonSupport / createDefaultMapper

createDefaultMapper

- -fun createDefaultMapper(identities: IdentityService): <ERROR CLASS>
+ +fun createDefaultMapper(identities: IdentityService): <ERROR CLASS>


diff --git a/docs/build/html/api/core.utilities/-json-support/index.html b/docs/build/html/api/core.utilities/-json-support/index.html index 817c73cf9e..39abc8dd84 100644 --- a/docs/build/html/api/core.utilities/-json-support/index.html +++ b/docs/build/html/api/core.utilities/-json-support/index.html @@ -79,7 +79,7 @@ the java.time API, some core types, and Kotlin data classes.

createDefaultMapper -fun createDefaultMapper(identities: IdentityService): <ERROR CLASS> +fun createDefaultMapper(identities: IdentityService): <ERROR CLASS> diff --git a/docs/build/html/api/demos.protocols/-auto-offer-protocol/-handler/index.html b/docs/build/html/api/demos.protocols/-auto-offer-protocol/-handler/index.html index f2e34a8c2d..9a1d5fc294 100644 --- a/docs/build/html/api/demos.protocols/-auto-offer-protocol/-handler/index.html +++ b/docs/build/html/api/demos.protocols/-auto-offer-protocol/-handler/index.html @@ -40,7 +40,7 @@ register -fun register(node: Node): Unit +fun register(node: Node): Unit diff --git a/docs/build/html/api/demos.protocols/-auto-offer-protocol/-handler/register.html b/docs/build/html/api/demos.protocols/-auto-offer-protocol/-handler/register.html index 2b95b68533..6c56d63d33 100644 --- a/docs/build/html/api/demos.protocols/-auto-offer-protocol/-handler/register.html +++ b/docs/build/html/api/demos.protocols/-auto-offer-protocol/-handler/register.html @@ -7,8 +7,8 @@ demos.protocols / AutoOfferProtocol / Handler / register

register

- -fun register(node: Node): Unit
+ +fun register(node: Node): Unit


diff --git a/docs/build/html/api/demos.protocols/-exit-server-protocol/-handler/index.html b/docs/build/html/api/demos.protocols/-exit-server-protocol/-handler/index.html index 8404579dc5..b156be284c 100644 --- a/docs/build/html/api/demos.protocols/-exit-server-protocol/-handler/index.html +++ b/docs/build/html/api/demos.protocols/-exit-server-protocol/-handler/index.html @@ -17,7 +17,7 @@ register -fun register(node: Node): Unit +fun register(node: Node): Unit diff --git a/docs/build/html/api/demos.protocols/-exit-server-protocol/-handler/register.html b/docs/build/html/api/demos.protocols/-exit-server-protocol/-handler/register.html index bf6eea4a3a..ff29881894 100644 --- a/docs/build/html/api/demos.protocols/-exit-server-protocol/-handler/register.html +++ b/docs/build/html/api/demos.protocols/-exit-server-protocol/-handler/register.html @@ -7,8 +7,8 @@ demos.protocols / ExitServerProtocol / Handler / register

register

- -fun register(node: Node): Unit
+ +fun register(node: Node): Unit


diff --git a/docs/build/html/api/demos.protocols/-update-business-day-protocol/-handler/index.html b/docs/build/html/api/demos.protocols/-update-business-day-protocol/-handler/index.html index 4591399b9b..20680ae378 100644 --- a/docs/build/html/api/demos.protocols/-update-business-day-protocol/-handler/index.html +++ b/docs/build/html/api/demos.protocols/-update-business-day-protocol/-handler/index.html @@ -17,7 +17,7 @@ register -fun register(node: Node): Unit +fun register(node: Node): Unit diff --git a/docs/build/html/api/demos.protocols/-update-business-day-protocol/-handler/register.html b/docs/build/html/api/demos.protocols/-update-business-day-protocol/-handler/register.html index bc1bf6e53f..c9e3fe27c2 100644 --- a/docs/build/html/api/demos.protocols/-update-business-day-protocol/-handler/register.html +++ b/docs/build/html/api/demos.protocols/-update-business-day-protocol/-handler/register.html @@ -7,8 +7,8 @@ demos.protocols / UpdateBusinessDayProtocol / Handler / register

register

- -fun register(node: Node): Unit
+ +fun register(node: Node): Unit


diff --git a/docs/build/html/api/index-outline.html b/docs/build/html/api/index-outline.html index d0a1b8402d..bab14905d6 100644 --- a/docs/build/html/api/index-outline.html +++ b/docs/build/html/api/index-outline.html @@ -40,15 +40,15 @@ -abstract fun buildTransaction(type: ContractDefRef, steps: List<TransactionBuildStep>): SerializedBytes<WireTransaction>
-abstract fun commitTransaction(tx: SerializedBytes<WireTransaction>, signatures: List<WithKey>): SecureHash
-abstract fun fetchProtocolsRequiringAttention(query: StatesQuery): Map<StateRef, ProtocolRequiringAttention>
-abstract fun fetchStates(states: List<StateRef>): Map<StateRef, ContractState?>
-abstract fun fetchTransactions(txs: List<SecureHash>): Map<SecureHash, SignedTransaction?>
-abstract fun generateTransactionSignature(tx: SerializedBytes<WireTransaction>): WithKey
-abstract fun invokeProtocolSync(type: ProtocolRef, args: Map<String, Any?>): Any?
-abstract fun provideProtocolResponse(protocol: ProtocolInstanceRef, choice: SecureHash, args: Map<String, Any?>): Unit
-abstract fun queryStates(query: StatesQuery): List<StateRef>
+abstract fun buildTransaction(type: ContractDefRef, steps: List<TransactionBuildStep>): SerializedBytes<WireTransaction>
+abstract fun commitTransaction(tx: SerializedBytes<WireTransaction>, signatures: List<WithKey>): SecureHash
+abstract fun fetchProtocolsRequiringAttention(query: StatesQuery): Map<StateRef, ProtocolRequiringAttention>
+abstract fun fetchStates(states: List<StateRef>): Map<StateRef, ContractState?>
+abstract fun fetchTransactions(txs: List<SecureHash>): Map<SecureHash, SignedTransaction?>
+abstract fun generateTransactionSignature(tx: SerializedBytes<WireTransaction>): WithKey
+abstract fun invokeProtocolSync(type: ProtocolRef, args: Map<String, Any?>): Any?
+abstract fun provideProtocolResponse(protocol: ProtocolInstanceRef, choice: SecureHash, args: Map<String, Any?>): Unit
+abstract fun queryStates(query: StatesQuery): List<StateRef>
abstract fun serverTime(): LocalDateTime
@@ -61,17 +61,17 @@ -APIServerImpl(node: AbstractNode)
-fun buildTransaction(type: ContractDefRef, steps: List<TransactionBuildStep>): SerializedBytes<WireTransaction>
-fun commitTransaction(tx: SerializedBytes<WireTransaction>, signatures: List<WithKey>): SecureHash
-fun fetchProtocolsRequiringAttention(query: StatesQuery): Map<StateRef, ProtocolRequiringAttention>
-fun fetchStates(states: List<StateRef>): Map<StateRef, ContractState?>
-fun fetchTransactions(txs: List<SecureHash>): Map<SecureHash, SignedTransaction?>
-fun generateTransactionSignature(tx: SerializedBytes<WireTransaction>): WithKey
-fun invokeProtocolSync(type: ProtocolRef, args: Map<String, Any?>): Any?
+APIServerImpl(node: AbstractNode)
+fun buildTransaction(type: ContractDefRef, steps: List<TransactionBuildStep>): SerializedBytes<WireTransaction>
+fun commitTransaction(tx: SerializedBytes<WireTransaction>, signatures: List<WithKey>): SecureHash
+fun fetchProtocolsRequiringAttention(query: StatesQuery): Map<StateRef, ProtocolRequiringAttention>
+fun fetchStates(states: List<StateRef>): Map<StateRef, ContractState?>
+fun fetchTransactions(txs: List<SecureHash>): Map<SecureHash, SignedTransaction?>
+fun generateTransactionSignature(tx: SerializedBytes<WireTransaction>): WithKey
+fun invokeProtocolSync(type: ProtocolRef, args: Map<String, Any?>): Any?
val node: AbstractNode
-fun provideProtocolResponse(protocol: ProtocolInstanceRef, choice: SecureHash, args: Map<String, Any?>): Unit
-fun queryStates(query: StatesQuery): List<StateRef>
+fun provideProtocolResponse(protocol: ProtocolInstanceRef, choice: SecureHash, args: Map<String, Any?>): Unit
+fun queryStates(query: StatesQuery): List<StateRef>
fun serverTime(): LocalDateTime
@@ -84,14 +84,14 @@ -AbstractNode(dir: Path, configuration: NodeConfiguration, initialNetworkMapAddress: NodeInfo?, advertisedServices: Set<ServiceType>, platformClock: Clock)
+AbstractNode(dir: Path, configuration: NodeConfiguration, initialNetworkMapAddress: NodeInfo?, advertisedServices: Set<ServiceType>, platformClock: Clock)
val PRIVATE_KEY_FILE_NAME: String
val PUBLIC_IDENTITY_FILE_NAME: String
protected val _servicesThatAcceptUploads: ArrayList<AcceptsFileUpload>
val advertisedServices: Set<ServiceType>
lateinit var api: APIServer
val configuration: NodeConfiguration
-protected open fun constructStorageService(attachments: NodeAttachmentService, checkpointStorage: CheckpointStorage, keypair: KeyPair, identity: Party): StorageServiceImpl
+protected open fun constructStorageService(attachments: NodeAttachmentService, checkpointStorage: CheckpointStorage, keypair: KeyPair, identity: Party): StorageServiceImpl
val dir: Path
protected open fun findMyLocation(): PhysicalLocation?
lateinit var identity: IdentityService
@@ -99,7 +99,7 @@ var inNodeTimestampingService: NodeTimestamperService?
val info: NodeInfo
val initialNetworkMapAddress: NodeInfo?
-protected open fun initialiseStorageService(dir: Path): StorageService
+protected open fun initialiseStorageService(dir: Path): StorageService
lateinit var interestRatesService: Service
lateinit var keyManagement: E2ETestKeyManagementService
protected abstract val log: <ERROR CLASS>
@@ -132,9 +132,9 @@ -AbstractNodeService(net: MessagingService)
-protected inline fun <reified Q : AbstractRequestMessage, reified R : Any> addMessageHandler(topic: String, crossinline handler: (Q) -> R, crossinline exceptionConsumer: (Message, Exception) -> Unit): Unit
-protected inline fun <reified Q : AbstractRequestMessage, reified R : Any> addMessageHandler(topic: String, crossinline handler: (Q) -> R): Unit
+AbstractNodeService(net: MessagingService)
+protected inline fun <reified Q : AbstractRequestMessage, reified R : Any> addMessageHandler(topic: String, crossinline handler: (Q) -> R, crossinline exceptionConsumer: (Message, Exception) -> Unit): Unit
+protected inline fun <reified Q : AbstractRequestMessage, reified R : Any> addMessageHandler(topic: String, crossinline handler: (Q) -> R): Unit
val net: MessagingService
@@ -163,7 +163,7 @@ abstract val acceptableFileExtensions: List<String>
abstract val dataTypePrefix: String
-abstract fun upload(data: InputStream): String
+abstract fun upload(data: InputStream): String
@@ -209,8 +209,8 @@ -Gate(alwaysQueue: Boolean = false)
-fun execute(command: Runnable): Unit
+Gate(alwaysQueue: Boolean = false)
+fun execute(command: Runnable): Unit
val isOnThread: Boolean
val taskQueueSize: Int
fun waitAndRun(): Unit
@@ -226,8 +226,8 @@ -ServiceAffinityExecutor(threadName: String, numThreads: Int)
-protected fun afterExecute(r: Runnable, t: Throwable?): Unit
+ServiceAffinityExecutor(threadName: String, numThreads: Int)
+protected fun afterExecute(r: Runnable, t: Throwable?): Unit
val isOnThread: Boolean
val logger: <ERROR CLASS>
protected val threads: MutableSet<Thread>
@@ -235,8 +235,8 @@ open fun checkOnThread(): Unit
-open fun executeASAP(runnable: () -> Unit): Unit
-open fun <T> fetchFrom(fetcher: () -> T): T
+open fun executeASAP(runnable: () -> Unit): Unit
+open fun <T> fetchFrom(fetcher: () -> T): T
open fun flush(): Unit
abstract val isOnThread: Boolean
@@ -274,7 +274,7 @@ -ArtemisMessagingService(directory: Path, myHostPort: <ERROR CLASS>, defaultExecutor: Executor = RunOnCallerThread)
+ArtemisMessagingService(directory: Path, myHostPort: <ERROR CLASS>, defaultExecutor: Executor = RunOnCallerThread)
inner class Handler : MessageHandlerRegistration
val TOPIC_PROPERTY: String
-fun addMessageHandler(topic: String, executor: Executor?, callback: (Message, MessageHandlerRegistration) -> Unit): MessageHandlerRegistration
-fun createMessage(topic: String, data: ByteArray): Message
+fun addMessageHandler(topic: String, executor: Executor?, callback: (Message, MessageHandlerRegistration) -> Unit): MessageHandlerRegistration
+fun createMessage(topic: String, data: ByteArray): Message
val defaultExecutor: Executor
val directory: Path
val log: <ERROR CLASS>
-fun makeRecipient(hostAndPort: <ERROR CLASS>): SingleMessageRecipient
-fun makeRecipient(hostname: String): <ERROR CLASS>
+fun makeRecipient(hostAndPort: <ERROR CLASS>): SingleMessageRecipient
+fun makeRecipient(hostname: String): <ERROR CLASS>
val myAddress: SingleMessageRecipient
val myHostPort: <ERROR CLASS>
-fun removeMessageHandler(registration: MessageHandlerRegistration): Unit
-fun send(message: Message, target: MessageRecipients): Unit
+fun removeMessageHandler(registration: MessageHandlerRegistration): Unit
+fun send(message: Message, target: MessageRecipients): Unit
fun start(): Unit
fun stop(): Unit
-fun toHostAndPort(hostname: String): <ERROR CLASS>
+fun toHostAndPort(hostname: String): <ERROR CLASS>
@@ -331,7 +331,7 @@ AttachmentDownloadServlet()
-fun doGet(req: <ERROR CLASS>, resp: <ERROR CLASS>): Unit
+fun doGet(req: <ERROR CLASS>, resp: <ERROR CLASS>): Unit
@@ -440,7 +440,7 @@ object DEALING : Step
object RECEIVED : Step
-fun register(node: Node): Unit
+fun register(node: Node): Unit
fun tracker(): <ERROR CLASS>
@@ -614,7 +614,7 @@ -Checkpoint(serialisedFiber: SerializedBytes<ProtocolStateMachine<*>>, awaitingTopic: String, awaitingObjectOfType: String)
+Checkpoint(serialisedFiber: SerializedBytes<ProtocolStateMachine<*>>, awaitingTopic: String, awaitingObjectOfType: String)
val awaitingObjectOfType: String
val awaitingTopic: String
val serialisedFiber: SerializedBytes<ProtocolStateMachine<*>>
@@ -630,9 +630,9 @@ -abstract fun addCheckpoint(checkpoint: Checkpoint): Unit
+abstract fun addCheckpoint(checkpoint: Checkpoint): Unit
abstract val checkpoints: Iterable<Checkpoint>
-abstract fun removeCheckpoint(checkpoint: Checkpoint): Unit
+abstract fun removeCheckpoint(checkpoint: Checkpoint): Unit
@@ -761,9 +761,9 @@ -Config(services: ServiceHub)
+Config(services: ServiceHub)
val defaultObjectMapper: <ERROR CLASS>
-fun getContext(type: Class<*>): <ERROR CLASS>
+fun getContext(type: Class<*>): <ERROR CLASS>
val services: ServiceHub
@@ -776,7 +776,7 @@ -ConfigurationException(message: String)
+ConfigurationException(message: String)
@@ -801,7 +801,7 @@ -ContractClassRef(className: String)
+ContractClassRef(className: String)
val className: String
@@ -815,7 +815,7 @@ -ContractLedgerRef(hash: SecureHash)
+ContractLedgerRef(hash: SecureHash)
val hash: SecureHash
@@ -967,7 +967,7 @@ DataUploadServlet()
-fun doPost(req: <ERROR CLASS>, resp: <ERROR CLASS>): Unit
+fun doPost(req: <ERROR CLASS>, resp: <ERROR CLASS>): Unit
@@ -979,7 +979,7 @@ -DataVendingService(net: MessagingService, storage: StorageService)
+DataVendingService(net: MessagingService, storage: StorageService)
class Request : AbstractRequestMessage
@@ -1752,7 +1752,7 @@ -IRSSimulation(runAsync: Boolean, latencyInjector: LatencyCalculator?)
+IRSSimulation(runAsync: Boolean, latencyInjector: LatencyCalculator?)
fun iterate(): Unit
val om: <ERROR CLASS>
fun start(): Unit
@@ -1800,9 +1800,9 @@ InMemoryIdentityService()
-fun partyFromKey(key: PublicKey): Party?
-fun partyFromName(name: String): Party?
-fun registerIdentity(party: Party): Unit
+fun partyFromKey(key: PublicKey): Party?
+fun partyFromName(name: String): Party?
+fun registerIdentity(party: Party): Unit
@@ -1823,7 +1823,7 @@ -Builder(manuallyPumped: Boolean, id: Handle)
+Builder(manuallyPumped: Boolean, id: Handle)
val id: Handle
val manuallyPumped: Boolean
fun start(): <ERROR CLASS><InMemoryMessaging>
@@ -1838,8 +1838,8 @@ -Handle(id: Int)
-fun equals(other: Any?): Boolean
+Handle(id: Int)
+fun equals(other: Any?): Boolean
fun hashCode(): Int
val id: Int
fun toString(): String
@@ -1854,7 +1854,7 @@ -InMemoryMessaging(manuallyPumped: Boolean, handle: Handle)
+InMemoryMessaging(manuallyPumped: Boolean, handle: Handle)
inner class Handler : MessageHandlerRegistration
-fun addMessageHandler(topic: String, executor: Executor?, callback: (Message, MessageHandlerRegistration) -> Unit): MessageHandlerRegistration
+fun addMessageHandler(topic: String, executor: Executor?, callback: (Message, MessageHandlerRegistration) -> Unit): MessageHandlerRegistration
protected val backgroundThread: Nothing?
-fun createMessage(topic: String, data: ByteArray): Message
+fun createMessage(topic: String, data: ByteArray): Message
val myAddress: SingleMessageRecipient
-fun pump(block: Boolean): Boolean
-fun removeMessageHandler(registration: MessageHandlerRegistration): Unit
+fun pump(block: Boolean): Boolean
+fun removeMessageHandler(registration: MessageHandlerRegistration): Unit
protected var running: Boolean
-fun send(message: Message, target: MessageRecipients): Unit
+fun send(message: Message, target: MessageRecipients): Unit
protected val state: ThreadBox<InnerState>
fun stop(): Unit
@@ -1905,17 +1905,17 @@ -abstract fun between(sender: SingleMessageRecipient, receiver: SingleMessageRecipient): Duration
+abstract fun between(sender: SingleMessageRecipient, receiver: SingleMessageRecipient): Duration
val allMessages: <ERROR CLASS><<ERROR CLASS><SingleMessageRecipient, Message, MessageRecipients>>
-fun createNode(manuallyPumped: Boolean): <ERROR CLASS><Handle, MessagingServiceBuilder<InMemoryMessaging>>
-fun createNodeWithID(manuallyPumped: Boolean, id: Int): MessagingServiceBuilder<InMemoryMessaging>
+fun createNode(manuallyPumped: Boolean): <ERROR CLASS><Handle, MessagingServiceBuilder<InMemoryMessaging>>
+fun createNodeWithID(manuallyPumped: Boolean, id: Int): MessagingServiceBuilder<InMemoryMessaging>
val endpoints: List<InMemoryMessaging>
val everyoneOnline: AllPossibleRecipients
var latencyCalculator: LatencyCalculator?
-fun setupTimestampingNode(manuallyPumped: Boolean): <ERROR CLASS><NodeInfo, InMemoryMessaging>
+fun setupTimestampingNode(manuallyPumped: Boolean): <ERROR CLASS><NodeInfo, InMemoryMessaging>
fun stop(): Unit
@@ -1929,19 +1929,19 @@ InMemoryNetworkMapCache()
-open fun addMapService(smm: StateMachineManager, net: MessagingService, service: NodeInfo, subscribe: Boolean, ifChangedSinceVer: Int?): <ERROR CLASS><Unit>
-open fun addNode(node: NodeInfo): Unit
-open fun deregisterForUpdates(smm: StateMachineManager, net: MessagingService, service: NodeInfo): <ERROR CLASS><Unit>
+open fun addMapService(smm: StateMachineManager, net: MessagingService, service: NodeInfo, subscribe: Boolean, ifChangedSinceVer: Int?): <ERROR CLASS><Unit>
+open fun addNode(node: NodeInfo): Unit
+open fun deregisterForUpdates(smm: StateMachineManager, net: MessagingService, service: NodeInfo): <ERROR CLASS><Unit>
open fun get(): <ERROR CLASS>
-open fun get(serviceType: ServiceType): <ERROR CLASS>
-open fun getRecommended(type: ServiceType, contract: Contract, vararg party: Party): NodeInfo?
+open fun get(serviceType: ServiceType): <ERROR CLASS>
+open fun getRecommended(type: ServiceType, contract: Contract, vararg party: Party): NodeInfo?
open val networkMapNodes: List<NodeInfo>
open val partyNodes: List<NodeInfo>
-fun processUpdatePush(req: Update): Unit
+fun processUpdatePush(req: Update): Unit
open val ratesOracleNodes: List<NodeInfo>
protected var registeredNodes: MutableMap<Party, NodeInfo>
open val regulators: List<NodeInfo>
-open fun removeNode(node: NodeInfo): Unit
+open fun removeNode(node: NodeInfo): Unit
open val timestampingNodes: List<NodeInfo>
@@ -1954,18 +1954,18 @@ -InMemoryNetworkMapService(net: MessagingService, home: NodeRegistration, cache: NetworkMapCache)
+InMemoryNetworkMapService(net: MessagingService, home: NodeRegistration, cache: NetworkMapCache)
val cache: NetworkMapCache
-fun getUnacknowledgedCount(subscriber: SingleMessageRecipient): Int?
+fun getUnacknowledgedCount(subscriber: SingleMessageRecipient): Int?
val maxSizeRegistrationRequestBytes: Int
val maxUnacknowledgedUpdates: Int
val nodes: List<NodeInfo>
-fun notifySubscribers(wireReg: WireNodeRegistration): Unit
-fun processAcknowledge(req: UpdateAcknowledge): Unit
-fun processFetchAllRequest(req: FetchMapRequest): FetchMapResponse
-fun processQueryRequest(req: QueryIdentityRequest): QueryIdentityResponse
-fun processRegistrationChangeRequest(req: RegistrationRequest): RegistrationResponse
-fun processSubscriptionRequest(req: SubscribeRequest): SubscribeResponse
+fun notifySubscribers(wireReg: WireNodeRegistration): Unit
+fun processAcknowledge(req: UpdateAcknowledge): Unit
+fun processFetchAllRequest(req: FetchMapRequest): FetchMapResponse
+fun processQueryRequest(req: QueryIdentityRequest): QueryIdentityResponse
+fun processRegistrationChangeRequest(req: RegistrationRequest): RegistrationResponse
+fun processSubscriptionRequest(req: SubscribeRequest): SubscribeResponse
@@ -2218,7 +2218,7 @@ -InterestRateSwapAPI(api: APIServer)
+InterestRateSwapAPI(api: APIServer)
val api: APIServer
fun exitServer(): <ERROR CLASS>
fun fetchDeal(ref: String): <ERROR CLASS>
@@ -2269,7 +2269,7 @@ -fun deserialize(parser: <ERROR CLASS>, context: <ERROR CLASS>): BusinessCalendar
+fun deserialize(parser: <ERROR CLASS>, context: <ERROR CLASS>): BusinessCalendar
@@ -2281,7 +2281,7 @@ -fun deserialize(parser: <ERROR CLASS>, context: <ERROR CLASS>): LocalDate
+fun deserialize(parser: <ERROR CLASS>, context: <ERROR CLASS>): LocalDate
@@ -2293,7 +2293,7 @@ -fun deserializeKey(text: String, p1: <ERROR CLASS>): Any?
+fun deserializeKey(text: String, p1: <ERROR CLASS>): Any?
@@ -2305,7 +2305,7 @@ -fun deserialize(parser: <ERROR CLASS>, context: <ERROR CLASS>): Party
+fun deserialize(parser: <ERROR CLASS>, context: <ERROR CLASS>): Party
@@ -2317,7 +2317,7 @@ -fun serialize(obj: Party, generator: <ERROR CLASS>, provider: <ERROR CLASS>): Unit
+fun serialize(obj: Party, generator: <ERROR CLASS>, provider: <ERROR CLASS>): Unit
@@ -2330,7 +2330,7 @@ SecureHashDeserializer()
-fun deserialize(parser: <ERROR CLASS>, context: <ERROR CLASS>): T
+fun deserialize(parser: <ERROR CLASS>, context: <ERROR CLASS>): T
@@ -2342,7 +2342,7 @@ -fun serialize(obj: SecureHash, generator: <ERROR CLASS>, provider: <ERROR CLASS>): Unit
+fun serialize(obj: SecureHash, generator: <ERROR CLASS>, provider: <ERROR CLASS>): Unit
@@ -2354,7 +2354,7 @@ -ServiceHubObjectMapper(identities: IdentityService)
+ServiceHubObjectMapper(identities: IdentityService)
val identities: IdentityService
@@ -2367,11 +2367,11 @@ -fun serialize(obj: Any, generator: <ERROR CLASS>, provider: <ERROR CLASS>): Unit
+fun serialize(obj: Any, generator: <ERROR CLASS>, provider: <ERROR CLASS>): Unit
-fun createDefaultMapper(identities: IdentityService): <ERROR CLASS>
+fun createDefaultMapper(identities: IdentityService): <ERROR CLASS>
@@ -2385,8 +2385,8 @@ abstract fun freshKey(): KeyPair
abstract val keys: Map<PublicKey, PrivateKey>
-open fun toKeyPair(publicKey: PublicKey): KeyPair
-open fun toPrivate(publicKey: PublicKey): PrivateKey
+open fun toKeyPair(publicKey: PublicKey): KeyPair
+open fun toPrivate(publicKey: PublicKey): PrivateKey
@@ -2504,11 +2504,11 @@ -MockIdentityService(identities: List<Party>)
+MockIdentityService(identities: List<Party>)
val identities: List<Party>
-fun partyFromKey(key: PublicKey): Party?
-fun partyFromName(name: String): Party?
-fun registerIdentity(party: Party): Unit
+fun partyFromKey(key: PublicKey): Party?
+fun partyFromName(name: String): Party?
+fun registerIdentity(party: Party): Unit
@@ -2520,7 +2520,7 @@ -MockNetwork(threadPerNode: Boolean = false, defaultFactory: Factory = MockNetwork.DefaultFactory)
+MockNetwork(threadPerNode: Boolean = false, defaultFactory: Factory = MockNetwork.DefaultFactory)
object DefaultFactory : Factory
@@ -2541,7 +2541,7 @@ -abstract fun create(dir: Path, config: NodeConfiguration, network: MockNetwork, networkMapAddr: NodeInfo?, advertisedServices: Set<ServiceType>, id: Int): MockNode
+abstract fun create(dir: Path, config: NodeConfiguration, network: MockNetwork, networkMapAddr: NodeInfo?, advertisedServices: Set<ServiceType>, id: Int): MockNode
@@ -2553,7 +2553,7 @@ -MockNode(dir: Path, config: NodeConfiguration, mockNet: MockNetwork, networkMapAddr: NodeInfo?, advertisedServices: Set<ServiceType>, id: Int)
+MockNode(dir: Path, config: NodeConfiguration, mockNet: MockNetwork, networkMapAddr: NodeInfo?, advertisedServices: Set<ServiceType>, id: Int)
protected open fun findMyLocation(): PhysicalLocation?
val id: Int
protected open val log: <ERROR CLASS>
@@ -2567,14 +2567,14 @@ -fun addressToNode(address: SingleMessageRecipient): MockNode
-fun createNode(networkMapAddress: NodeInfo? = null, forcedID: Int = -1, nodeFactory: Factory = defaultFactory, vararg advertisedServices: ServiceType): MockNode
-fun createTwoNodes(nodeFactory: Factory = defaultFactory): <ERROR CLASS><MockNode, MockNode>
+fun addressToNode(address: SingleMessageRecipient): MockNode
+fun createNode(networkMapAddress: NodeInfo? = null, forcedID: Int = -1, nodeFactory: Factory = defaultFactory, vararg advertisedServices: ServiceType): MockNode
+fun createTwoNodes(nodeFactory: Factory = defaultFactory): <ERROR CLASS><MockNode, MockNode>
val filesystem: <ERROR CLASS>
val identities: ArrayList<Party>
val messagingNetwork: InMemoryMessagingNetwork
val nodes: List<MockNode>
-fun runNetwork(rounds: Int = -1): Unit
+fun runNetwork(rounds: Int = -1): Unit
@@ -2595,13 +2595,13 @@ -MockAddress(id: String)
+MockAddress(id: String)
val id: String
-fun addRegistration(node: NodeInfo): Unit
-fun deleteRegistration(identity: Party): Boolean
+fun addRegistration(node: NodeInfo): Unit
+fun deleteRegistration(identity: Party): Boolean
@@ -2661,19 +2661,19 @@ -abstract fun addMapService(smm: StateMachineManager, net: MessagingService, service: NodeInfo, subscribe: Boolean, ifChangedSinceVer: Int? = null): <ERROR CLASS><Unit>
-abstract fun addNode(node: NodeInfo): Unit
-abstract fun deregisterForUpdates(smm: StateMachineManager, net: MessagingService, service: NodeInfo): <ERROR CLASS><Unit>
+abstract fun addMapService(smm: StateMachineManager, net: MessagingService, service: NodeInfo, subscribe: Boolean, ifChangedSinceVer: Int? = null): <ERROR CLASS><Unit>
+abstract fun addNode(node: NodeInfo): Unit
+abstract fun deregisterForUpdates(smm: StateMachineManager, net: MessagingService, service: NodeInfo): <ERROR CLASS><Unit>
abstract fun get(): Collection<NodeInfo>
-abstract fun get(serviceType: ServiceType): Collection<NodeInfo>
-abstract fun getRecommended(type: ServiceType, contract: Contract, vararg party: Party): NodeInfo?
+abstract fun get(serviceType: ServiceType): Collection<NodeInfo>
+abstract fun getRecommended(type: ServiceType, contract: Contract, vararg party: Party): NodeInfo?
val logger: <ERROR CLASS>
abstract val networkMapNodes: List<NodeInfo>
-open fun nodeForPartyName(name: String): NodeInfo?
+open fun nodeForPartyName(name: String): NodeInfo?
abstract val partyNodes: List<NodeInfo>
abstract val ratesOracleNodes: List<NodeInfo>
abstract val regulators: List<NodeInfo>
-abstract fun removeNode(node: NodeInfo): Unit
+abstract fun removeNode(node: NodeInfo): Unit
abstract val timestampingNodes: List<NodeInfo>
@@ -2696,7 +2696,7 @@ -FetchMapRequest(subscribe: Boolean, ifChangedSinceVersion: Int?, replyTo: MessageRecipients, sessionID: Long)
+FetchMapRequest(subscribe: Boolean, ifChangedSinceVersion: Int?, replyTo: MessageRecipients, sessionID: Long)
val ifChangedSinceVersion: Int?
val subscribe: Boolean
@@ -2710,7 +2710,7 @@ -FetchMapResponse(nodes: Collection<NodeRegistration>?, version: Int)
+FetchMapResponse(nodes: Collection<NodeRegistration>?, version: Int)
val nodes: Collection<NodeRegistration>?
val version: Int
@@ -2727,7 +2727,7 @@ -QueryIdentityRequest(identity: Party, replyTo: MessageRecipients, sessionID: Long)
+QueryIdentityRequest(identity: Party, replyTo: MessageRecipients, sessionID: Long)
val identity: Party
@@ -2740,7 +2740,7 @@ -QueryIdentityResponse(node: NodeInfo?)
+QueryIdentityResponse(node: NodeInfo?)
val node: NodeInfo?
@@ -2754,7 +2754,7 @@ -RegistrationRequest(wireReg: WireNodeRegistration, replyTo: MessageRecipients, sessionID: Long)
+RegistrationRequest(wireReg: WireNodeRegistration, replyTo: MessageRecipients, sessionID: Long)
val wireReg: WireNodeRegistration
@@ -2767,7 +2767,7 @@ -RegistrationResponse(success: Boolean)
+RegistrationResponse(success: Boolean)
val success: Boolean
@@ -2781,7 +2781,7 @@ -SubscribeRequest(subscribe: Boolean, replyTo: MessageRecipients, sessionID: Long)
+SubscribeRequest(subscribe: Boolean, replyTo: MessageRecipients, sessionID: Long)
val subscribe: Boolean
@@ -2794,7 +2794,7 @@ -SubscribeResponse(confirmed: Boolean)
+SubscribeResponse(confirmed: Boolean)
val confirmed: Boolean
@@ -2808,7 +2808,7 @@ -Update(wireReg: WireNodeRegistration, replyTo: MessageRecipients)
+Update(wireReg: WireNodeRegistration, replyTo: MessageRecipients)
val replyTo: MessageRecipients
val wireReg: WireNodeRegistration
@@ -2822,7 +2822,7 @@ -UpdateAcknowledge(wireRegHash: SecureHash, replyTo: MessageRecipients)
+UpdateAcknowledge(wireRegHash: SecureHash, replyTo: MessageRecipients)
val replyTo: MessageRecipients
val wireRegHash: SecureHash
@@ -2841,7 +2841,7 @@ -Node(dir: Path, p2pAddr: <ERROR CLASS>, configuration: NodeConfiguration, networkMapAddress: NodeInfo?, advertisedServices: Set<ServiceType>, clock: Clock = Clock.systemUTC())
+Node(dir: Path, p2pAddr: <ERROR CLASS>, configuration: NodeConfiguration, networkMapAddress: NodeInfo?, advertisedServices: Set<ServiceType>, clock: Clock = Clock.systemUTC())
val DEFAULT_PORT: Int
protected val log: <ERROR CLASS>
protected fun makeMessagingService(): MessagingService
@@ -2862,7 +2862,7 @@ -NodeAttachmentService(storePath: Path, metrics: <ERROR CLASS>)
+NodeAttachmentService(storePath: Path, metrics: <ERROR CLASS>)
class OnDiskHashMismatch : Exception
@@ -2912,7 +2912,7 @@ -NodeConfigurationFromConfig(config: <ERROR CLASS> = ConfigFactory.load())
+NodeConfigurationFromConfig(config: <ERROR CLASS> = ConfigFactory.load())
val config: <ERROR CLASS>
val exportJMXto: String
val myLegalName: String
@@ -2952,10 +2952,10 @@ -FixContainer(fixes: List<Fix>, factory: InterpolatorFactory = CubicSplineInterpolator.Factory)
+FixContainer(fixes: List<Fix>, factory: InterpolatorFactory = CubicSplineInterpolator.Factory)
val factory: InterpolatorFactory
val fixes: List<Fix>
-operator fun get(fixOf: FixOf): Fix?
+operator fun get(fixOf: FixOf): Fix?
val size: Int
@@ -2968,11 +2968,11 @@ -InterpolatingRateMap(date: LocalDate, inputRates: Map<Tenor, BigDecimal>, calendar: BusinessCalendar, factory: InterpolatorFactory)
+InterpolatingRateMap(date: LocalDate, inputRates: Map<Tenor, BigDecimal>, calendar: BusinessCalendar, factory: InterpolatorFactory)
val calendar: BusinessCalendar
val date: LocalDate
val factory: InterpolatorFactory
-fun getRate(tenor: Tenor): BigDecimal?
+fun getRate(tenor: Tenor): BigDecimal?
val inputRates: Map<Tenor, BigDecimal>
val size: Int
@@ -2986,11 +2986,11 @@ -Oracle(identity: Party, signingKey: KeyPair)
+Oracle(identity: Party, signingKey: KeyPair)
val identity: Party
var knownFixes: FixContainer
-fun query(queries: List<FixOf>): List<Fix>
-fun sign(wtx: WireTransaction): LegallyIdentifiable
+fun query(queries: List<FixOf>): List<Fix>
+fun sign(wtx: WireTransaction): LegallyIdentifiable
@@ -3002,12 +3002,12 @@ -Service(node: AbstractNode)
+Service(node: AbstractNode)
val acceptableFileExtensions: <ERROR CLASS>
val dataTypePrefix: String
val oracle: Oracle
val ss: StorageService
-fun upload(data: InputStream): String
+fun upload(data: InputStream): String
@@ -3020,15 +3020,15 @@ -UnknownFix(fix: FixOf)
+UnknownFix(fix: FixOf)
val fix: FixOf
fun toString(): String
-fun parseFile(s: String): FixContainer
-fun parseFix(s: String): Fix
-fun parseFixOf(key: String): FixOf
+fun parseFile(s: String): FixContainer
+fun parseFix(s: String): Fix
+fun parseFixOf(key: String): FixOf
@@ -3087,12 +3087,12 @@ -NodeRegistration(node: NodeInfo, serial: Long, type: AddOrRemove, expires: Instant)
+NodeRegistration(node: NodeInfo, serial: Long, type: AddOrRemove, expires: Instant)
var expires: Instant
val node: NodeInfo
val serial: Long
fun toString(): String
-fun toWire(privateKey: PrivateKey): WireNodeRegistration
+fun toWire(privateKey: PrivateKey): WireNodeRegistration
val type: AddOrRemove
@@ -3123,12 +3123,12 @@ -NodeWalletService(services: ServiceHub)
+NodeWalletService(services: ServiceHub)
val cashBalances: Map<Currency, Amount>
val currentWallet: Wallet
-fun fillWithSomeTestCash(howMuch: Amount, atLeastThisManyStates: Int = 3, atMostThisManyStates: Int = 10, rng: Random = Random()): Unit
+fun fillWithSomeTestCash(howMuch: Amount, atLeastThisManyStates: Int = 3, atMostThisManyStates: Int = 10, rng: Random = Random()): Unit
val linearHeads: Map<SecureHash, StateAndRef<LinearState>>
-fun notifyAll(txns: Iterable<WireTransaction>): Wallet
+fun notifyAll(txns: Iterable<WireTransaction>): Wallet
@@ -3245,10 +3245,10 @@ -PerFileCheckpointStorage(storeDir: Path)
-fun addCheckpoint(checkpoint: Checkpoint): Unit
+PerFileCheckpointStorage(storeDir: Path)
+fun addCheckpoint(checkpoint: Checkpoint): Unit
val checkpoints: Iterable<Checkpoint>
-fun removeCheckpoint(checkpoint: Checkpoint): Unit
+fun removeCheckpoint(checkpoint: Checkpoint): Unit
val storeDir: Path
@@ -3432,7 +3432,7 @@ -ProtocolClassRef(className: String)
+ProtocolClassRef(className: String)
val className: String
@@ -3445,7 +3445,7 @@ -ProtocolInstanceRef(protocolInstance: SecureHash, protocolClass: ProtocolClassRef, protocolStepId: String)
+ProtocolInstanceRef(protocolInstance: SecureHash, protocolClass: ProtocolClassRef, protocolStepId: String)
val protocolClass: ProtocolClassRef
val protocolInstance: SecureHash
val protocolStepId: String
@@ -3483,7 +3483,7 @@ -ProtocolRequiringAttention(ref: ProtocolInstanceRef, prompt: String, choiceIdsToMessages: Map<SecureHash, String>, dueBy: Instant)
+ProtocolRequiringAttention(ref: ProtocolInstanceRef, prompt: String, choiceIdsToMessages: Map<SecureHash, String>, dueBy: Instant)
val choiceIdsToMessages: Map<SecureHash, String>
val dueBy: Instant
val prompt: String
@@ -3503,7 +3503,7 @@ val logger: <ERROR CLASS>
val loggerName: String
val logic: ProtocolLogic<R>
-fun prepareForResumeWith(serviceHub: ServiceHub, withObject: Any?, suspendAction: (FiberRequest, SerializedBytes<ProtocolStateMachine<*>>) -> Unit): Unit
+fun prepareForResumeWith(serviceHub: ServiceHub, withObject: Any?, suspendAction: (FiberRequest, SerializedBytes<ProtocolStateMachine<*>>) -> Unit): Unit
fun <T : Any> receive(topic: String, sessionIDForReceive: Long, recvType: Class<T>): UntrustworthyData<T>
val resultFuture: <ERROR CLASS><R>
fun run(): R
@@ -3768,7 +3768,7 @@ ResponseFilter()
-fun filter(requestContext: <ERROR CLASS>, responseContext: <ERROR CLASS>): Unit
+fun filter(requestContext: <ERROR CLASS>, responseContext: <ERROR CLASS>): Unit
@@ -3912,7 +3912,7 @@ -Simulation(runAsync: Boolean, latencyInjector: LatencyCalculator?)
+Simulation(runAsync: Boolean, latencyInjector: LatencyCalculator?)
inner class BankFactory : Factory
@@ -3948,7 +3948,7 @@ -fun create(dir: Path, config: NodeConfiguration, network: MockNetwork, networkMapAddr: NodeInfo?, advertisedServices: Set<ServiceType>, id: Int): MockNode
+fun create(dir: Path, config: NodeConfiguration, network: MockNetwork, networkMapAddr: NodeInfo?, advertisedServices: Set<ServiceType>, id: Int): MockNode
@@ -3960,7 +3960,7 @@ -fun create(dir: Path, config: NodeConfiguration, network: MockNetwork, networkMapAddr: NodeInfo?, advertisedServices: Set<ServiceType>, id: Int): MockNode
+fun create(dir: Path, config: NodeConfiguration, network: MockNetwork, networkMapAddr: NodeInfo?, advertisedServices: Set<ServiceType>, id: Int): MockNode
@@ -3972,7 +3972,7 @@ -SimulatedNode(dir: Path, config: NodeConfiguration, mockNet: MockNetwork, networkMapAddress: NodeInfo?, advertisedServices: Set<ServiceType>, id: Int)
+SimulatedNode(dir: Path, config: NodeConfiguration, mockNet: MockNetwork, networkMapAddress: NodeInfo?, advertisedServices: Set<ServiceType>, id: Int)
protected open fun findMyLocation(): PhysicalLocation?
@@ -3985,7 +3985,7 @@ -fun create(dir: Path, config: NodeConfiguration, network: MockNetwork, networkMapAddr: NodeInfo?, advertisedServices: Set<ServiceType>, id: Int): MockNode
+fun create(dir: Path, config: NodeConfiguration, network: MockNetwork, networkMapAddr: NodeInfo?, advertisedServices: Set<ServiceType>, id: Int): MockNode
@@ -3999,8 +3999,8 @@ val extraNodeLabels: MutableMap<SimulatedNode, String>
open fun iterate(): Unit
val latencyInjector: LatencyCalculator?
-protected fun linkConsensus(nodes: Collection<SimulatedNode>, protocol: ProtocolLogic<*>): Unit
-protected fun linkProtocolProgress(node: SimulatedNode, protocol: ProtocolLogic<*>): Unit
+protected fun linkConsensus(nodes: Collection<SimulatedNode>, protocol: ProtocolLogic<*>): Unit
+protected fun linkProtocolProgress(node: SimulatedNode, protocol: ProtocolLogic<*>): Unit
val network: MockNetwork
val networkMap: SimulatedNode
val ratesOracle: SimulatedNode
@@ -4008,7 +4008,7 @@ val runAsync: Boolean
val serviceProviders: List<SimulatedNode>
open fun start(): Unit
-fun startTradingCircle(tradeBetween: (Int, Int) -> <ERROR CLASS><out <ERROR CLASS>>): Unit
+fun startTradingCircle(tradeBetween: (Int, Int) -> <ERROR CLASS><out <ERROR CLASS>>): Unit
fun stop(): Unit
val timestamper: SimulatedNode
@@ -4062,7 +4062,7 @@ -StateMachineManager(serviceHub: ServiceHub, executor: AffinityExecutor)
+StateMachineManager(serviceHub: ServiceHub, executor: AffinityExecutor)
class FiberRequest
-fun <T> add(loggerName: String, logic: ProtocolLogic<T>): <ERROR CLASS><T>
+fun <T> add(loggerName: String, logic: ProtocolLogic<T>): <ERROR CLASS><T>
val executor: AffinityExecutor
-fun <T> findStateMachines(klass: Class<out ProtocolLogic<T>>): List<<ERROR CLASS><ProtocolLogic<T>, <ERROR CLASS><T>>>
+fun <T> findStateMachines(klass: Class<out ProtocolLogic<T>>): List<<ERROR CLASS><ProtocolLogic<T>, <ERROR CLASS><T>>>
val scheduler: FiberScheduler
val serviceHub: ServiceHub
@@ -4166,7 +4166,7 @@ -Deal(ref: String)
+Deal(ref: String)
val ref: String
@@ -4182,14 +4182,14 @@ -Selection(criteria: Criteria)
+Selection(criteria: Criteria)
val criteria: Criteria
-fun select(criteria: Criteria): Selection
+fun select(criteria: Criteria): Selection
fun selectAllDeals(): Selection
-fun selectDeal(ref: String): Selection
+fun selectDeal(ref: String): Selection
@@ -4217,7 +4217,7 @@ -StorageServiceImpl(attachments: AttachmentStorage, checkpointStorage: CheckpointStorage, myLegalIdentityKey: KeyPair, myLegalIdentity: Party = Party("Unit test party", myLegalIdentityKey.public), recordingAs: (String) -> String = { tableName -> "" })
+StorageServiceImpl(attachments: AttachmentStorage, checkpointStorage: CheckpointStorage, myLegalIdentityKey: KeyPair, myLegalIdentity: Party = Party("Unit test party", myLegalIdentityKey.public), recordingAs: (String) -> String = { tableName -> "" })
open val attachments: AttachmentStorage
open val checkpointStorage: CheckpointStorage
open val myLegalIdentity: Party
@@ -4368,7 +4368,7 @@ -Client(stateMachineManager: StateMachineManager, node: NodeInfo)
+Client(stateMachineManager: StateMachineManager, node: NodeInfo)
val identity: Party
fun timestamp(wtxBytes: SerializedBytes<WireTransaction>): LegallyIdentifiable
@@ -4415,7 +4415,7 @@ -TradeSimulation(runAsync: Boolean, latencyInjector: LatencyCalculator?)
+TradeSimulation(runAsync: Boolean, latencyInjector: LatencyCalculator?)
fun start(): Unit
@@ -4466,7 +4466,7 @@ -TransactionBuildStep(generateMethodName: String, args: Map<String, Any?>)
+TransactionBuildStep(generateMethodName: String, args: Map<String, Any?>)
val args: Map<String, Any?>
val generateMethodName: String
@@ -4946,8 +4946,8 @@ -fun runBuyer(smm: StateMachineManager, timestampingAuthority: NodeInfo, otherSide: SingleMessageRecipient, acceptablePrice: Amount, typeToBuy: Class<out OwnableState>, sessionID: Long): <ERROR CLASS><SignedTransaction>
-fun runSeller(smm: StateMachineManager, timestampingAuthority: NodeInfo, otherSide: SingleMessageRecipient, assetToSell: StateAndRef<OwnableState>, price: Amount, myKeyPair: KeyPair, buyerSessionID: Long): <ERROR CLASS><SignedTransaction>
+fun runBuyer(smm: StateMachineManager, timestampingAuthority: NodeInfo, otherSide: SingleMessageRecipient, acceptablePrice: Amount, typeToBuy: Class<out OwnableState>, sessionID: Long): <ERROR CLASS><SignedTransaction>
+fun runSeller(smm: StateMachineManager, timestampingAuthority: NodeInfo, otherSide: SingleMessageRecipient, assetToSell: StateAndRef<OwnableState>, price: Amount, myKeyPair: KeyPair, buyerSessionID: Long): <ERROR CLASS><SignedTransaction>
@@ -5027,7 +5027,7 @@ -fun register(node: Node): Unit
+fun register(node: Node): Unit
@@ -5096,7 +5096,7 @@ -WalletImpl(states: List<StateAndRef<ContractState>>)
+WalletImpl(states: List<StateAndRef<ContractState>>)
val cashBalances: Map<Currency, Amount>
val states: List<StateAndRef<ContractState>>
@@ -5113,10 +5113,10 @@ abstract val cashBalances: Map<Currency, Amount>
abstract val currentWallet: Wallet
abstract val linearHeads: Map<SecureHash, StateAndRef<LinearState>>
-open fun <T : LinearState> linearHeadsOfType_(stateType: Class<T>): Map<SecureHash, StateAndRef<T>>
-open fun notify(tx: WireTransaction): Wallet
-abstract fun notifyAll(txns: Iterable<WireTransaction>): Wallet
-open fun statesForRefs(refs: List<StateRef>): Map<StateRef, ContractState?>
+open fun <T : LinearState> linearHeadsOfType_(stateType: Class<T>): Map<SecureHash, StateAndRef<T>>
+open fun notify(tx: WireTransaction): Wallet
+abstract fun notifyAll(txns: Iterable<WireTransaction>): Wallet
+open fun statesForRefs(refs: List<StateRef>): Map<StateRef, ContractState?>
@@ -5128,8 +5128,8 @@ -WireNodeRegistration(raw: SerializedBytes<NodeRegistration>, sig: WithKey)
-protected fun verifyData(reg: NodeRegistration): Unit
+WireNodeRegistration(raw: SerializedBytes<NodeRegistration>, sig: WithKey)
+protected fun verifyData(reg: NodeRegistration): Unit
@@ -5435,15 +5435,15 @@ -abstract fun buildTransaction(type: ContractDefRef, steps: List<TransactionBuildStep>): SerializedBytes<WireTransaction>
-abstract fun commitTransaction(tx: SerializedBytes<WireTransaction>, signatures: List<WithKey>): SecureHash
-abstract fun fetchProtocolsRequiringAttention(query: StatesQuery): Map<StateRef, ProtocolRequiringAttention>
-abstract fun fetchStates(states: List<StateRef>): Map<StateRef, ContractState?>
-abstract fun fetchTransactions(txs: List<SecureHash>): Map<SecureHash, SignedTransaction?>
-abstract fun generateTransactionSignature(tx: SerializedBytes<WireTransaction>): WithKey
-abstract fun invokeProtocolSync(type: ProtocolRef, args: Map<String, Any?>): Any?
-abstract fun provideProtocolResponse(protocol: ProtocolInstanceRef, choice: SecureHash, args: Map<String, Any?>): Unit
-abstract fun queryStates(query: StatesQuery): List<StateRef>
+abstract fun buildTransaction(type: ContractDefRef, steps: List<TransactionBuildStep>): SerializedBytes<WireTransaction>
+abstract fun commitTransaction(tx: SerializedBytes<WireTransaction>, signatures: List<WithKey>): SecureHash
+abstract fun fetchProtocolsRequiringAttention(query: StatesQuery): Map<StateRef, ProtocolRequiringAttention>
+abstract fun fetchStates(states: List<StateRef>): Map<StateRef, ContractState?>
+abstract fun fetchTransactions(txs: List<SecureHash>): Map<SecureHash, SignedTransaction?>
+abstract fun generateTransactionSignature(tx: SerializedBytes<WireTransaction>): WithKey
+abstract fun invokeProtocolSync(type: ProtocolRef, args: Map<String, Any?>): Any?
+abstract fun provideProtocolResponse(protocol: ProtocolInstanceRef, choice: SecureHash, args: Map<String, Any?>): Unit
+abstract fun queryStates(query: StatesQuery): List<StateRef>
abstract fun serverTime(): LocalDateTime
@@ -5456,17 +5456,17 @@ -APIServerImpl(node: AbstractNode)
-fun buildTransaction(type: ContractDefRef, steps: List<TransactionBuildStep>): SerializedBytes<WireTransaction>
-fun commitTransaction(tx: SerializedBytes<WireTransaction>, signatures: List<WithKey>): SecureHash
-fun fetchProtocolsRequiringAttention(query: StatesQuery): Map<StateRef, ProtocolRequiringAttention>
-fun fetchStates(states: List<StateRef>): Map<StateRef, ContractState?>
-fun fetchTransactions(txs: List<SecureHash>): Map<SecureHash, SignedTransaction?>
-fun generateTransactionSignature(tx: SerializedBytes<WireTransaction>): WithKey
-fun invokeProtocolSync(type: ProtocolRef, args: Map<String, Any?>): Any?
+APIServerImpl(node: AbstractNode)
+fun buildTransaction(type: ContractDefRef, steps: List<TransactionBuildStep>): SerializedBytes<WireTransaction>
+fun commitTransaction(tx: SerializedBytes<WireTransaction>, signatures: List<WithKey>): SecureHash
+fun fetchProtocolsRequiringAttention(query: StatesQuery): Map<StateRef, ProtocolRequiringAttention>
+fun fetchStates(states: List<StateRef>): Map<StateRef, ContractState?>
+fun fetchTransactions(txs: List<SecureHash>): Map<SecureHash, SignedTransaction?>
+fun generateTransactionSignature(tx: SerializedBytes<WireTransaction>): WithKey
+fun invokeProtocolSync(type: ProtocolRef, args: Map<String, Any?>): Any?
val node: AbstractNode
-fun provideProtocolResponse(protocol: ProtocolInstanceRef, choice: SecureHash, args: Map<String, Any?>): Unit
-fun queryStates(query: StatesQuery): List<StateRef>
+fun provideProtocolResponse(protocol: ProtocolInstanceRef, choice: SecureHash, args: Map<String, Any?>): Unit
+fun queryStates(query: StatesQuery): List<StateRef>
fun serverTime(): LocalDateTime
@@ -5479,9 +5479,9 @@ -Config(services: ServiceHub)
+Config(services: ServiceHub)
val defaultObjectMapper: <ERROR CLASS>
-fun getContext(type: Class<*>): <ERROR CLASS>
+fun getContext(type: Class<*>): <ERROR CLASS>
val services: ServiceHub
@@ -5494,7 +5494,7 @@ -ContractClassRef(className: String)
+ContractClassRef(className: String)
val className: String
@@ -5508,7 +5508,7 @@ -ContractLedgerRef(hash: SecureHash)
+ContractLedgerRef(hash: SecureHash)
val hash: SecureHash
@@ -5521,7 +5521,7 @@ -InterestRateSwapAPI(api: APIServer)
+InterestRateSwapAPI(api: APIServer)
val api: APIServer
fun exitServer(): <ERROR CLASS>
fun fetchDeal(ref: String): <ERROR CLASS>
@@ -5540,7 +5540,7 @@ -ProtocolClassRef(className: String)
+ProtocolClassRef(className: String)
val className: String
@@ -5553,7 +5553,7 @@ -ProtocolInstanceRef(protocolInstance: SecureHash, protocolClass: ProtocolClassRef, protocolStepId: String)
+ProtocolInstanceRef(protocolInstance: SecureHash, protocolClass: ProtocolClassRef, protocolStepId: String)
val protocolClass: ProtocolClassRef
val protocolInstance: SecureHash
val protocolStepId: String
@@ -5569,7 +5569,7 @@ -ProtocolRequiringAttention(ref: ProtocolInstanceRef, prompt: String, choiceIdsToMessages: Map<SecureHash, String>, dueBy: Instant)
+ProtocolRequiringAttention(ref: ProtocolInstanceRef, prompt: String, choiceIdsToMessages: Map<SecureHash, String>, dueBy: Instant)
val choiceIdsToMessages: Map<SecureHash, String>
val dueBy: Instant
val prompt: String
@@ -5586,7 +5586,7 @@ ResponseFilter()
-fun filter(requestContext: <ERROR CLASS>, responseContext: <ERROR CLASS>): Unit
+fun filter(requestContext: <ERROR CLASS>, responseContext: <ERROR CLASS>): Unit
@@ -5615,7 +5615,7 @@ -Deal(ref: String)
+Deal(ref: String)
val ref: String
@@ -5631,14 +5631,14 @@ -Selection(criteria: Criteria)
+Selection(criteria: Criteria)
val criteria: Criteria
-fun select(criteria: Criteria): Selection
+fun select(criteria: Criteria): Selection
fun selectAllDeals(): Selection
-fun selectDeal(ref: String): Selection
+fun selectDeal(ref: String): Selection
@@ -5650,7 +5650,7 @@ -TransactionBuildStep(generateMethodName: String, args: Map<String, Any?>)
+TransactionBuildStep(generateMethodName: String, args: Map<String, Any?>)
val args: Map<String, Any?>
val generateMethodName: String
@@ -7906,7 +7906,7 @@ -StateMachineManager(serviceHub: ServiceHub, executor: AffinityExecutor)
+StateMachineManager(serviceHub: ServiceHub, executor: AffinityExecutor)
class FiberRequest
-fun <T> add(loggerName: String, logic: ProtocolLogic<T>): <ERROR CLASS><T>
+fun <T> add(loggerName: String, logic: ProtocolLogic<T>): <ERROR CLASS><T>
val executor: AffinityExecutor
-fun <T> findStateMachines(klass: Class<out ProtocolLogic<T>>): List<<ERROR CLASS><ProtocolLogic<T>, <ERROR CLASS><T>>>
+fun <T> findStateMachines(klass: Class<out ProtocolLogic<T>>): List<<ERROR CLASS><ProtocolLogic<T>, <ERROR CLASS><T>>>
val scheduler: FiberScheduler
val serviceHub: ServiceHub
@@ -8003,14 +8003,14 @@ -AbstractNode(dir: Path, configuration: NodeConfiguration, initialNetworkMapAddress: NodeInfo?, advertisedServices: Set<ServiceType>, platformClock: Clock)
+AbstractNode(dir: Path, configuration: NodeConfiguration, initialNetworkMapAddress: NodeInfo?, advertisedServices: Set<ServiceType>, platformClock: Clock)
val PRIVATE_KEY_FILE_NAME: String
val PUBLIC_IDENTITY_FILE_NAME: String
protected val _servicesThatAcceptUploads: ArrayList<AcceptsFileUpload>
val advertisedServices: Set<ServiceType>
lateinit var api: APIServer
val configuration: NodeConfiguration
-protected open fun constructStorageService(attachments: NodeAttachmentService, checkpointStorage: CheckpointStorage, keypair: KeyPair, identity: Party): StorageServiceImpl
+protected open fun constructStorageService(attachments: NodeAttachmentService, checkpointStorage: CheckpointStorage, keypair: KeyPair, identity: Party): StorageServiceImpl
val dir: Path
protected open fun findMyLocation(): PhysicalLocation?
lateinit var identity: IdentityService
@@ -8018,7 +8018,7 @@ var inNodeTimestampingService: NodeTimestamperService?
val info: NodeInfo
val initialNetworkMapAddress: NodeInfo?
-protected open fun initialiseStorageService(dir: Path): StorageService
+protected open fun initialiseStorageService(dir: Path): StorageService
lateinit var interestRatesService: Service
lateinit var keyManagement: E2ETestKeyManagementService
protected abstract val log: <ERROR CLASS>
@@ -8053,7 +8053,7 @@ abstract val acceptableFileExtensions: List<String>
abstract val dataTypePrefix: String
-abstract fun upload(data: InputStream): String
+abstract fun upload(data: InputStream): String
@@ -8106,7 +8106,7 @@ -ConfigurationException(message: String)
+ConfigurationException(message: String)
@@ -8118,7 +8118,7 @@ -Node(dir: Path, p2pAddr: <ERROR CLASS>, configuration: NodeConfiguration, networkMapAddress: NodeInfo?, advertisedServices: Set<ServiceType>, clock: Clock = Clock.systemUTC())
+Node(dir: Path, p2pAddr: <ERROR CLASS>, configuration: NodeConfiguration, networkMapAddress: NodeInfo?, advertisedServices: Set<ServiceType>, clock: Clock = Clock.systemUTC())
val DEFAULT_PORT: Int
protected val log: <ERROR CLASS>
protected fun makeMessagingService(): MessagingService
@@ -8153,7 +8153,7 @@ -NodeConfigurationFromConfig(config: <ERROR CLASS> = ConfigFactory.load())
+NodeConfigurationFromConfig(config: <ERROR CLASS> = ConfigFactory.load())
val config: <ERROR CLASS>
val exportJMXto: String
val myLegalName: String
@@ -8227,7 +8227,7 @@ -operator fun <ERROR CLASS>.getValue(receiver: NodeConfigurationFromConfig, metadata: KProperty<*>): <ERROR CLASS>
+operator fun <ERROR CLASS>.getValue(receiver: NodeConfigurationFromConfig, metadata: KProperty<*>): <ERROR CLASS>
@@ -8247,9 +8247,9 @@ -AbstractNodeService(net: MessagingService)
-protected inline fun <reified Q : AbstractRequestMessage, reified R : Any> addMessageHandler(topic: String, crossinline handler: (Q) -> R, crossinline exceptionConsumer: (Message, Exception) -> Unit): Unit
-protected inline fun <reified Q : AbstractRequestMessage, reified R : Any> addMessageHandler(topic: String, crossinline handler: (Q) -> R): Unit
+AbstractNodeService(net: MessagingService)
+protected inline fun <reified Q : AbstractRequestMessage, reified R : Any> addMessageHandler(topic: String, crossinline handler: (Q) -> R, crossinline exceptionConsumer: (Message, Exception) -> Unit): Unit
+protected inline fun <reified Q : AbstractRequestMessage, reified R : Any> addMessageHandler(topic: String, crossinline handler: (Q) -> R): Unit
val net: MessagingService
@@ -8302,18 +8302,18 @@ -InMemoryNetworkMapService(net: MessagingService, home: NodeRegistration, cache: NetworkMapCache)
+InMemoryNetworkMapService(net: MessagingService, home: NodeRegistration, cache: NetworkMapCache)
val cache: NetworkMapCache
-fun getUnacknowledgedCount(subscriber: SingleMessageRecipient): Int?
+fun getUnacknowledgedCount(subscriber: SingleMessageRecipient): Int?
val maxSizeRegistrationRequestBytes: Int
val maxUnacknowledgedUpdates: Int
val nodes: List<NodeInfo>
-fun notifySubscribers(wireReg: WireNodeRegistration): Unit
-fun processAcknowledge(req: UpdateAcknowledge): Unit
-fun processFetchAllRequest(req: FetchMapRequest): FetchMapResponse
-fun processQueryRequest(req: QueryIdentityRequest): QueryIdentityResponse
-fun processRegistrationChangeRequest(req: RegistrationRequest): RegistrationResponse
-fun processSubscriptionRequest(req: SubscribeRequest): SubscribeResponse
+fun notifySubscribers(wireReg: WireNodeRegistration): Unit
+fun processAcknowledge(req: UpdateAcknowledge): Unit
+fun processFetchAllRequest(req: FetchMapRequest): FetchMapResponse
+fun processQueryRequest(req: QueryIdentityRequest): QueryIdentityResponse
+fun processRegistrationChangeRequest(req: RegistrationRequest): RegistrationResponse
+fun processSubscriptionRequest(req: SubscribeRequest): SubscribeResponse
@@ -8335,7 +8335,7 @@ -FetchMapRequest(subscribe: Boolean, ifChangedSinceVersion: Int?, replyTo: MessageRecipients, sessionID: Long)
+FetchMapRequest(subscribe: Boolean, ifChangedSinceVersion: Int?, replyTo: MessageRecipients, sessionID: Long)
val ifChangedSinceVersion: Int?
val subscribe: Boolean
@@ -8349,7 +8349,7 @@ -FetchMapResponse(nodes: Collection<NodeRegistration>?, version: Int)
+FetchMapResponse(nodes: Collection<NodeRegistration>?, version: Int)
val nodes: Collection<NodeRegistration>?
val version: Int
@@ -8366,7 +8366,7 @@ -QueryIdentityRequest(identity: Party, replyTo: MessageRecipients, sessionID: Long)
+QueryIdentityRequest(identity: Party, replyTo: MessageRecipients, sessionID: Long)
val identity: Party
@@ -8379,7 +8379,7 @@ -QueryIdentityResponse(node: NodeInfo?)
+QueryIdentityResponse(node: NodeInfo?)
val node: NodeInfo?
@@ -8393,7 +8393,7 @@ -RegistrationRequest(wireReg: WireNodeRegistration, replyTo: MessageRecipients, sessionID: Long)
+RegistrationRequest(wireReg: WireNodeRegistration, replyTo: MessageRecipients, sessionID: Long)
val wireReg: WireNodeRegistration
@@ -8406,7 +8406,7 @@ -RegistrationResponse(success: Boolean)
+RegistrationResponse(success: Boolean)
val success: Boolean
@@ -8420,7 +8420,7 @@ -SubscribeRequest(subscribe: Boolean, replyTo: MessageRecipients, sessionID: Long)
+SubscribeRequest(subscribe: Boolean, replyTo: MessageRecipients, sessionID: Long)
val subscribe: Boolean
@@ -8433,7 +8433,7 @@ -SubscribeResponse(confirmed: Boolean)
+SubscribeResponse(confirmed: Boolean)
val confirmed: Boolean
@@ -8447,7 +8447,7 @@ -Update(wireReg: WireNodeRegistration, replyTo: MessageRecipients)
+Update(wireReg: WireNodeRegistration, replyTo: MessageRecipients)
val replyTo: MessageRecipients
val wireReg: WireNodeRegistration
@@ -8461,7 +8461,7 @@ -UpdateAcknowledge(wireRegHash: SecureHash, replyTo: MessageRecipients)
+UpdateAcknowledge(wireRegHash: SecureHash, replyTo: MessageRecipients)
val replyTo: MessageRecipients
val wireRegHash: SecureHash
@@ -8480,7 +8480,7 @@ -NodeAttachmentService(storePath: Path, metrics: <ERROR CLASS>)
+NodeAttachmentService(storePath: Path, metrics: <ERROR CLASS>)
class OnDiskHashMismatch : Exception
@@ -8524,10 +8524,10 @@ -FixContainer(fixes: List<Fix>, factory: InterpolatorFactory = CubicSplineInterpolator.Factory)
+FixContainer(fixes: List<Fix>, factory: InterpolatorFactory = CubicSplineInterpolator.Factory)
val factory: InterpolatorFactory
val fixes: List<Fix>
-operator fun get(fixOf: FixOf): Fix?
+operator fun get(fixOf: FixOf): Fix?
val size: Int
@@ -8540,11 +8540,11 @@ -InterpolatingRateMap(date: LocalDate, inputRates: Map<Tenor, BigDecimal>, calendar: BusinessCalendar, factory: InterpolatorFactory)
+InterpolatingRateMap(date: LocalDate, inputRates: Map<Tenor, BigDecimal>, calendar: BusinessCalendar, factory: InterpolatorFactory)
val calendar: BusinessCalendar
val date: LocalDate
val factory: InterpolatorFactory
-fun getRate(tenor: Tenor): BigDecimal?
+fun getRate(tenor: Tenor): BigDecimal?
val inputRates: Map<Tenor, BigDecimal>
val size: Int
@@ -8558,11 +8558,11 @@ -Oracle(identity: Party, signingKey: KeyPair)
+Oracle(identity: Party, signingKey: KeyPair)
val identity: Party
var knownFixes: FixContainer
-fun query(queries: List<FixOf>): List<Fix>
-fun sign(wtx: WireTransaction): LegallyIdentifiable
+fun query(queries: List<FixOf>): List<Fix>
+fun sign(wtx: WireTransaction): LegallyIdentifiable
@@ -8574,12 +8574,12 @@ -Service(node: AbstractNode)
+Service(node: AbstractNode)
val acceptableFileExtensions: <ERROR CLASS>
val dataTypePrefix: String
val oracle: Oracle
val ss: StorageService
-fun upload(data: InputStream): String
+fun upload(data: InputStream): String
@@ -8592,15 +8592,15 @@ -UnknownFix(fix: FixOf)
+UnknownFix(fix: FixOf)
val fix: FixOf
fun toString(): String
-fun parseFile(s: String): FixContainer
-fun parseFix(s: String): Fix
-fun parseFixOf(key: String): FixOf
+fun parseFile(s: String): FixContainer
+fun parseFix(s: String): Fix
+fun parseFixOf(key: String): FixOf
@@ -8659,12 +8659,12 @@ -NodeRegistration(node: NodeInfo, serial: Long, type: AddOrRemove, expires: Instant)
+NodeRegistration(node: NodeInfo, serial: Long, type: AddOrRemove, expires: Instant)
var expires: Instant
val node: NodeInfo
val serial: Long
fun toString(): String
-fun toWire(privateKey: PrivateKey): WireNodeRegistration
+fun toWire(privateKey: PrivateKey): WireNodeRegistration
val type: AddOrRemove
@@ -8784,8 +8784,8 @@ -WireNodeRegistration(raw: SerializedBytes<NodeRegistration>, sig: WithKey)
-protected fun verifyData(reg: NodeRegistration): Unit
+WireNodeRegistration(raw: SerializedBytes<NodeRegistration>, sig: WithKey)
+protected fun verifyData(reg: NodeRegistration): Unit
@@ -8809,7 +8809,7 @@ AttachmentDownloadServlet()
-fun doGet(req: <ERROR CLASS>, resp: <ERROR CLASS>): Unit
+fun doGet(req: <ERROR CLASS>, resp: <ERROR CLASS>): Unit
@@ -8822,7 +8822,7 @@ DataUploadServlet()
-fun doPost(req: <ERROR CLASS>, resp: <ERROR CLASS>): Unit
+fun doPost(req: <ERROR CLASS>, resp: <ERROR CLASS>): Unit
@@ -8845,7 +8845,7 @@ -Checkpoint(serialisedFiber: SerializedBytes<ProtocolStateMachine<*>>, awaitingTopic: String, awaitingObjectOfType: String)
+Checkpoint(serialisedFiber: SerializedBytes<ProtocolStateMachine<*>>, awaitingTopic: String, awaitingObjectOfType: String)
val awaitingObjectOfType: String
val awaitingTopic: String
val serialisedFiber: SerializedBytes<ProtocolStateMachine<*>>
@@ -8861,9 +8861,9 @@ -abstract fun addCheckpoint(checkpoint: Checkpoint): Unit
+abstract fun addCheckpoint(checkpoint: Checkpoint): Unit
abstract val checkpoints: Iterable<Checkpoint>
-abstract fun removeCheckpoint(checkpoint: Checkpoint): Unit
+abstract fun removeCheckpoint(checkpoint: Checkpoint): Unit
@@ -8875,10 +8875,10 @@ -PerFileCheckpointStorage(storeDir: Path)
-fun addCheckpoint(checkpoint: Checkpoint): Unit
+PerFileCheckpointStorage(storeDir: Path)
+fun addCheckpoint(checkpoint: Checkpoint): Unit
val checkpoints: Iterable<Checkpoint>
-fun removeCheckpoint(checkpoint: Checkpoint): Unit
+fun removeCheckpoint(checkpoint: Checkpoint): Unit
val storeDir: Path
@@ -8902,7 +8902,7 @@ -ArtemisMessagingService(directory: Path, myHostPort: <ERROR CLASS>, defaultExecutor: Executor = RunOnCallerThread)
+ArtemisMessagingService(directory: Path, myHostPort: <ERROR CLASS>, defaultExecutor: Executor = RunOnCallerThread)
inner class Handler : MessageHandlerRegistration
val TOPIC_PROPERTY: String
-fun addMessageHandler(topic: String, executor: Executor?, callback: (Message, MessageHandlerRegistration) -> Unit): MessageHandlerRegistration
-fun createMessage(topic: String, data: ByteArray): Message
+fun addMessageHandler(topic: String, executor: Executor?, callback: (Message, MessageHandlerRegistration) -> Unit): MessageHandlerRegistration
+fun createMessage(topic: String, data: ByteArray): Message
val defaultExecutor: Executor
val directory: Path
val log: <ERROR CLASS>
-fun makeRecipient(hostAndPort: <ERROR CLASS>): SingleMessageRecipient
-fun makeRecipient(hostname: String): <ERROR CLASS>
+fun makeRecipient(hostAndPort: <ERROR CLASS>): SingleMessageRecipient
+fun makeRecipient(hostname: String): <ERROR CLASS>
val myAddress: SingleMessageRecipient
val myHostPort: <ERROR CLASS>
-fun removeMessageHandler(registration: MessageHandlerRegistration): Unit
-fun send(message: Message, target: MessageRecipients): Unit
+fun removeMessageHandler(registration: MessageHandlerRegistration): Unit
+fun send(message: Message, target: MessageRecipients): Unit
fun start(): Unit
fun stop(): Unit
-fun toHostAndPort(hostname: String): <ERROR CLASS>
+fun toHostAndPort(hostname: String): <ERROR CLASS>
@@ -8944,7 +8944,7 @@ -DataVendingService(net: MessagingService, storage: StorageService)
+DataVendingService(net: MessagingService, storage: StorageService)
class Request : AbstractRequestMessage
@@ -9000,19 +9000,19 @@ InMemoryNetworkMapCache()
-open fun addMapService(smm: StateMachineManager, net: MessagingService, service: NodeInfo, subscribe: Boolean, ifChangedSinceVer: Int?): <ERROR CLASS><Unit>
-open fun addNode(node: NodeInfo): Unit
-open fun deregisterForUpdates(smm: StateMachineManager, net: MessagingService, service: NodeInfo): <ERROR CLASS><Unit>
+open fun addMapService(smm: StateMachineManager, net: MessagingService, service: NodeInfo, subscribe: Boolean, ifChangedSinceVer: Int?): <ERROR CLASS><Unit>
+open fun addNode(node: NodeInfo): Unit
+open fun deregisterForUpdates(smm: StateMachineManager, net: MessagingService, service: NodeInfo): <ERROR CLASS><Unit>
open fun get(): <ERROR CLASS>
-open fun get(serviceType: ServiceType): <ERROR CLASS>
-open fun getRecommended(type: ServiceType, contract: Contract, vararg party: Party): NodeInfo?
+open fun get(serviceType: ServiceType): <ERROR CLASS>
+open fun getRecommended(type: ServiceType, contract: Contract, vararg party: Party): NodeInfo?
open val networkMapNodes: List<NodeInfo>
open val partyNodes: List<NodeInfo>
-fun processUpdatePush(req: Update): Unit
+fun processUpdatePush(req: Update): Unit
open val ratesOracleNodes: List<NodeInfo>
protected var registeredNodes: MutableMap<Party, NodeInfo>
open val regulators: List<NodeInfo>
-open fun removeNode(node: NodeInfo): Unit
+open fun removeNode(node: NodeInfo): Unit
open val timestampingNodes: List<NodeInfo>
@@ -9027,8 +9027,8 @@ abstract fun freshKey(): KeyPair
abstract val keys: Map<PublicKey, PrivateKey>
-open fun toKeyPair(publicKey: PublicKey): KeyPair
-open fun toPrivate(publicKey: PublicKey): PrivateKey
+open fun toKeyPair(publicKey: PublicKey): KeyPair
+open fun toPrivate(publicKey: PublicKey): PrivateKey
@@ -9076,19 +9076,19 @@ -abstract fun addMapService(smm: StateMachineManager, net: MessagingService, service: NodeInfo, subscribe: Boolean, ifChangedSinceVer: Int? = null): <ERROR CLASS><Unit>
-abstract fun addNode(node: NodeInfo): Unit
-abstract fun deregisterForUpdates(smm: StateMachineManager, net: MessagingService, service: NodeInfo): <ERROR CLASS><Unit>
+abstract fun addMapService(smm: StateMachineManager, net: MessagingService, service: NodeInfo, subscribe: Boolean, ifChangedSinceVer: Int? = null): <ERROR CLASS><Unit>
+abstract fun addNode(node: NodeInfo): Unit
+abstract fun deregisterForUpdates(smm: StateMachineManager, net: MessagingService, service: NodeInfo): <ERROR CLASS><Unit>
abstract fun get(): Collection<NodeInfo>
-abstract fun get(serviceType: ServiceType): Collection<NodeInfo>
-abstract fun getRecommended(type: ServiceType, contract: Contract, vararg party: Party): NodeInfo?
+abstract fun get(serviceType: ServiceType): Collection<NodeInfo>
+abstract fun getRecommended(type: ServiceType, contract: Contract, vararg party: Party): NodeInfo?
val logger: <ERROR CLASS>
abstract val networkMapNodes: List<NodeInfo>
-open fun nodeForPartyName(name: String): NodeInfo?
+open fun nodeForPartyName(name: String): NodeInfo?
abstract val partyNodes: List<NodeInfo>
abstract val ratesOracleNodes: List<NodeInfo>
abstract val regulators: List<NodeInfo>
-abstract fun removeNode(node: NodeInfo): Unit
+abstract fun removeNode(node: NodeInfo): Unit
abstract val timestampingNodes: List<NodeInfo>
@@ -9101,12 +9101,12 @@ -NodeWalletService(services: ServiceHub)
+NodeWalletService(services: ServiceHub)
val cashBalances: Map<Currency, Amount>
val currentWallet: Wallet
-fun fillWithSomeTestCash(howMuch: Amount, atLeastThisManyStates: Int = 3, atMostThisManyStates: Int = 10, rng: Random = Random()): Unit
+fun fillWithSomeTestCash(howMuch: Amount, atLeastThisManyStates: Int = 3, atMostThisManyStates: Int = 10, rng: Random = Random()): Unit
val linearHeads: Map<SecureHash, StateAndRef<LinearState>>
-fun notifyAll(txns: Iterable<WireTransaction>): Wallet
+fun notifyAll(txns: Iterable<WireTransaction>): Wallet
@@ -9134,7 +9134,7 @@ -StorageServiceImpl(attachments: AttachmentStorage, checkpointStorage: CheckpointStorage, myLegalIdentityKey: KeyPair, myLegalIdentity: Party = Party("Unit test party", myLegalIdentityKey.public), recordingAs: (String) -> String = { tableName -> "" })
+StorageServiceImpl(attachments: AttachmentStorage, checkpointStorage: CheckpointStorage, myLegalIdentityKey: KeyPair, myLegalIdentity: Party = Party("Unit test party", myLegalIdentityKey.public), recordingAs: (String) -> String = { tableName -> "" })
open val attachments: AttachmentStorage
open val checkpointStorage: CheckpointStorage
open val myLegalIdentity: Party
@@ -9169,7 +9169,7 @@ -WalletImpl(states: List<StateAndRef<ContractState>>)
+WalletImpl(states: List<StateAndRef<ContractState>>)
val cashBalances: Map<Currency, Amount>
val states: List<StateAndRef<ContractState>>
@@ -9186,10 +9186,10 @@ abstract val cashBalances: Map<Currency, Amount>
abstract val currentWallet: Wallet
abstract val linearHeads: Map<SecureHash, StateAndRef<LinearState>>
-open fun <T : LinearState> linearHeadsOfType_(stateType: Class<T>): Map<SecureHash, StateAndRef<T>>
-open fun notify(tx: WireTransaction): Wallet
-abstract fun notifyAll(txns: Iterable<WireTransaction>): Wallet
-open fun statesForRefs(refs: List<StateRef>): Map<StateRef, ContractState?>
+open fun <T : LinearState> linearHeadsOfType_(stateType: Class<T>): Map<SecureHash, StateAndRef<T>>
+open fun notify(tx: WireTransaction): Wallet
+abstract fun notifyAll(txns: Iterable<WireTransaction>): Wallet
+open fun statesForRefs(refs: List<StateRef>): Map<StateRef, ContractState?>
@@ -9239,7 +9239,7 @@ val logger: <ERROR CLASS>
val loggerName: String
val logic: ProtocolLogic<R>
-fun prepareForResumeWith(serviceHub: ServiceHub, withObject: Any?, suspendAction: (FiberRequest, SerializedBytes<ProtocolStateMachine<*>>) -> Unit): Unit
+fun prepareForResumeWith(serviceHub: ServiceHub, withObject: Any?, suspendAction: (FiberRequest, SerializedBytes<ProtocolStateMachine<*>>) -> Unit): Unit
fun <T : Any> receive(topic: String, sessionIDForReceive: Long, recvType: Class<T>): UntrustworthyData<T>
val resultFuture: <ERROR CLASS><R>
fun run(): R
@@ -9390,7 +9390,7 @@ -IRSSimulation(runAsync: Boolean, latencyInjector: LatencyCalculator?)
+IRSSimulation(runAsync: Boolean, latencyInjector: LatencyCalculator?)
fun iterate(): Unit
val om: <ERROR CLASS>
fun start(): Unit
@@ -9414,7 +9414,7 @@ -Builder(manuallyPumped: Boolean, id: Handle)
+Builder(manuallyPumped: Boolean, id: Handle)
val id: Handle
val manuallyPumped: Boolean
fun start(): <ERROR CLASS><InMemoryMessaging>
@@ -9429,8 +9429,8 @@ -Handle(id: Int)
-fun equals(other: Any?): Boolean
+Handle(id: Int)
+fun equals(other: Any?): Boolean
fun hashCode(): Int
val id: Int
fun toString(): String
@@ -9445,7 +9445,7 @@ -InMemoryMessaging(manuallyPumped: Boolean, handle: Handle)
+InMemoryMessaging(manuallyPumped: Boolean, handle: Handle)
inner class Handler : MessageHandlerRegistration
-fun addMessageHandler(topic: String, executor: Executor?, callback: (Message, MessageHandlerRegistration) -> Unit): MessageHandlerRegistration
+fun addMessageHandler(topic: String, executor: Executor?, callback: (Message, MessageHandlerRegistration) -> Unit): MessageHandlerRegistration
protected val backgroundThread: Nothing?
-fun createMessage(topic: String, data: ByteArray): Message
+fun createMessage(topic: String, data: ByteArray): Message
val myAddress: SingleMessageRecipient
-fun pump(block: Boolean): Boolean
-fun removeMessageHandler(registration: MessageHandlerRegistration): Unit
+fun pump(block: Boolean): Boolean
+fun removeMessageHandler(registration: MessageHandlerRegistration): Unit
protected var running: Boolean
-fun send(message: Message, target: MessageRecipients): Unit
+fun send(message: Message, target: MessageRecipients): Unit
protected val state: ThreadBox<InnerState>
fun stop(): Unit
@@ -9496,17 +9496,17 @@ -abstract fun between(sender: SingleMessageRecipient, receiver: SingleMessageRecipient): Duration
+abstract fun between(sender: SingleMessageRecipient, receiver: SingleMessageRecipient): Duration
val allMessages: <ERROR CLASS><<ERROR CLASS><SingleMessageRecipient, Message, MessageRecipients>>
-fun createNode(manuallyPumped: Boolean): <ERROR CLASS><Handle, MessagingServiceBuilder<InMemoryMessaging>>
-fun createNodeWithID(manuallyPumped: Boolean, id: Int): MessagingServiceBuilder<InMemoryMessaging>
+fun createNode(manuallyPumped: Boolean): <ERROR CLASS><Handle, MessagingServiceBuilder<InMemoryMessaging>>
+fun createNodeWithID(manuallyPumped: Boolean, id: Int): MessagingServiceBuilder<InMemoryMessaging>
val endpoints: List<InMemoryMessaging>
val everyoneOnline: AllPossibleRecipients
var latencyCalculator: LatencyCalculator?
-fun setupTimestampingNode(manuallyPumped: Boolean): <ERROR CLASS><NodeInfo, InMemoryMessaging>
+fun setupTimestampingNode(manuallyPumped: Boolean): <ERROR CLASS><NodeInfo, InMemoryMessaging>
fun stop(): Unit
@@ -9519,11 +9519,11 @@ -MockIdentityService(identities: List<Party>)
+MockIdentityService(identities: List<Party>)
val identities: List<Party>
-fun partyFromKey(key: PublicKey): Party?
-fun partyFromName(name: String): Party?
-fun registerIdentity(party: Party): Unit
+fun partyFromKey(key: PublicKey): Party?
+fun partyFromName(name: String): Party?
+fun registerIdentity(party: Party): Unit
@@ -9535,7 +9535,7 @@ -MockNetwork(threadPerNode: Boolean = false, defaultFactory: Factory = MockNetwork.DefaultFactory)
+MockNetwork(threadPerNode: Boolean = false, defaultFactory: Factory = MockNetwork.DefaultFactory)
object DefaultFactory : Factory
@@ -9556,7 +9556,7 @@ -abstract fun create(dir: Path, config: NodeConfiguration, network: MockNetwork, networkMapAddr: NodeInfo?, advertisedServices: Set<ServiceType>, id: Int): MockNode
+abstract fun create(dir: Path, config: NodeConfiguration, network: MockNetwork, networkMapAddr: NodeInfo?, advertisedServices: Set<ServiceType>, id: Int): MockNode
@@ -9568,7 +9568,7 @@ -MockNode(dir: Path, config: NodeConfiguration, mockNet: MockNetwork, networkMapAddr: NodeInfo?, advertisedServices: Set<ServiceType>, id: Int)
+MockNode(dir: Path, config: NodeConfiguration, mockNet: MockNetwork, networkMapAddr: NodeInfo?, advertisedServices: Set<ServiceType>, id: Int)
protected open fun findMyLocation(): PhysicalLocation?
val id: Int
protected open val log: <ERROR CLASS>
@@ -9582,14 +9582,14 @@ -fun addressToNode(address: SingleMessageRecipient): MockNode
-fun createNode(networkMapAddress: NodeInfo? = null, forcedID: Int = -1, nodeFactory: Factory = defaultFactory, vararg advertisedServices: ServiceType): MockNode
-fun createTwoNodes(nodeFactory: Factory = defaultFactory): <ERROR CLASS><MockNode, MockNode>
+fun addressToNode(address: SingleMessageRecipient): MockNode
+fun createNode(networkMapAddress: NodeInfo? = null, forcedID: Int = -1, nodeFactory: Factory = defaultFactory, vararg advertisedServices: ServiceType): MockNode
+fun createTwoNodes(nodeFactory: Factory = defaultFactory): <ERROR CLASS><MockNode, MockNode>
val filesystem: <ERROR CLASS>
val identities: ArrayList<Party>
val messagingNetwork: InMemoryMessagingNetwork
val nodes: List<MockNode>
-fun runNetwork(rounds: Int = -1): Unit
+fun runNetwork(rounds: Int = -1): Unit
@@ -9610,13 +9610,13 @@ -MockAddress(id: String)
+MockAddress(id: String)
val id: String
-fun addRegistration(node: NodeInfo): Unit
-fun deleteRegistration(identity: Party): Boolean
+fun addRegistration(node: NodeInfo): Unit
+fun deleteRegistration(identity: Party): Boolean
@@ -9628,7 +9628,7 @@ -Simulation(runAsync: Boolean, latencyInjector: LatencyCalculator?)
+Simulation(runAsync: Boolean, latencyInjector: LatencyCalculator?)
inner class BankFactory : Factory
@@ -9664,7 +9664,7 @@ -fun create(dir: Path, config: NodeConfiguration, network: MockNetwork, networkMapAddr: NodeInfo?, advertisedServices: Set<ServiceType>, id: Int): MockNode
+fun create(dir: Path, config: NodeConfiguration, network: MockNetwork, networkMapAddr: NodeInfo?, advertisedServices: Set<ServiceType>, id: Int): MockNode
@@ -9676,7 +9676,7 @@ -fun create(dir: Path, config: NodeConfiguration, network: MockNetwork, networkMapAddr: NodeInfo?, advertisedServices: Set<ServiceType>, id: Int): MockNode
+fun create(dir: Path, config: NodeConfiguration, network: MockNetwork, networkMapAddr: NodeInfo?, advertisedServices: Set<ServiceType>, id: Int): MockNode
@@ -9688,7 +9688,7 @@ -SimulatedNode(dir: Path, config: NodeConfiguration, mockNet: MockNetwork, networkMapAddress: NodeInfo?, advertisedServices: Set<ServiceType>, id: Int)
+SimulatedNode(dir: Path, config: NodeConfiguration, mockNet: MockNetwork, networkMapAddress: NodeInfo?, advertisedServices: Set<ServiceType>, id: Int)
protected open fun findMyLocation(): PhysicalLocation?
@@ -9701,7 +9701,7 @@ -fun create(dir: Path, config: NodeConfiguration, network: MockNetwork, networkMapAddr: NodeInfo?, advertisedServices: Set<ServiceType>, id: Int): MockNode
+fun create(dir: Path, config: NodeConfiguration, network: MockNetwork, networkMapAddr: NodeInfo?, advertisedServices: Set<ServiceType>, id: Int): MockNode
@@ -9715,8 +9715,8 @@ val extraNodeLabels: MutableMap<SimulatedNode, String>
open fun iterate(): Unit
val latencyInjector: LatencyCalculator?
-protected fun linkConsensus(nodes: Collection<SimulatedNode>, protocol: ProtocolLogic<*>): Unit
-protected fun linkProtocolProgress(node: SimulatedNode, protocol: ProtocolLogic<*>): Unit
+protected fun linkConsensus(nodes: Collection<SimulatedNode>, protocol: ProtocolLogic<*>): Unit
+protected fun linkProtocolProgress(node: SimulatedNode, protocol: ProtocolLogic<*>): Unit
val network: MockNetwork
val networkMap: SimulatedNode
val ratesOracle: SimulatedNode
@@ -9724,7 +9724,7 @@ val runAsync: Boolean
val serviceProviders: List<SimulatedNode>
open fun start(): Unit
-fun startTradingCircle(tradeBetween: (Int, Int) -> <ERROR CLASS><out <ERROR CLASS>>): Unit
+fun startTradingCircle(tradeBetween: (Int, Int) -> <ERROR CLASS><out <ERROR CLASS>>): Unit
fun stop(): Unit
val timestamper: SimulatedNode
@@ -9738,7 +9738,7 @@ -TradeSimulation(runAsync: Boolean, latencyInjector: LatencyCalculator?)
+TradeSimulation(runAsync: Boolean, latencyInjector: LatencyCalculator?)
fun start(): Unit
@@ -9795,8 +9795,8 @@ -Gate(alwaysQueue: Boolean = false)
-fun execute(command: Runnable): Unit
+Gate(alwaysQueue: Boolean = false)
+fun execute(command: Runnable): Unit
val isOnThread: Boolean
val taskQueueSize: Int
fun waitAndRun(): Unit
@@ -9812,8 +9812,8 @@ -ServiceAffinityExecutor(threadName: String, numThreads: Int)
-protected fun afterExecute(r: Runnable, t: Throwable?): Unit
+ServiceAffinityExecutor(threadName: String, numThreads: Int)
+protected fun afterExecute(r: Runnable, t: Throwable?): Unit
val isOnThread: Boolean
val logger: <ERROR CLASS>
protected val threads: MutableSet<Thread>
@@ -9821,8 +9821,8 @@ open fun checkOnThread(): Unit
-open fun executeASAP(runnable: () -> Unit): Unit
-open fun <T> fetchFrom(fetcher: () -> T): T
+open fun executeASAP(runnable: () -> Unit): Unit
+open fun <T> fetchFrom(fetcher: () -> T): T
open fun flush(): Unit
abstract val isOnThread: Boolean
@@ -9889,7 +9889,7 @@ -fun deserialize(parser: <ERROR CLASS>, context: <ERROR CLASS>): BusinessCalendar
+fun deserialize(parser: <ERROR CLASS>, context: <ERROR CLASS>): BusinessCalendar
@@ -9901,7 +9901,7 @@ -fun deserialize(parser: <ERROR CLASS>, context: <ERROR CLASS>): LocalDate
+fun deserialize(parser: <ERROR CLASS>, context: <ERROR CLASS>): LocalDate
@@ -9913,7 +9913,7 @@ -fun deserializeKey(text: String, p1: <ERROR CLASS>): Any?
+fun deserializeKey(text: String, p1: <ERROR CLASS>): Any?
@@ -9925,7 +9925,7 @@ -fun deserialize(parser: <ERROR CLASS>, context: <ERROR CLASS>): Party
+fun deserialize(parser: <ERROR CLASS>, context: <ERROR CLASS>): Party
@@ -9937,7 +9937,7 @@ -fun serialize(obj: Party, generator: <ERROR CLASS>, provider: <ERROR CLASS>): Unit
+fun serialize(obj: Party, generator: <ERROR CLASS>, provider: <ERROR CLASS>): Unit
@@ -9950,7 +9950,7 @@ SecureHashDeserializer()
-fun deserialize(parser: <ERROR CLASS>, context: <ERROR CLASS>): T
+fun deserialize(parser: <ERROR CLASS>, context: <ERROR CLASS>): T
@@ -9962,7 +9962,7 @@ -fun serialize(obj: SecureHash, generator: <ERROR CLASS>, provider: <ERROR CLASS>): Unit
+fun serialize(obj: SecureHash, generator: <ERROR CLASS>, provider: <ERROR CLASS>): Unit
@@ -9974,7 +9974,7 @@ -ServiceHubObjectMapper(identities: IdentityService)
+ServiceHubObjectMapper(identities: IdentityService)
val identities: IdentityService
@@ -9987,11 +9987,11 @@ -fun serialize(obj: Any, generator: <ERROR CLASS>, provider: <ERROR CLASS>): Unit
+fun serialize(obj: Any, generator: <ERROR CLASS>, provider: <ERROR CLASS>): Unit
-fun createDefaultMapper(identities: IdentityService): <ERROR CLASS>
+fun createDefaultMapper(identities: IdentityService): <ERROR CLASS>
@@ -10316,7 +10316,7 @@ object DEALING : Step
object RECEIVED : Step
-fun register(node: Node): Unit
+fun register(node: Node): Unit
fun tracker(): <ERROR CLASS>
@@ -10388,7 +10388,7 @@ -fun register(node: Node): Unit
+fun register(node: Node): Unit
@@ -10430,7 +10430,7 @@ -fun register(node: Node): Unit
+fun register(node: Node): Unit
@@ -10725,7 +10725,7 @@ -Client(stateMachineManager: StateMachineManager, node: NodeInfo)
+Client(stateMachineManager: StateMachineManager, node: NodeInfo)
val identity: Party
fun timestamp(wtxBytes: SerializedBytes<WireTransaction>): LegallyIdentifiable
@@ -11056,8 +11056,8 @@ -fun runBuyer(smm: StateMachineManager, timestampingAuthority: NodeInfo, otherSide: SingleMessageRecipient, acceptablePrice: Amount, typeToBuy: Class<out OwnableState>, sessionID: Long): <ERROR CLASS><SignedTransaction>
-fun runSeller(smm: StateMachineManager, timestampingAuthority: NodeInfo, otherSide: SingleMessageRecipient, assetToSell: StateAndRef<OwnableState>, price: Amount, myKeyPair: KeyPair, buyerSessionID: Long): <ERROR CLASS><SignedTransaction>
+fun runBuyer(smm: StateMachineManager, timestampingAuthority: NodeInfo, otherSide: SingleMessageRecipient, acceptablePrice: Amount, typeToBuy: Class<out OwnableState>, sessionID: Long): <ERROR CLASS><SignedTransaction>
+fun runSeller(smm: StateMachineManager, timestampingAuthority: NodeInfo, otherSide: SingleMessageRecipient, assetToSell: StateAndRef<OwnableState>, price: Amount, myKeyPair: KeyPair, buyerSessionID: Long): <ERROR CLASS><SignedTransaction>
diff --git a/docs/build/html/api/protocols/-timestamping-protocol/-client/-init-.html b/docs/build/html/api/protocols/-timestamping-protocol/-client/-init-.html index 541e2aa40f..c3011766e7 100644 --- a/docs/build/html/api/protocols/-timestamping-protocol/-client/-init-.html +++ b/docs/build/html/api/protocols/-timestamping-protocol/-client/-init-.html @@ -7,7 +7,7 @@ protocols / TimestampingProtocol / Client / <init>

<init>

-Client(stateMachineManager: StateMachineManager, node: NodeInfo)
+Client(stateMachineManager: StateMachineManager, node: NodeInfo)


diff --git a/docs/build/html/api/protocols/-timestamping-protocol/-client/index.html b/docs/build/html/api/protocols/-timestamping-protocol/-client/index.html index ffb03b9c53..4883121a6c 100644 --- a/docs/build/html/api/protocols/-timestamping-protocol/-client/index.html +++ b/docs/build/html/api/protocols/-timestamping-protocol/-client/index.html @@ -17,7 +17,7 @@ <init> -Client(stateMachineManager: StateMachineManager, node: NodeInfo) +Client(stateMachineManager: StateMachineManager, node: NodeInfo) diff --git a/docs/build/html/api/protocols/-two-party-trade-protocol/index.html b/docs/build/html/api/protocols/-two-party-trade-protocol/index.html index 0be05414e7..bfe880a31f 100644 --- a/docs/build/html/api/protocols/-two-party-trade-protocol/index.html +++ b/docs/build/html/api/protocols/-two-party-trade-protocol/index.html @@ -92,13 +92,13 @@ transaction is available: you can either block your thread waiting for the proto runBuyer -fun runBuyer(smm: StateMachineManager, timestampingAuthority: NodeInfo, otherSide: SingleMessageRecipient, acceptablePrice: Amount, typeToBuy: Class<out OwnableState>, sessionID: Long): <ERROR CLASS><SignedTransaction> +fun runBuyer(smm: StateMachineManager, timestampingAuthority: NodeInfo, otherSide: SingleMessageRecipient, acceptablePrice: Amount, typeToBuy: Class<out OwnableState>, sessionID: Long): <ERROR CLASS><SignedTransaction> runSeller -fun runSeller(smm: StateMachineManager, timestampingAuthority: NodeInfo, otherSide: SingleMessageRecipient, assetToSell: StateAndRef<OwnableState>, price: Amount, myKeyPair: KeyPair, buyerSessionID: Long): <ERROR CLASS><SignedTransaction> +fun runSeller(smm: StateMachineManager, timestampingAuthority: NodeInfo, otherSide: SingleMessageRecipient, assetToSell: StateAndRef<OwnableState>, price: Amount, myKeyPair: KeyPair, buyerSessionID: Long): <ERROR CLASS><SignedTransaction> diff --git a/docs/build/html/api/protocols/-two-party-trade-protocol/run-buyer.html b/docs/build/html/api/protocols/-two-party-trade-protocol/run-buyer.html index c1becb3efa..0d2a487e35 100644 --- a/docs/build/html/api/protocols/-two-party-trade-protocol/run-buyer.html +++ b/docs/build/html/api/protocols/-two-party-trade-protocol/run-buyer.html @@ -7,8 +7,8 @@ protocols / TwoPartyTradeProtocol / runBuyer

runBuyer

- -fun runBuyer(smm: StateMachineManager, timestampingAuthority: NodeInfo, otherSide: SingleMessageRecipient, acceptablePrice: Amount, typeToBuy: Class<out OwnableState>, sessionID: Long): <ERROR CLASS><SignedTransaction>
+ +fun runBuyer(smm: StateMachineManager, timestampingAuthority: NodeInfo, otherSide: SingleMessageRecipient, acceptablePrice: Amount, typeToBuy: Class<out OwnableState>, sessionID: Long): <ERROR CLASS><SignedTransaction>


diff --git a/docs/build/html/api/protocols/-two-party-trade-protocol/run-seller.html b/docs/build/html/api/protocols/-two-party-trade-protocol/run-seller.html index 8cae4d2b17..e8f5ebcd17 100644 --- a/docs/build/html/api/protocols/-two-party-trade-protocol/run-seller.html +++ b/docs/build/html/api/protocols/-two-party-trade-protocol/run-seller.html @@ -7,8 +7,8 @@ protocols / TwoPartyTradeProtocol / runSeller

runSeller

- -fun runSeller(smm: StateMachineManager, timestampingAuthority: NodeInfo, otherSide: SingleMessageRecipient, assetToSell: StateAndRef<OwnableState>, price: Amount, myKeyPair: KeyPair, buyerSessionID: Long): <ERROR CLASS><SignedTransaction>
+ +fun runSeller(smm: StateMachineManager, timestampingAuthority: NodeInfo, otherSide: SingleMessageRecipient, assetToSell: StateAndRef<OwnableState>, price: Amount, myKeyPair: KeyPair, buyerSessionID: Long): <ERROR CLASS><SignedTransaction>


diff --git a/node/src/main/kotlin/core/testing/MockIdentityService.kt b/node/src/main/kotlin/core/testing/MockIdentityService.kt deleted file mode 100644 index 8b67b6b01e..0000000000 --- a/node/src/main/kotlin/core/testing/MockIdentityService.kt +++ /dev/null @@ -1,24 +0,0 @@ -package core.testing - -import core.crypto.Party -import core.node.services.IdentityService -import java.security.PublicKey -import javax.annotation.concurrent.ThreadSafe - -/** - * Scaffolding: a dummy identity service that just expects to have identities loaded off disk or found elsewhere. - * This class allows the provided list of identities to be mutated after construction, so it takes the list lock - * when doing lookups and recalculates the mapping each time. The ability to change the list is used by the - * MockNetwork code. - */ -@ThreadSafe -class MockIdentityService(val identities: List) : IdentityService { - private val keyToParties: Map - get() = synchronized(identities) { identities.associateBy { it.owningKey } } - private val nameToParties: Map - get() = synchronized(identities) { identities.associateBy { it.name } } - - override fun registerIdentity(party: Party) { throw UnsupportedOperationException() } - override fun partyFromKey(key: PublicKey): Party? = keyToParties[key] - override fun partyFromName(name: String): Party? = nameToParties[name] -} \ No newline at end of file diff --git a/node/src/main/kotlin/api/APIServer.kt b/node/src/main/kotlin/node/api/APIServer.kt similarity index 99% rename from node/src/main/kotlin/api/APIServer.kt rename to node/src/main/kotlin/node/api/APIServer.kt index a97f3af4a6..8d5a3e052a 100644 --- a/node/src/main/kotlin/api/APIServer.kt +++ b/node/src/main/kotlin/node/api/APIServer.kt @@ -1,5 +1,6 @@ -package api +package node.api +import node.api.StatesQuery import core.contracts.ContractState import core.contracts.SignedTransaction import core.contracts.StateRef diff --git a/node/src/main/kotlin/api/Query.kt b/node/src/main/kotlin/node/api/Query.kt similarity index 97% rename from node/src/main/kotlin/api/Query.kt rename to node/src/main/kotlin/node/api/Query.kt index 6d98299d7f..760203c9d0 100644 --- a/node/src/main/kotlin/api/Query.kt +++ b/node/src/main/kotlin/node/api/Query.kt @@ -1,4 +1,4 @@ -package api +package node.api /** * Extremely rudimentary query language which should most likely be replaced with a product diff --git a/node/src/main/kotlin/api/APIServerImpl.kt b/node/src/main/kotlin/node/internal/APIServerImpl.kt similarity index 97% rename from node/src/main/kotlin/api/APIServerImpl.kt rename to node/src/main/kotlin/node/internal/APIServerImpl.kt index 1b48d9afce..9b2203c136 100644 --- a/node/src/main/kotlin/api/APIServerImpl.kt +++ b/node/src/main/kotlin/node/internal/APIServerImpl.kt @@ -1,15 +1,14 @@ -package api +package node.internal import com.google.common.util.concurrent.ListenableFuture -import core.* import core.contracts.* import core.crypto.DigitalSignature import core.crypto.SecureHash -import core.node.AbstractNode -import core.node.subsystems.linearHeadsOfType +import core.node.services.linearHeadsOfType import core.protocols.ProtocolLogic import core.serialization.SerializedBytes -import core.utilities.ANSIProgressRenderer +import node.api.* +import node.utilities.* import java.time.LocalDateTime import java.util.* import kotlin.reflect.KParameter diff --git a/node/src/main/kotlin/core/node/AbstractNode.kt b/node/src/main/kotlin/node/internal/AbstractNode.kt similarity index 86% rename from node/src/main/kotlin/core/node/AbstractNode.kt rename to node/src/main/kotlin/node/internal/AbstractNode.kt index c7a4dc96c8..960ece9091 100644 --- a/node/src/main/kotlin/core/node/AbstractNode.kt +++ b/node/src/main/kotlin/node/internal/AbstractNode.kt @@ -1,25 +1,44 @@ -package core.node +package node.internal -import api.APIServer -import api.APIServerImpl 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.StateMachineManager import core.messaging.runOnNextMessage +import core.node.CityDatabase +import core.node.NodeInfo +import core.node.PhysicalLocation import core.node.services.* -import core.node.storage.CheckpointStorage -import core.node.storage.PerFileCheckpointStorage -import core.node.subsystems.* import core.random63BitValue import core.seconds import core.serialization.deserialize import core.serialization.serialize -import core.utilities.AddOrRemove -import core.utilities.AffinityExecutor +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 org.slf4j.Logger import java.nio.file.FileAlreadyExistsException import java.nio.file.Files @@ -60,7 +79,7 @@ abstract class AbstractNode(val dir: Path, val configuration: NodeConfiguration, protected val _servicesThatAcceptUploads = ArrayList() val servicesThatAcceptUploads: List = _servicesThatAcceptUploads - val services = object : ServiceHub { + val services = object : ServiceHubInternal { override val networkService: MessagingService get() = net override val networkMapCache: NetworkMapCache = InMemoryNetworkMapCache() override val storageService: StorageService get() = storage @@ -78,6 +97,7 @@ abstract class AbstractNode(val dir: Path, val configuration: NodeConfiguration, open fun findMyLocation(): PhysicalLocation? = CityDatabase[configuration.nearestCity] lateinit var storage: StorageService + lateinit var checkpointStorage: CheckpointStorage lateinit var smm: StateMachineManager lateinit var wallet: WalletService lateinit var keyManagement: E2ETestKeyManagementService @@ -99,9 +119,11 @@ abstract class AbstractNode(val dir: Path, val configuration: NodeConfiguration, require(!started) { "Node has already been started" } log.info("Node starting up ...") - storage = initialiseStorageService(dir) + val storageServices = initialiseStorageService(dir) + storage = storageServices.first + checkpointStorage = storageServices.second net = makeMessagingService() - smm = StateMachineManager(services, serverThread) + smm = StateMachineManager(services, checkpointStorage, serverThread) wallet = NodeWalletService(services) keyManagement = E2ETestKeyManagementService() makeInterestRatesOracleService() @@ -216,16 +238,16 @@ abstract class AbstractNode(val dir: Path, val configuration: NodeConfiguration, protected abstract fun startMessagingService() - protected open fun initialiseStorageService(dir: Path): StorageService { + protected open fun initialiseStorageService(dir: Path): Pair { val attachments = makeAttachmentStorage(dir) val checkpointStorage = PerFileCheckpointStorage(dir.resolve("checkpoints")) _servicesThatAcceptUploads += attachments val (identity, keypair) = obtainKeyPair(dir) - return constructStorageService(attachments, checkpointStorage, keypair, identity) + return Pair(constructStorageService(attachments, keypair, identity),checkpointStorage) } - protected open fun constructStorageService(attachments: NodeAttachmentService, checkpointStorage: CheckpointStorage, keypair: KeyPair, identity: Party) = - StorageServiceImpl(attachments, checkpointStorage, keypair, identity) + protected open fun constructStorageService(attachments: NodeAttachmentService, keypair: KeyPair, identity: Party) = + StorageServiceImpl(attachments, keypair, identity) private fun obtainKeyPair(dir: Path): Pair { // Load the private identity key, creating it if necessary. The identity key is a long term well known key that diff --git a/node/src/main/kotlin/core/node/Node.kt b/node/src/main/kotlin/node/internal/Node.kt similarity index 93% rename from node/src/main/kotlin/core/node/Node.kt rename to node/src/main/kotlin/node/internal/Node.kt index f4638cddc6..7bb63541e3 100644 --- a/node/src/main/kotlin/core/node/Node.kt +++ b/node/src/main/kotlin/node/internal/Node.kt @@ -1,16 +1,19 @@ -package core.node +package node.internal -import api.Config -import api.ResponseFilter import com.codahale.metrics.JmxReporter import com.google.common.net.HostAndPort import core.messaging.MessagingService -import core.node.subsystems.ArtemisMessagingService +import core.node.NodeInfo import core.node.services.ServiceType -import core.node.servlets.AttachmentDownloadServlet -import core.node.servlets.DataUploadServlet -import core.utilities.AffinityExecutor 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 org.eclipse.jetty.server.Server import org.eclipse.jetty.server.handler.HandlerCollection import org.eclipse.jetty.servlet.ServletContextHandler @@ -48,7 +51,7 @@ class ConfigurationException(message: String) : Exception(message) * @param clock The clock used within the node and by all protocols etc */ class Node(dir: Path, val p2pAddr: HostAndPort, configuration: NodeConfiguration, - networkMapAddress: NodeInfo?,advertisedServices: Set, + networkMapAddress: NodeInfo?, advertisedServices: Set, clock: Clock = Clock.systemUTC(), val clientAPIs: List> = listOf()) : AbstractNode(dir, configuration, networkMapAddress, advertisedServices, clock) { companion object { @@ -106,7 +109,7 @@ class Node(dir: Path, val p2pAddr: HostAndPort, configuration: NodeConfiguration resourceConfig.register(api) for(customAPIClass in clientAPIs) { - val customAPI = customAPIClass.getConstructor(api.APIServer::class.java).newInstance(api) + val customAPI = customAPIClass.getConstructor(APIServer::class.java).newInstance(api) resourceConfig.register(customAPI) } diff --git a/node/src/main/kotlin/core/testing/IRSSimulation.kt b/node/src/main/kotlin/node/internal/testing/IRSSimulation.kt similarity index 95% rename from node/src/main/kotlin/core/testing/IRSSimulation.kt rename to node/src/main/kotlin/node/internal/testing/IRSSimulation.kt index 40ee89c241..fb260dc04a 100644 --- a/node/src/main/kotlin/core/testing/IRSSimulation.kt +++ b/node/src/main/kotlin/node/internal/testing/IRSSimulation.kt @@ -1,4 +1,4 @@ -package core.testing +package node.internal.testing import com.fasterxml.jackson.module.kotlin.readValue import com.google.common.util.concurrent.FutureCallback @@ -6,12 +6,17 @@ 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.* +import core.RunOnCallerThread import core.contracts.SignedTransaction import core.contracts.StateAndRef import core.crypto.SecureHash -import core.node.subsystems.linearHeadsOfType -import core.utilities.JsonSupport +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 java.security.KeyPair import java.time.LocalDate diff --git a/node/src/main/kotlin/core/testing/MockNode.kt b/node/src/main/kotlin/node/internal/testing/MockNode.kt similarity index 93% rename from node/src/main/kotlin/core/testing/MockNode.kt rename to node/src/main/kotlin/node/internal/testing/MockNode.kt index e4ed552616..897e3bfe59 100644 --- a/node/src/main/kotlin/core/testing/MockNode.kt +++ b/node/src/main/kotlin/node/internal/testing/MockNode.kt @@ -1,19 +1,22 @@ -package core.testing +package 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.AbstractNode -import core.node.NodeConfiguration import core.node.NodeInfo import core.node.PhysicalLocation -import core.node.services.NetworkMapService -import core.node.services.NotaryService import core.node.services.ServiceType -import core.utilities.AffinityExecutor +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 org.slf4j.Logger import java.nio.file.Files import java.nio.file.Path @@ -36,7 +39,7 @@ import java.util.* class MockNetwork(private val threadPerNode: Boolean = false, private val defaultFactory: Factory = MockNetwork.DefaultFactory) { private var counter = 0 - val filesystem = Jimfs.newFileSystem(com.google.common.jimfs.Configuration.unix()) + val filesystem = Jimfs.newFileSystem(Configuration.unix()) val messagingNetwork = InMemoryMessagingNetwork() val identities = ArrayList() diff --git a/node/src/main/kotlin/core/testing/Simulation.kt b/node/src/main/kotlin/node/internal/testing/Simulation.kt similarity index 97% rename from node/src/main/kotlin/core/testing/Simulation.kt rename to node/src/main/kotlin/node/internal/testing/Simulation.kt index 77c3a96953..d390dd5462 100644 --- a/node/src/main/kotlin/core/testing/Simulation.kt +++ b/node/src/main/kotlin/node/internal/testing/Simulation.kt @@ -1,18 +1,19 @@ -package core.testing +package node.internal.testing import com.google.common.util.concurrent.Futures import com.google.common.util.concurrent.ListenableFuture import core.node.CityDatabase -import core.node.NodeConfiguration import core.node.NodeInfo import core.node.PhysicalLocation -import core.node.services.NetworkMapService -import core.node.services.NodeInterestRates -import core.node.services.NotaryService 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 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/node/internal/testing/TestUtils.kt new file mode 100644 index 0000000000..dc8ef50e23 --- /dev/null +++ b/node/src/main/kotlin/node/internal/testing/TestUtils.kt @@ -0,0 +1,20 @@ +@file:Suppress("UNUSED_PARAMETER") + +package 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 java.util.* + +fun issueState(node: AbstractNode, notary: Party = DUMMY_NOTARY): StateRef { + val tx = DummyContract().generateInitial(node.info.identity.ref(0), Random().nextInt(), DUMMY_NOTARY) + tx.signWith(node.storage.myLegalIdentityKey) + tx.signWith(DUMMY_NOTARY_KEY) + val stx = tx.toSignedTransaction() + node.services.recordTransactions(listOf(stx)) + return StateRef(stx.id, 0) +} diff --git a/node/src/main/kotlin/core/testing/TradeSimulation.kt b/node/src/main/kotlin/node/internal/testing/TradeSimulation.kt similarity index 95% rename from node/src/main/kotlin/core/testing/TradeSimulation.kt rename to node/src/main/kotlin/node/internal/testing/TradeSimulation.kt index ce7203014c..c2def3724d 100644 --- a/node/src/main/kotlin/core/testing/TradeSimulation.kt +++ b/node/src/main/kotlin/node/internal/testing/TradeSimulation.kt @@ -1,4 +1,4 @@ -package core.testing +package node.internal.testing import com.google.common.util.concurrent.Futures import com.google.common.util.concurrent.ListenableFuture @@ -6,9 +6,10 @@ import contracts.CommercialPaper import core.contracts.DOLLARS import core.contracts.SignedTransaction import core.days -import core.node.subsystems.NodeWalletService import core.random63BitValue import core.seconds +import node.services.network.InMemoryMessagingNetwork +import node.services.wallet.NodeWalletService import protocols.TwoPartyTradeProtocol import java.time.Instant diff --git a/node/src/main/kotlin/core/node/services/AbstractNodeService.kt b/node/src/main/kotlin/node/services/api/AbstractNodeService.kt similarity index 97% rename from node/src/main/kotlin/core/node/services/AbstractNodeService.kt rename to node/src/main/kotlin/node/services/api/AbstractNodeService.kt index 7101af2282..4e174a8d54 100644 --- a/node/src/main/kotlin/core/node/services/AbstractNodeService.kt +++ b/node/src/main/kotlin/node/services/api/AbstractNodeService.kt @@ -1,8 +1,8 @@ -package core.node.services +package node.services.api import core.messaging.Message import core.messaging.MessagingService -import core.node.subsystems.TOPIC_DEFAULT_POSTFIX +import core.node.services.TOPIC_DEFAULT_POSTFIX import core.serialization.deserialize import core.serialization.serialize import protocols.AbstractRequestMessage diff --git a/node/src/main/kotlin/core/node/AcceptsFileUpload.kt b/node/src/main/kotlin/node/services/api/AcceptsFileUpload.kt similarity index 96% rename from node/src/main/kotlin/core/node/AcceptsFileUpload.kt rename to node/src/main/kotlin/node/services/api/AcceptsFileUpload.kt index ff4a791055..b9507a2c38 100644 --- a/node/src/main/kotlin/core/node/AcceptsFileUpload.kt +++ b/node/src/main/kotlin/node/services/api/AcceptsFileUpload.kt @@ -1,4 +1,4 @@ -package core.node +package node.services.api import java.io.InputStream diff --git a/core/src/main/kotlin/core/node/storage/CheckpointStorage.kt b/node/src/main/kotlin/node/services/api/CheckpointStorage.kt similarity index 98% rename from core/src/main/kotlin/core/node/storage/CheckpointStorage.kt rename to node/src/main/kotlin/node/services/api/CheckpointStorage.kt index 62990452e6..7bf6c56a5b 100644 --- a/core/src/main/kotlin/core/node/storage/CheckpointStorage.kt +++ b/node/src/main/kotlin/node/services/api/CheckpointStorage.kt @@ -1,4 +1,4 @@ -package core.node.storage +package node.services.api import core.crypto.sha256 import core.protocols.ProtocolStateMachine diff --git a/node/src/main/kotlin/node/services/api/MonitoringService.kt b/node/src/main/kotlin/node/services/api/MonitoringService.kt new file mode 100644 index 0000000000..947df40ea9 --- /dev/null +++ b/node/src/main/kotlin/node/services/api/MonitoringService.kt @@ -0,0 +1,10 @@ +package node.services.api + +import com.codahale.metrics.MetricRegistry + + +/** + * Provides access to various metrics and ways to notify monitoring services of things, for sysadmin purposes. + * This is not an interface because it is too lightweight to bother mocking out. + */ +class MonitoringService(val metrics: MetricRegistry) \ No newline at end of file diff --git a/node/src/main/kotlin/core/node/services/RegulatorService.kt b/node/src/main/kotlin/node/services/api/RegulatorService.kt similarity index 67% rename from node/src/main/kotlin/core/node/services/RegulatorService.kt rename to node/src/main/kotlin/node/services/api/RegulatorService.kt index 0c8e6476ea..683850260f 100644 --- a/node/src/main/kotlin/core/node/services/RegulatorService.kt +++ b/node/src/main/kotlin/node/services/api/RegulatorService.kt @@ -1,4 +1,6 @@ -package core.node.services +package node.services.api + +import 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/node/services/api/ServiceHubInternal.kt new file mode 100644 index 0000000000..4170ff3ea7 --- /dev/null +++ b/node/src/main/kotlin/node/services/api/ServiceHubInternal.kt @@ -0,0 +1,7 @@ +package node.services.api + +import core.node.ServiceHub + +interface ServiceHubInternal : ServiceHub { + val monitoringService: MonitoringService +} \ No newline at end of file diff --git a/node/src/main/kotlin/core/node/services/NodeInterestRates.kt b/node/src/main/kotlin/node/services/clientapi/NodeInterestRates.kt similarity index 95% rename from node/src/main/kotlin/core/node/services/NodeInterestRates.kt rename to node/src/main/kotlin/node/services/clientapi/NodeInterestRates.kt index d51a822113..4c76f7b8a4 100644 --- a/node/src/main/kotlin/core/node/services/NodeInterestRates.kt +++ b/node/src/main/kotlin/node/services/clientapi/NodeInterestRates.kt @@ -1,6 +1,5 @@ -package core.node.services +package node.services.clientapi -import core.* import core.contracts.* import core.crypto.DigitalSignature import core.crypto.Party @@ -8,12 +7,10 @@ import core.crypto.signWithECDSA import core.math.CubicSplineInterpolator import core.math.Interpolator import core.math.InterpolatorFactory -import core.messaging.Message -import core.messaging.MessagingService -import core.messaging.send -import core.node.AbstractNode -import core.node.AcceptsFileUpload -import core.serialization.deserialize +import core.node.services.ServiceType +import node.internal.AbstractNode +import node.services.api.AbstractNodeService +import node.services.api.AcceptsFileUpload import org.slf4j.LoggerFactory import protocols.RatesFixProtocol import java.io.InputStream @@ -39,9 +36,9 @@ object NodeInterestRates { */ class Service(node: AbstractNode) : AcceptsFileUpload, AbstractNodeService(node.services.networkService) { val ss = node.services.storageService - val oracle = Oracle(ss.myLegalIdentity, ss.myLegalIdentityKey) + val oracle = NodeInterestRates.Oracle(ss.myLegalIdentity, ss.myLegalIdentityKey) - private val logger = LoggerFactory.getLogger(NodeInterestRates.Service::class.java) + private val logger = LoggerFactory.getLogger(Service::class.java) init { addMessageHandler(RatesFixProtocol.TOPIC_SIGN, @@ -128,7 +125,7 @@ object NodeInterestRates { } /** Fix container, for every fix name & date pair stores a tenor to interest rate map - [InterpolatingRateMap] */ - class FixContainer(val fixes: List, val factory: InterpolatorFactory = CubicSplineInterpolator.Factory) { + class FixContainer(val fixes: List, val factory: InterpolatorFactory = CubicSplineInterpolator) { private val container = buildContainer(fixes) val size = fixes.size diff --git a/node/src/main/kotlin/core/node/NodeConfiguration.kt b/node/src/main/kotlin/node/services/config/NodeConfiguration.kt similarity index 95% rename from node/src/main/kotlin/core/node/NodeConfiguration.kt rename to node/src/main/kotlin/node/services/config/NodeConfiguration.kt index d2ef5aae79..29086f2ff1 100644 --- a/node/src/main/kotlin/core/node/NodeConfiguration.kt +++ b/node/src/main/kotlin/node/services/config/NodeConfiguration.kt @@ -1,4 +1,4 @@ -package core.node +package node.services.config import com.typesafe.config.Config import com.typesafe.config.ConfigFactory diff --git a/node/src/main/kotlin/core/node/subsystems/InMemoryIdentityService.kt b/node/src/main/kotlin/node/services/identity/InMemoryIdentityService.kt similarity index 96% rename from node/src/main/kotlin/core/node/subsystems/InMemoryIdentityService.kt rename to node/src/main/kotlin/node/services/identity/InMemoryIdentityService.kt index af931269e8..a7e903074a 100644 --- a/node/src/main/kotlin/core/node/subsystems/InMemoryIdentityService.kt +++ b/node/src/main/kotlin/node/services/identity/InMemoryIdentityService.kt @@ -1,4 +1,4 @@ -package core.node.subsystems +package node.services.identity import core.crypto.Party import core.node.services.IdentityService diff --git a/node/src/main/kotlin/core/node/subsystems/E2ETestKeyManagementService.kt b/node/src/main/kotlin/node/services/keys/E2ETestKeyManagementService.kt similarity index 94% rename from node/src/main/kotlin/core/node/subsystems/E2ETestKeyManagementService.kt rename to node/src/main/kotlin/node/services/keys/E2ETestKeyManagementService.kt index 5af47e5626..8473502023 100644 --- a/node/src/main/kotlin/core/node/subsystems/E2ETestKeyManagementService.kt +++ b/node/src/main/kotlin/node/services/keys/E2ETestKeyManagementService.kt @@ -1,8 +1,8 @@ -package core.node.subsystems +package node.services.keys import core.ThreadBox import core.crypto.generateKeyPair -import core.node.subsystems.KeyManagementService +import core.node.services.KeyManagementService import java.security.KeyPair import java.security.PrivateKey import java.security.PublicKey diff --git a/node/src/main/kotlin/core/node/subsystems/ArtemisMessagingService.kt b/node/src/main/kotlin/node/services/messaging/ArtemisMessagingService.kt similarity index 99% rename from node/src/main/kotlin/core/node/subsystems/ArtemisMessagingService.kt rename to node/src/main/kotlin/node/services/messaging/ArtemisMessagingService.kt index 81de57bb9b..ba4da3b8f7 100644 --- a/node/src/main/kotlin/core/node/subsystems/ArtemisMessagingService.kt +++ b/node/src/main/kotlin/node/services/messaging/ArtemisMessagingService.kt @@ -1,10 +1,10 @@ -package core.node.subsystems +package node.services.messaging import com.google.common.net.HostAndPort import core.RunOnCallerThread import core.ThreadBox import core.messaging.* -import core.node.Node +import node.internal.Node import core.utilities.loggerFor import org.apache.activemq.artemis.api.core.SimpleString import org.apache.activemq.artemis.api.core.TransportConfiguration diff --git a/node/src/main/kotlin/core/testing/InMemoryMessagingNetwork.kt b/node/src/main/kotlin/node/services/network/InMemoryMessagingNetwork.kt similarity index 99% rename from node/src/main/kotlin/core/testing/InMemoryMessagingNetwork.kt rename to node/src/main/kotlin/node/services/network/InMemoryMessagingNetwork.kt index ff4068d3c6..b6e9a66894 100644 --- a/node/src/main/kotlin/core/testing/InMemoryMessagingNetwork.kt +++ b/node/src/main/kotlin/node/services/network/InMemoryMessagingNetwork.kt @@ -1,4 +1,4 @@ -package core.testing +package node.services.network import com.google.common.util.concurrent.Futures import com.google.common.util.concurrent.ListenableFuture diff --git a/node/src/main/kotlin/core/node/subsystems/InMemoryNetworkMapCache.kt b/node/src/main/kotlin/node/services/network/InMemoryNetworkMapCache.kt similarity index 94% rename from node/src/main/kotlin/core/node/subsystems/InMemoryNetworkMapCache.kt rename to node/src/main/kotlin/node/services/network/InMemoryNetworkMapCache.kt index b8eb905c87..964a44a51a 100644 --- a/node/src/main/kotlin/core/node/subsystems/InMemoryNetworkMapCache.kt +++ b/node/src/main/kotlin/node/services/network/InMemoryNetworkMapCache.kt @@ -1,4 +1,4 @@ -package core.node.subsystems +package node.services.network import com.google.common.util.concurrent.ListenableFuture import com.google.common.util.concurrent.MoreExecutors @@ -10,11 +10,17 @@ import core.messaging.MessagingService import core.messaging.runOnNextMessage import core.messaging.send import core.node.NodeInfo -import core.node.services.* +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 core.utilities.AddOrRemove +import node.services.api.RegulatorService +import node.services.clientapi.NodeInterestRates +import node.services.transactions.NotaryService +import node.utilities.AddOrRemove import java.security.PublicKey import java.security.SignatureException import java.util.* diff --git a/node/src/main/kotlin/core/testing/MockNetworkMapCache.kt b/node/src/main/kotlin/node/services/network/MockNetworkMapCache.kt similarity index 95% rename from node/src/main/kotlin/core/testing/MockNetworkMapCache.kt rename to node/src/main/kotlin/node/services/network/MockNetworkMapCache.kt index 5deba50f9a..1636f60121 100644 --- a/node/src/main/kotlin/core/testing/MockNetworkMapCache.kt +++ b/node/src/main/kotlin/node/services/network/MockNetworkMapCache.kt @@ -5,13 +5,12 @@ * * All other rights reserved. */ -package core.testing +package node.services.network import co.paralleluniverse.common.util.VisibleForTesting import core.crypto.Party import core.crypto.DummyPublicKey import core.messaging.SingleMessageRecipient -import core.node.subsystems.InMemoryNetworkMapCache import core.node.NodeInfo /** diff --git a/node/src/main/kotlin/core/node/services/NetworkMapService.kt b/node/src/main/kotlin/node/services/network/NetworkMapService.kt similarity index 97% rename from node/src/main/kotlin/core/node/services/NetworkMapService.kt rename to node/src/main/kotlin/node/services/network/NetworkMapService.kt index 76e260c069..c3028b1503 100644 --- a/node/src/main/kotlin/core/node/services/NetworkMapService.kt +++ b/node/src/main/kotlin/node/services/network/NetworkMapService.kt @@ -1,25 +1,24 @@ -package core.node.services +package node.services.network import co.paralleluniverse.common.util.VisibleForTesting -import core.crypto.Party import core.ThreadBox -import core.crypto.DigitalSignature -import core.crypto.SecureHash -import core.crypto.SignedData -import core.crypto.signWithECDSA +import core.crypto.* import core.messaging.MessageRecipients import core.messaging.MessagingService import core.messaging.SingleMessageRecipient import core.node.NodeInfo -import core.node.subsystems.NetworkMapCache -import core.node.subsystems.TOPIC_DEFAULT_POSTFIX +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 core.utilities.AddOrRemove +import node.services.api.AbstractNodeService +import node.utilities.AddOrRemove import org.slf4j.LoggerFactory import protocols.AbstractRequestMessage import java.security.PrivateKey +import java.security.SignatureException import java.time.Instant import java.time.Period import java.util.* @@ -200,7 +199,7 @@ class InMemoryNetworkMapService(net: MessagingService, home: NodeRegistration, v try { change = req.wireReg.verified() - } catch(e: java.security.SignatureException) { + } catch(e: SignatureException) { throw NodeMapError.InvalidSignature() } val node = change.node diff --git a/node/src/main/kotlin/core/node/subsystems/DataVendingService.kt b/node/src/main/kotlin/node/services/persistence/DataVendingService.kt similarity index 95% rename from node/src/main/kotlin/core/node/subsystems/DataVendingService.kt rename to node/src/main/kotlin/node/services/persistence/DataVendingService.kt index 146e32d958..5679c910a7 100644 --- a/node/src/main/kotlin/core/node/subsystems/DataVendingService.kt +++ b/node/src/main/kotlin/node/services/persistence/DataVendingService.kt @@ -1,8 +1,9 @@ -package core.node.subsystems +package node.services.persistence import core.contracts.SignedTransaction import core.messaging.MessagingService -import core.node.services.AbstractNodeService +import core.node.services.StorageService +import node.services.api.AbstractNodeService import core.utilities.loggerFor import protocols.FetchAttachmentsProtocol import protocols.FetchDataProtocol diff --git a/node/src/main/kotlin/core/node/services/NodeAttachmentService.kt b/node/src/main/kotlin/node/services/persistence/NodeAttachmentService.kt similarity index 96% rename from node/src/main/kotlin/core/node/services/NodeAttachmentService.kt rename to node/src/main/kotlin/node/services/persistence/NodeAttachmentService.kt index bbea6ed51c..25882f844d 100644 --- a/node/src/main/kotlin/core/node/services/NodeAttachmentService.kt +++ b/node/src/main/kotlin/node/services/persistence/NodeAttachmentService.kt @@ -1,4 +1,4 @@ -package core.node.services +package node.services.persistence import com.codahale.metrics.MetricRegistry import com.google.common.annotations.VisibleForTesting @@ -8,10 +8,12 @@ import com.google.common.io.CountingInputStream import core.contracts.Attachment import core.crypto.SecureHash import core.extractZipFile -import core.node.AcceptsFileUpload +import node.services.api.AcceptsFileUpload +import core.node.services.AttachmentStorage import core.utilities.loggerFor import java.io.FilterInputStream import java.io.InputStream +import java.nio.file.FileAlreadyExistsException import java.nio.file.Files import java.nio.file.Path import java.nio.file.Paths @@ -128,7 +130,7 @@ class NodeAttachmentService(val storePath: Path, val metrics: MetricRegistry) : try { Files.createDirectory(extractTo) extractZipFile(finalPath, extractTo) - } catch(e: java.nio.file.FileAlreadyExistsException) { + } catch(e: FileAlreadyExistsException) { log.trace("Did not extract attachment jar to directory because it already exists") } catch(e: Exception) { log.error("Failed to extract attachment jar $id, ", e) diff --git a/node/src/main/kotlin/core/node/storage/PerFileCheckpointStorage.kt b/node/src/main/kotlin/node/services/persistence/PerFileCheckpointStorage.kt similarity index 94% rename from node/src/main/kotlin/core/node/storage/PerFileCheckpointStorage.kt rename to node/src/main/kotlin/node/services/persistence/PerFileCheckpointStorage.kt index 8db185d13c..69f3e51a80 100644 --- a/node/src/main/kotlin/core/node/storage/PerFileCheckpointStorage.kt +++ b/node/src/main/kotlin/node/services/persistence/PerFileCheckpointStorage.kt @@ -1,10 +1,12 @@ -package core.node.storage +package 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 java.nio.file.Files import java.nio.file.Path import java.nio.file.StandardCopyOption @@ -38,7 +40,7 @@ class PerFileCheckpointStorage(val storeDir: Path) : CheckpointStorage { override fun addCheckpoint(checkpoint: Checkpoint) { val serialisedCheckpoint = checkpoint.serialize() - val fileName = "${serialisedCheckpoint.hash.toString().toLowerCase()}$fileExtension" + val fileName = "${serialisedCheckpoint.hash.toString().toLowerCase()}${fileExtension}" val checkpointFile = storeDir.resolve(fileName) atomicWrite(checkpointFile, serialisedCheckpoint) logger.trace { "Stored $checkpoint to $checkpointFile" } diff --git a/node/src/main/kotlin/core/node/subsystems/StorageServiceImpl.kt b/node/src/main/kotlin/node/services/persistence/StorageServiceImpl.kt similarity index 91% rename from node/src/main/kotlin/core/node/subsystems/StorageServiceImpl.kt rename to node/src/main/kotlin/node/services/persistence/StorageServiceImpl.kt index ec5d38fe70..5cdbb3504d 100644 --- a/node/src/main/kotlin/core/node/subsystems/StorageServiceImpl.kt +++ b/node/src/main/kotlin/node/services/persistence/StorageServiceImpl.kt @@ -1,17 +1,16 @@ -package core.node.subsystems +package node.services.persistence import core.crypto.Party import core.contracts.SignedTransaction import core.crypto.SecureHash import core.node.services.AttachmentStorage -import core.node.storage.CheckpointStorage +import core.node.services.StorageService import core.utilities.RecordingMap import org.slf4j.LoggerFactory import java.security.KeyPair import java.util.* open class StorageServiceImpl(override val attachments: AttachmentStorage, - override val checkpointStorage: CheckpointStorage, override val myLegalIdentityKey: KeyPair, override val myLegalIdentity: Party = Party("Unit test party", myLegalIdentityKey.public), // This parameter is for unit tests that want to observe operation details. diff --git a/node/src/main/kotlin/core/protocols/ProtocolStateMachineImpl.kt b/node/src/main/kotlin/node/services/statemachine/ProtocolStateMachineImpl.kt similarity index 93% rename from node/src/main/kotlin/core/protocols/ProtocolStateMachineImpl.kt rename to node/src/main/kotlin/node/services/statemachine/ProtocolStateMachineImpl.kt index 0f3b52c6db..741bc3bdaf 100644 --- a/node/src/main/kotlin/core/protocols/ProtocolStateMachineImpl.kt +++ b/node/src/main/kotlin/node/services/statemachine/ProtocolStateMachineImpl.kt @@ -1,4 +1,4 @@ -package core.protocols +package node.services.statemachine import co.paralleluniverse.fibers.Fiber import co.paralleluniverse.fibers.FiberScheduler @@ -7,12 +7,15 @@ 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 core.messaging.StateMachineManager +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 org.slf4j.Logger import org.slf4j.LoggerFactory @@ -29,7 +32,7 @@ class ProtocolStateMachineImpl(val logic: ProtocolLogic, scheduler: FiberS // These fields shouldn't be serialised, so they are marked @Transient. @Transient private var suspendAction: ((result: StateMachineManager.FiberRequest, serialisedFiber: SerializedBytes>) -> Unit)? = null @Transient private var resumeWithObject: Any? = null - @Transient lateinit override var serviceHub: ServiceHub + @Transient lateinit override var serviceHub: ServiceHubInternal @Transient private var _logger: Logger? = null override val logger: Logger get() { @@ -54,7 +57,7 @@ class ProtocolStateMachineImpl(val logic: ProtocolLogic, scheduler: FiberS logic.psm = this } - fun prepareForResumeWith(serviceHub: ServiceHub, + fun prepareForResumeWith(serviceHub: ServiceHubInternal, withObject: Any?, suspendAction: (StateMachineManager.FiberRequest, SerializedBytes>) -> Unit) { this.suspendAction = suspendAction diff --git a/node/src/main/kotlin/core/messaging/StateMachineManager.kt b/node/src/main/kotlin/node/services/statemachine/StateMachineManager.kt similarity index 96% rename from node/src/main/kotlin/core/messaging/StateMachineManager.kt rename to node/src/main/kotlin/node/services/statemachine/StateMachineManager.kt index 34fdb8cdd3..90779e679e 100644 --- a/node/src/main/kotlin/core/messaging/StateMachineManager.kt +++ b/node/src/main/kotlin/node/services/statemachine/StateMachineManager.kt @@ -1,4 +1,4 @@ -package core.messaging +package node.services.statemachine import co.paralleluniverse.fibers.Fiber import co.paralleluniverse.fibers.FiberExecutorScheduler @@ -7,19 +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.node.ServiceHub -import core.node.storage.Checkpoint +import core.messaging.MessageRecipients +import core.messaging.runOnNextMessage +import core.messaging.send import core.protocols.ProtocolLogic import core.protocols.ProtocolStateMachine -import core.protocols.ProtocolStateMachineImpl import core.serialization.SerializedBytes import core.serialization.THREAD_LOCAL_KRYO import core.serialization.createKryo import core.serialization.deserialize import core.then -import core.utilities.AffinityExecutor 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 java.io.PrintWriter import java.io.StringWriter import java.util.* @@ -53,14 +56,11 @@ import javax.annotation.concurrent.ThreadSafe * TODO: Implement stub/skel classes that provide a basic RPC framework on top of this. */ @ThreadSafe -class StateMachineManager(val serviceHub: ServiceHub, val executor: AffinityExecutor) { +class StateMachineManager(val serviceHub: ServiceHubInternal, val checkpointStorage: CheckpointStorage, val executor: AffinityExecutor) { inner class FiberScheduler : FiberExecutorScheduler("Same thread scheduler", executor) val scheduler = FiberScheduler() - // This map is backed by a database and will be used to store serialised state machines to disk, so we can resurrect - // them across node restarts. - private val checkpointStorage = serviceHub.storageService.checkpointStorage // A list of all the state machines being managed by this class. We expose snapshots of it via the stateMachines // property. private val stateMachines = synchronizedMap(HashMap, Checkpoint>()) diff --git a/node/src/main/kotlin/core/node/services/InMemoryUniquenessProvider.kt b/node/src/main/kotlin/node/services/transactions/InMemoryUniquenessProvider.kt similarity index 91% rename from node/src/main/kotlin/core/node/services/InMemoryUniquenessProvider.kt rename to node/src/main/kotlin/node/services/transactions/InMemoryUniquenessProvider.kt index 5fb1e90f1c..6465fbb56b 100644 --- a/node/src/main/kotlin/core/node/services/InMemoryUniquenessProvider.kt +++ b/node/src/main/kotlin/node/services/transactions/InMemoryUniquenessProvider.kt @@ -1,9 +1,11 @@ -package core.node.services +package node.services.transactions -import core.crypto.Party -import core.contracts.StateRef 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 java.util.* import javax.annotation.concurrent.ThreadSafe diff --git a/node/src/main/kotlin/core/node/services/NotaryService.kt b/node/src/main/kotlin/node/services/transactions/NotaryService.kt similarity index 95% rename from node/src/main/kotlin/core/node/services/NotaryService.kt rename to node/src/main/kotlin/node/services/transactions/NotaryService.kt index b1dab5a6e5..ee14955b80 100644 --- a/node/src/main/kotlin/core/node/services/NotaryService.kt +++ b/node/src/main/kotlin/node/services/transactions/NotaryService.kt @@ -1,17 +1,21 @@ -package core.node.services +package node.services.transactions -import core.crypto.Party 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 diff --git a/node/src/main/kotlin/core/node/services/TimestampChecker.kt b/node/src/main/kotlin/node/services/transactions/TimestampChecker.kt similarity index 96% rename from node/src/main/kotlin/core/node/services/TimestampChecker.kt rename to node/src/main/kotlin/node/services/transactions/TimestampChecker.kt index e4069ff584..ae55b5fde8 100644 --- a/node/src/main/kotlin/core/node/services/TimestampChecker.kt +++ b/node/src/main/kotlin/node/services/transactions/TimestampChecker.kt @@ -1,4 +1,4 @@ -package core.node.services +package node.services.transactions import core.contracts.TimestampCommand import core.seconds diff --git a/node/src/main/kotlin/core/node/subsystems/NodeWalletService.kt b/node/src/main/kotlin/node/services/wallet/NodeWalletService.kt similarity index 96% rename from node/src/main/kotlin/core/node/subsystems/NodeWalletService.kt rename to node/src/main/kotlin/node/services/wallet/NodeWalletService.kt index 251f605b11..f4f6481374 100644 --- a/node/src/main/kotlin/core/node/subsystems/NodeWalletService.kt +++ b/node/src/main/kotlin/node/services/wallet/NodeWalletService.kt @@ -1,14 +1,16 @@ -package core.node.subsystems +package node.services.wallet import com.codahale.metrics.Gauge import contracts.Cash -import core.* +import core.ThreadBox import core.contracts.* import core.crypto.Party import core.crypto.SecureHash -import core.node.ServiceHub +import core.node.services.Wallet +import core.node.services.WalletService import core.utilities.loggerFor import core.utilities.trace +import node.services.api.ServiceHubInternal import java.security.PublicKey import java.util.* import javax.annotation.concurrent.ThreadSafe @@ -19,7 +21,7 @@ import javax.annotation.concurrent.ThreadSafe * states relevant to us into a database and once such a wallet is implemented, this scaffolding can be removed. */ @ThreadSafe -class NodeWalletService(private val services: ServiceHub) : WalletService { +class NodeWalletService(private val services: ServiceHubInternal) : WalletService { private val log = loggerFor() // Variables inside InnerState are protected with a lock by the ThreadBox and aren't in scope unless you're diff --git a/node/src/main/kotlin/core/node/subsystems/WalletImpl.kt b/node/src/main/kotlin/node/services/wallet/WalletImpl.kt similarity index 95% rename from node/src/main/kotlin/core/node/subsystems/WalletImpl.kt rename to node/src/main/kotlin/node/services/wallet/WalletImpl.kt index d488092edb..f5e3b16569 100644 --- a/node/src/main/kotlin/core/node/subsystems/WalletImpl.kt +++ b/node/src/main/kotlin/node/services/wallet/WalletImpl.kt @@ -1,10 +1,11 @@ -package core.node.subsystems +package 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 java.util.* /** diff --git a/node/src/main/kotlin/core/node/servlets/AttachmentDownloadServlet.kt b/node/src/main/kotlin/node/servlets/AttachmentDownloadServlet.kt similarity index 97% rename from node/src/main/kotlin/core/node/servlets/AttachmentDownloadServlet.kt rename to node/src/main/kotlin/node/servlets/AttachmentDownloadServlet.kt index 363831ed39..4b5987239c 100644 --- a/node/src/main/kotlin/core/node/servlets/AttachmentDownloadServlet.kt +++ b/node/src/main/kotlin/node/servlets/AttachmentDownloadServlet.kt @@ -1,7 +1,7 @@ -package core.node.servlets +package node.servlets import core.crypto.SecureHash -import core.node.subsystems.StorageService +import core.node.services.StorageService import core.utilities.loggerFor import java.io.FileNotFoundException import javax.servlet.http.HttpServlet diff --git a/node/src/main/kotlin/api/Config.kt b/node/src/main/kotlin/node/servlets/Config.kt similarity index 80% rename from node/src/main/kotlin/api/Config.kt rename to node/src/main/kotlin/node/servlets/Config.kt index ef6476af14..4b5a4285ac 100644 --- a/node/src/main/kotlin/api/Config.kt +++ b/node/src/main/kotlin/node/servlets/Config.kt @@ -1,8 +1,8 @@ -package api +package node.servlets import com.fasterxml.jackson.databind.ObjectMapper import core.node.ServiceHub -import core.utilities.JsonSupport +import node.utilities.JsonSupport import javax.ws.rs.ext.ContextResolver import javax.ws.rs.ext.Provider @@ -13,5 +13,5 @@ import javax.ws.rs.ext.Provider @Provider class Config(val services: ServiceHub) : ContextResolver { val defaultObjectMapper = JsonSupport.createDefaultMapper(services.identityService) - override fun getContext(type: java.lang.Class<*>) = defaultObjectMapper + override fun getContext(type: Class<*>) = defaultObjectMapper } \ No newline at end of file diff --git a/node/src/main/kotlin/core/node/servlets/DataUploadServlet.kt b/node/src/main/kotlin/node/servlets/DataUploadServlet.kt similarity index 96% rename from node/src/main/kotlin/core/node/servlets/DataUploadServlet.kt rename to node/src/main/kotlin/node/servlets/DataUploadServlet.kt index 3111c52161..96efe41e82 100644 --- a/node/src/main/kotlin/core/node/servlets/DataUploadServlet.kt +++ b/node/src/main/kotlin/node/servlets/DataUploadServlet.kt @@ -1,7 +1,7 @@ -package core.node.servlets +package node.servlets -import core.node.AcceptsFileUpload -import core.node.Node +import node.services.api.AcceptsFileUpload +import node.internal.Node import core.utilities.loggerFor import org.apache.commons.fileupload.servlet.ServletFileUpload import java.util.* diff --git a/node/src/main/kotlin/api/ResponseFilter.kt b/node/src/main/kotlin/node/servlets/ResponseFilter.kt similarity index 98% rename from node/src/main/kotlin/api/ResponseFilter.kt rename to node/src/main/kotlin/node/servlets/ResponseFilter.kt index e4f34e9cf8..c0aad621b5 100644 --- a/node/src/main/kotlin/api/ResponseFilter.kt +++ b/node/src/main/kotlin/node/servlets/ResponseFilter.kt @@ -1,4 +1,4 @@ -package api +package node.servlets import javax.ws.rs.container.ContainerRequestContext import javax.ws.rs.container.ContainerResponseContext diff --git a/node/src/main/kotlin/core/utilities/ANSIProgressRenderer.kt b/node/src/main/kotlin/node/utilities/ANSIProgressRenderer.kt similarity index 97% rename from node/src/main/kotlin/core/utilities/ANSIProgressRenderer.kt rename to node/src/main/kotlin/node/utilities/ANSIProgressRenderer.kt index 3d1331ffdd..5c4d182b4f 100644 --- a/node/src/main/kotlin/core/utilities/ANSIProgressRenderer.kt +++ b/node/src/main/kotlin/node/utilities/ANSIProgressRenderer.kt @@ -1,5 +1,8 @@ -package core.utilities +package node.utilities +import core.utilities.BriefLogFormatter +import core.utilities.Emoji +import 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/core/utilities/AddOrRemove.kt b/node/src/main/kotlin/node/utilities/AddOrRemove.kt similarity index 86% rename from node/src/main/kotlin/core/utilities/AddOrRemove.kt rename to node/src/main/kotlin/node/utilities/AddOrRemove.kt index 44dea24592..8ac1c1c9be 100644 --- a/node/src/main/kotlin/core/utilities/AddOrRemove.kt +++ b/node/src/main/kotlin/node/utilities/AddOrRemove.kt @@ -1,4 +1,4 @@ -package core.utilities +package 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/core/utilities/AffinityExecutor.kt b/node/src/main/kotlin/node/utilities/AffinityExecutor.kt similarity index 98% rename from node/src/main/kotlin/core/utilities/AffinityExecutor.kt rename to node/src/main/kotlin/node/utilities/AffinityExecutor.kt index 5b16276002..bec6aafb87 100644 --- a/node/src/main/kotlin/core/utilities/AffinityExecutor.kt +++ b/node/src/main/kotlin/node/utilities/AffinityExecutor.kt @@ -1,6 +1,7 @@ -package core.utilities +package node.utilities import com.google.common.util.concurrent.Uninterruptibles +import core.utilities.loggerFor import java.util.* import java.util.concurrent.* import java.util.function.Supplier diff --git a/node/src/main/kotlin/core/utilities/JsonSupport.kt b/node/src/main/kotlin/node/utilities/JsonSupport.kt similarity index 99% rename from node/src/main/kotlin/core/utilities/JsonSupport.kt rename to node/src/main/kotlin/node/utilities/JsonSupport.kt index f4fe9dd201..17b0cf0eec 100644 --- a/node/src/main/kotlin/core/utilities/JsonSupport.kt +++ b/node/src/main/kotlin/node/utilities/JsonSupport.kt @@ -1,4 +1,4 @@ -package core.utilities +package node.utilities import com.fasterxml.jackson.core.JsonGenerator import com.fasterxml.jackson.core.JsonParseException diff --git a/node/src/main/resources/core/testing/example.rates.txt b/node/src/main/resources/node/internal/testing/example.rates.txt similarity index 100% rename from node/src/main/resources/core/testing/example.rates.txt rename to node/src/main/resources/node/internal/testing/example.rates.txt diff --git a/node/src/main/resources/core/testing/trade.json b/node/src/main/resources/node/internal/testing/trade.json similarity index 100% rename from node/src/main/resources/core/testing/trade.json rename to node/src/main/resources/node/internal/testing/trade.json diff --git a/node/src/test/kotlin/core/MockServices.kt b/node/src/test/kotlin/core/MockServices.kt deleted file mode 100644 index 6bd2f05d43..0000000000 --- a/node/src/test/kotlin/core/MockServices.kt +++ /dev/null @@ -1,130 +0,0 @@ -package core - -import com.codahale.metrics.MetricRegistry -import core.contracts.Attachment -import core.crypto.SecureHash -import core.crypto.generateKeyPair -import core.crypto.sha256 -import core.messaging.MessagingService -import core.node.ServiceHub -import core.node.storage.Checkpoint -import core.node.storage.CheckpointStorage -import core.node.subsystems.* -import core.node.services.AttachmentStorage -import core.node.services.IdentityService -import core.node.services.NetworkMapService -import core.testing.MockNetworkMapCache -import core.testutils.MockIdentityService -import java.io.ByteArrayInputStream -import java.io.ByteArrayOutputStream -import java.io.File -import java.io.InputStream -import java.security.KeyPair -import java.security.PrivateKey -import java.security.PublicKey -import java.time.Clock -import java.util.* -import java.util.concurrent.ConcurrentLinkedQueue -import java.util.jar.JarInputStream -import javax.annotation.concurrent.ThreadSafe - -class MockKeyManagementService(vararg initialKeys: KeyPair) : KeyManagementService { - override val keys: MutableMap - - init { - keys = initialKeys.map { it.public to it.private }.toMap(HashMap()) - } - - val nextKeys = LinkedList() - - override fun freshKey(): KeyPair { - val k = nextKeys.poll() ?: generateKeyPair() - keys[k.public] = k.private - return k - } -} - -class MockAttachmentStorage : AttachmentStorage { - val files = HashMap() - - override fun openAttachment(id: SecureHash): Attachment? { - val f = files[id] ?: return null - return object : Attachment { - override fun open(): InputStream = ByteArrayInputStream(f) - override val id: SecureHash = id - } - } - - override fun importAttachment(jar: InputStream): SecureHash { - // JIS makes read()/readBytes() return bytes of the current file, but we want to hash the entire container here. - require(jar !is JarInputStream) - - val bytes = run { - val s = ByteArrayOutputStream() - jar.copyTo(s) - s.close() - s.toByteArray() - } - val sha256 = bytes.sha256() - if (files.containsKey(sha256)) - throw FileAlreadyExistsException(File("!! MOCK FILE NAME")) - files[sha256] = bytes - return sha256 - } -} - - -class MockCheckpointStorage : CheckpointStorage { - - private val _checkpoints = ConcurrentLinkedQueue() - override val checkpoints: Iterable - get() = _checkpoints.toList() - - override fun addCheckpoint(checkpoint: Checkpoint) { - _checkpoints.add(checkpoint) - } - - override fun removeCheckpoint(checkpoint: Checkpoint) { - require(_checkpoints.remove(checkpoint)) - } -} - - -@ThreadSafe -class MockStorageService : StorageServiceImpl(MockAttachmentStorage(), MockCheckpointStorage(), generateKeyPair()) - -class MockServices( - customWallet: WalletService? = null, - val keyManagement: KeyManagementService? = null, - val net: MessagingService? = null, - val identity: IdentityService? = MockIdentityService, - val storage: StorageService? = MockStorageService(), - val mapCache: NetworkMapCache? = MockNetworkMapCache(), - val mapService: NetworkMapService? = null, - val overrideClock: Clock? = Clock.systemUTC() -) : ServiceHub { - override val walletService: WalletService = customWallet ?: NodeWalletService(this) - - override val keyManagementService: KeyManagementService - get() = keyManagement ?: throw UnsupportedOperationException() - override val identityService: IdentityService - get() = identity ?: throw UnsupportedOperationException() - override val networkService: MessagingService - get() = net ?: throw UnsupportedOperationException() - override val networkMapCache: NetworkMapCache - get() = mapCache ?: throw UnsupportedOperationException() - override val storageService: StorageService - get() = storage ?: throw UnsupportedOperationException() - override val clock: Clock - get() = overrideClock ?: throw UnsupportedOperationException() - - override val monitoringService: MonitoringService = MonitoringService(MetricRegistry()) - - init { - if (net != null && storage != null) { - // Creating this class is sufficient, we don't have to store it anywhere, because it registers a listener - // on the networking service, so that will keep it from being collected. - DataVendingService(net, storage) - } - } -} diff --git a/node/src/test/kotlin/core/messaging/AttachmentTests.kt b/node/src/test/kotlin/node/messaging/AttachmentTests.kt similarity index 93% rename from node/src/test/kotlin/core/messaging/AttachmentTests.kt rename to node/src/test/kotlin/node/messaging/AttachmentTests.kt index 2a540ec1f0..be1d2dd8c6 100644 --- a/node/src/test/kotlin/core/messaging/AttachmentTests.kt +++ b/node/src/test/kotlin/node/messaging/AttachmentTests.kt @@ -1,18 +1,18 @@ -package core.messaging +package node.messaging import core.contracts.Attachment import core.crypto.SecureHash import core.crypto.sha256 -import core.node.NodeConfiguration import core.node.NodeInfo -import core.node.services.NetworkMapService -import core.node.services.NodeAttachmentService -import core.node.services.NotaryService import core.node.services.ServiceType import core.serialization.OpaqueBytes -import core.testing.MockNetwork -import core.testutils.rootCauseExceptions +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 org.junit.Before import org.junit.Test import protocols.FetchAttachmentsProtocol diff --git a/node/src/test/kotlin/core/messaging/InMemoryMessagingTests.kt b/node/src/test/kotlin/node/messaging/InMemoryMessagingTests.kt similarity index 95% rename from node/src/test/kotlin/core/messaging/InMemoryMessagingTests.kt rename to node/src/test/kotlin/node/messaging/InMemoryMessagingTests.kt index 7bba9d84ae..0c91995f74 100644 --- a/node/src/test/kotlin/core/messaging/InMemoryMessagingTests.kt +++ b/node/src/test/kotlin/node/messaging/InMemoryMessagingTests.kt @@ -1,9 +1,12 @@ @file:Suppress("UNUSED_VARIABLE") -package core.messaging +package node.messaging +import core.messaging.Message +import core.messaging.TopicStringValidator +import core.messaging.send import core.serialization.deserialize -import core.testing.MockNetwork +import node.internal.testing.MockNetwork import org.junit.Before import org.junit.Test import java.util.* diff --git a/node/src/test/kotlin/core/messaging/TwoPartyTradeProtocolTests.kt b/node/src/test/kotlin/node/messaging/TwoPartyTradeProtocolTests.kt similarity index 88% rename from node/src/test/kotlin/core/messaging/TwoPartyTradeProtocolTests.kt rename to node/src/test/kotlin/node/messaging/TwoPartyTradeProtocolTests.kt index 45253076d1..a8e483ee20 100644 --- a/node/src/test/kotlin/core/messaging/TwoPartyTradeProtocolTests.kt +++ b/node/src/test/kotlin/node/messaging/TwoPartyTradeProtocolTests.kt @@ -1,26 +1,33 @@ -package core.messaging +package node.messaging +import com.google.common.util.concurrent.ListenableFuture import contracts.Cash import contracts.CommercialPaper -import core.* +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.node.NodeConfiguration +import core.days +import core.messaging.SingleMessageRecipient import core.node.NodeInfo import core.node.ServiceHub -import core.node.services.NodeAttachmentService import core.node.services.ServiceType -import core.node.storage.CheckpointStorage -import core.node.subsystems.NodeWalletService -import core.node.subsystems.StorageServiceImpl -import core.node.subsystems.Wallet -import core.node.subsystems.WalletImpl -import core.testing.InMemoryMessagingNetwork -import core.testing.MockNetwork -import core.testutils.* +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 org.assertj.core.api.Assertions.assertThat import org.junit.After import org.junit.Before @@ -48,10 +55,24 @@ import kotlin.test.assertTrue class TwoPartyTradeProtocolTests { lateinit var net: MockNetwork + private fun runSeller(smm: StateMachineManager, notary: NodeInfo, + otherSide: SingleMessageRecipient, assetToSell: StateAndRef, price: Amount, + myKeyPair: KeyPair, buyerSessionID: Long): ListenableFuture { + val seller = TwoPartyTradeProtocol.Seller(otherSide, notary, assetToSell, price, myKeyPair, buyerSessionID) + return smm.add("${TwoPartyTradeProtocol.TRADE_TOPIC}.seller", seller) + } + + private fun runBuyer(smm: StateMachineManager, notaryNode: NodeInfo, + otherSide: SingleMessageRecipient, acceptablePrice: Amount, typeToBuy: Class, + sessionID: Long): ListenableFuture { + val buyer = TwoPartyTradeProtocol.Buyer(otherSide, notaryNode.identity, acceptablePrice, typeToBuy, sessionID) + return smm.add("${TwoPartyTradeProtocol.TRADE_TOPIC}.buyer", buyer) + } + @Before fun before() { net = MockNetwork(false) - net.identities += MockIdentityService.identities + net.identities += MOCK_IDENTITY_SERVICE.identities BriefLogFormatter.loggingOn("platform.trade", "core.contract.TransactionGroup", "recordingmap") } @@ -79,7 +100,7 @@ class TwoPartyTradeProtocolTests { val buyerSessionID = random63BitValue() - val aliceResult = TwoPartyTradeProtocol.runSeller( + val aliceResult = runSeller( aliceNode.smm, notaryNode.info, bobNode.net.myAddress, @@ -88,7 +109,7 @@ class TwoPartyTradeProtocolTests { ALICE_KEY, buyerSessionID ) - val bobResult = TwoPartyTradeProtocol.runBuyer( + val bobResult = runBuyer( bobNode.smm, notaryNode.info, aliceNode.net.myAddress, @@ -104,14 +125,14 @@ class TwoPartyTradeProtocolTests { aliceNode.stop() bobNode.stop() - assertThat(aliceNode.storage.checkpointStorage.checkpoints).isEmpty() - assertThat(bobNode.storage.checkpointStorage.checkpoints).isEmpty() + assertThat(aliceNode.checkpointStorage.checkpoints).isEmpty() + assertThat(bobNode.checkpointStorage.checkpoints).isEmpty() } } @Test fun `shutdown and restore`() { - transactionGroupFor { + core.testing.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) @@ -129,7 +150,7 @@ class TwoPartyTradeProtocolTests { val buyerSessionID = random63BitValue() - val aliceFuture = TwoPartyTradeProtocol.runSeller( + val aliceFuture = runSeller( aliceNode.smm, notaryNode.info, bobAddr, @@ -138,7 +159,7 @@ class TwoPartyTradeProtocolTests { ALICE_KEY, buyerSessionID ) - TwoPartyTradeProtocol.runBuyer( + runBuyer( bobNode.smm, notaryNode.info, aliceAddr, @@ -162,7 +183,7 @@ class TwoPartyTradeProtocolTests { pumpBob() // OK, now Bob has sent the partial transaction back to Alice and is waiting for Alice's signature. - assertThat(bobNode.storage.checkpointStorage.checkpoints).hasSize(1) + assertThat(bobNode.checkpointStorage.checkpoints).hasSize(1) // TODO: remove once validated transactions are persisted to disk val recordedTransactions = bobNode.storage.validatedTransactions @@ -208,9 +229,9 @@ class TwoPartyTradeProtocolTests { advertisedServices: Set, id: Int, keyPair: KeyPair?): MockNetwork.MockNode { return object : MockNetwork.MockNode(dir, config, network, networkMapAddr, advertisedServices, id, keyPair) { // That constructs the storage service object in a customised way ... - override fun constructStorageService(attachments: NodeAttachmentService, checkpointStorage: CheckpointStorage, keypair: KeyPair, identity: Party): StorageServiceImpl { + override fun constructStorageService(attachments: NodeAttachmentService, keypair: KeyPair, identity: Party): StorageServiceImpl { // To use RecordingMaps instead of ordinary HashMaps. - return StorageServiceImpl(attachments, checkpointStorage, keypair, identity, { tableName -> name }) + return StorageServiceImpl(attachments, keypair, identity, { tableName -> name }) } } } @@ -243,7 +264,7 @@ class TwoPartyTradeProtocolTests { net.runNetwork() // Clear network map registration messages - TwoPartyTradeProtocol.runSeller( + runSeller( aliceNode.smm, notaryNode.info, bobNode.net.myAddress, @@ -252,7 +273,7 @@ class TwoPartyTradeProtocolTests { ALICE_KEY, buyerSessionID ) - TwoPartyTradeProtocol.runBuyer( + runBuyer( bobNode.smm, notaryNode.info, aliceNode.net.myAddress, @@ -356,7 +377,7 @@ class TwoPartyTradeProtocolTests { net.runNetwork() // Clear network map registration messages - val aliceResult = TwoPartyTradeProtocol.runSeller( + val aliceResult = runSeller( aliceNode.smm, notaryNode.info, bobAddr, @@ -365,7 +386,7 @@ class TwoPartyTradeProtocolTests { ALICE_KEY, buyerSessionID ) - val bobResult = TwoPartyTradeProtocol.runBuyer( + val bobResult = runBuyer( bobNode.smm, notaryNode.info, aliceAddr, diff --git a/node/src/test/kotlin/core/node/subsystems/ArtemisMessagingServiceTests.kt b/node/src/test/kotlin/node/services/ArtemisMessagingServiceTests.kt similarity index 92% rename from node/src/test/kotlin/core/node/subsystems/ArtemisMessagingServiceTests.kt rename to node/src/test/kotlin/node/services/ArtemisMessagingServiceTests.kt index f3ea71d624..cfdb13c45e 100644 --- a/node/src/test/kotlin/core/node/subsystems/ArtemisMessagingServiceTests.kt +++ b/node/src/test/kotlin/node/services/ArtemisMessagingServiceTests.kt @@ -1,8 +1,9 @@ -package core.node.subsystems +package node.services import core.messaging.Message import core.messaging.MessageRecipients -import core.testutils.freeLocalHostAndPort +import core.testing.freeLocalHostAndPort +import 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/core/node/subsystems/InMemoryNetworkMapCacheTest.kt b/node/src/test/kotlin/node/services/InMemoryNetworkMapCacheTest.kt similarity index 87% rename from node/src/test/kotlin/core/node/subsystems/InMemoryNetworkMapCacheTest.kt rename to node/src/test/kotlin/node/services/InMemoryNetworkMapCacheTest.kt index 216412855d..fdf5e2da47 100644 --- a/node/src/test/kotlin/core/node/subsystems/InMemoryNetworkMapCacheTest.kt +++ b/node/src/test/kotlin/node/services/InMemoryNetworkMapCacheTest.kt @@ -1,6 +1,6 @@ -package core.node.subsystems +package node.services -import core.testing.MockNetwork +import node.internal.testing.MockNetwork import org.junit.Before import org.junit.Test diff --git a/node/src/test/kotlin/core/node/services/InMemoryNetworkMapServiceTest.kt b/node/src/test/kotlin/node/services/InMemoryNetworkMapServiceTest.kt similarity index 97% rename from node/src/test/kotlin/core/node/services/InMemoryNetworkMapServiceTest.kt rename to node/src/test/kotlin/node/services/InMemoryNetworkMapServiceTest.kt index 0f13582e7d..5773ac0add 100644 --- a/node/src/test/kotlin/core/node/services/InMemoryNetworkMapServiceTest.kt +++ b/node/src/test/kotlin/node/services/InMemoryNetworkMapServiceTest.kt @@ -1,15 +1,16 @@ -package core.node.services +package node.services import co.paralleluniverse.fibers.Suspendable -import core.* import core.crypto.SecureHash -import core.crypto.signWithECDSA import core.node.NodeInfo import core.protocols.ProtocolLogic -import core.serialization.serialize -import core.testing.MockNetwork -import core.utilities.AddOrRemove +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 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/node/services/MockServices.kt new file mode 100644 index 0000000000..5d79b5f7ad --- /dev/null +++ b/node/src/test/kotlin/node/services/MockServices.kt @@ -0,0 +1,69 @@ +package 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 java.time.Clock +import java.util.concurrent.ConcurrentLinkedQueue + +class MockCheckpointStorage : CheckpointStorage { + + private val _checkpoints = ConcurrentLinkedQueue() + override val checkpoints: Iterable + get() = _checkpoints.toList() + + override fun addCheckpoint(checkpoint: Checkpoint) { + _checkpoints.add(checkpoint) + } + + override fun removeCheckpoint(checkpoint: Checkpoint) { + require(_checkpoints.remove(checkpoint)) + } +} + + +class MockServices( + customWallet: WalletService? = null, + val keyManagement: KeyManagementService? = null, + val net: MessagingService? = null, + val identity: IdentityService? = MOCK_IDENTITY_SERVICE, + val storage: StorageService? = MockStorageService(), + val mapCache: NetworkMapCache? = MockNetworkMapCache(), + val mapService: NetworkMapService? = null, + val overrideClock: Clock? = Clock.systemUTC() +) : ServiceHubInternal { + override val walletService: WalletService = customWallet ?: NodeWalletService(this) + + override val keyManagementService: KeyManagementService + get() = keyManagement ?: throw UnsupportedOperationException() + override val identityService: IdentityService + get() = identity ?: throw UnsupportedOperationException() + override val networkService: MessagingService + get() = net ?: throw UnsupportedOperationException() + override val networkMapCache: NetworkMapCache + get() = mapCache ?: throw UnsupportedOperationException() + override val storageService: StorageService + get() = storage ?: throw UnsupportedOperationException() + override val clock: Clock + get() = overrideClock ?: throw UnsupportedOperationException() + + override val monitoringService: MonitoringService = MonitoringService(MetricRegistry()) + + init { + if (net != null && storage != null) { + // Creating this class is sufficient, we don't have to store it anywhere, because it registers a listener + // on the networking service, so that will keep it from being collected. + DataVendingService(net, storage) + } + } +} diff --git a/node/src/test/kotlin/core/node/NodeAttachmentStorageTest.kt b/node/src/test/kotlin/node/services/NodeAttachmentStorageTest.kt similarity index 94% rename from node/src/test/kotlin/core/node/NodeAttachmentStorageTest.kt rename to node/src/test/kotlin/node/services/NodeAttachmentStorageTest.kt index bfb1d10acf..12a05affb6 100644 --- a/node/src/test/kotlin/core/node/NodeAttachmentStorageTest.kt +++ b/node/src/test/kotlin/node/services/NodeAttachmentStorageTest.kt @@ -1,14 +1,15 @@ -package core.node +package 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.node.services.NodeAttachmentService import core.use +import node.services.persistence.NodeAttachmentService import org.junit.Before import org.junit.Test import java.nio.charset.Charset +import java.nio.file.FileAlreadyExistsException import java.nio.file.FileSystem import java.nio.file.Files import java.nio.file.Path @@ -52,7 +53,7 @@ class NodeAttachmentStorageTest { val testJar = makeTestJar() val storage = NodeAttachmentService(fs.getPath("/"), MetricRegistry()) testJar.use { storage.importAttachment(it) } - assertFailsWith { + assertFailsWith { testJar.use { storage.importAttachment(it) } } } diff --git a/node/src/test/kotlin/core/node/services/NodeInterestRatesTest.kt b/node/src/test/kotlin/node/services/NodeInterestRatesTest.kt similarity index 93% rename from node/src/test/kotlin/core/node/services/NodeInterestRatesTest.kt rename to node/src/test/kotlin/node/services/NodeInterestRatesTest.kt index 75d95bc345..59592f03c4 100644 --- a/node/src/test/kotlin/core/node/services/NodeInterestRatesTest.kt +++ b/node/src/test/kotlin/node/services/NodeInterestRatesTest.kt @@ -1,13 +1,18 @@ -package core.node.services +package 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.bd -import core.testing.MockNetwork -import core.testutils.* +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 org.junit.Assert import org.junit.Test import protocols.RatesFixProtocol diff --git a/node/src/test/kotlin/core/node/subsystems/NodeWalletServiceTest.kt b/node/src/test/kotlin/node/services/NodeWalletServiceTest.kt similarity index 89% rename from node/src/test/kotlin/core/node/subsystems/NodeWalletServiceTest.kt rename to node/src/test/kotlin/node/services/NodeWalletServiceTest.kt index fa0dc0579d..5fd18651d8 100644 --- a/node/src/test/kotlin/core/node/subsystems/NodeWalletServiceTest.kt +++ b/node/src/test/kotlin/node/services/NodeWalletServiceTest.kt @@ -1,14 +1,16 @@ -package core.node.subsystems +package node.services import contracts.Cash -import core.* import core.contracts.DOLLARS import core.contracts.TransactionBuilder import core.contracts.USD import core.contracts.verifyToLedgerTransaction import core.node.ServiceHub -import core.testutils.* +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 org.junit.After import org.junit.Before import org.junit.Test @@ -65,7 +67,7 @@ class NodeWalletServiceTest { Cash().generateIssue(this, 100.DOLLARS, MEGA_CORP.ref(1), freshKey.public, DUMMY_NOTARY) signWith(MEGA_CORP_KEY) }.toSignedTransaction() - val myOutput = usefulTX.verifyToLedgerTransaction(MockIdentityService, MockStorageService().attachments).outRef(0) + val myOutput = usefulTX.verifyToLedgerTransaction(MOCK_IDENTITY_SERVICE, MockStorageService().attachments).outRef(0) // A tx that spends our money. val spendTX = TransactionBuilder().apply { diff --git a/node/src/test/kotlin/core/node/services/NotaryServiceTests.kt b/node/src/test/kotlin/node/services/NotaryServiceTests.kt similarity index 88% rename from node/src/test/kotlin/core/node/services/NotaryServiceTests.kt rename to node/src/test/kotlin/node/services/NotaryServiceTests.kt index 8a75250c0f..68a84f1cb3 100644 --- a/node/src/test/kotlin/core/node/services/NotaryServiceTests.kt +++ b/node/src/test/kotlin/node/services/NotaryServiceTests.kt @@ -1,11 +1,11 @@ -package core.node.services +package node.services import core.contracts.TransactionBuilder import core.seconds -import core.testing.MockNetwork -import core.testutils.DUMMY_NOTARY -import core.testutils.DUMMY_NOTARY_KEY -import core.testutils.issueState +import core.testing.DUMMY_NOTARY +import core.testing.DUMMY_NOTARY_KEY +import node.internal.testing.MockNetwork +import node.testutils.issueState import org.junit.Before import org.junit.Test import protocols.NotaryError @@ -37,7 +37,7 @@ class NotaryServiceTests { tx.setTime(Instant.now(), DUMMY_NOTARY, 30.seconds) var wtx = tx.toWireTransaction() - val protocol = NotaryProtocol(wtx, NotaryProtocol.tracker()) + val protocol = NotaryProtocol(wtx, NotaryProtocol.Companion.tracker()) val future = clientNode.smm.add(NotaryProtocol.TOPIC, protocol) net.runNetwork() @@ -49,7 +49,7 @@ class NotaryServiceTests { val inputState = issueState(clientNode) val wtx = TransactionBuilder().withItems(inputState).toWireTransaction() - val protocol = NotaryProtocol(wtx, NotaryProtocol.tracker()) + val protocol = NotaryProtocol(wtx, NotaryProtocol.Companion.tracker()) val future = clientNode.smm.add(NotaryProtocol.TOPIC, protocol) net.runNetwork() @@ -63,7 +63,7 @@ class NotaryServiceTests { tx.setTime(Instant.now().plusSeconds(3600), DUMMY_NOTARY, 30.seconds) var wtx = tx.toWireTransaction() - val protocol = NotaryProtocol(wtx, NotaryProtocol.tracker()) + val protocol = NotaryProtocol(wtx, NotaryProtocol.Companion.tracker()) val future = clientNode.smm.add(NotaryProtocol.TOPIC, protocol) net.runNetwork() diff --git a/node/src/test/kotlin/core/node/storage/PerFileCheckpointStorageTests.kt b/node/src/test/kotlin/node/services/PerFileCheckpointStorageTests.kt similarity index 96% rename from node/src/test/kotlin/core/node/storage/PerFileCheckpointStorageTests.kt rename to node/src/test/kotlin/node/services/PerFileCheckpointStorageTests.kt index a8e31a4752..4c3aa9ca1d 100644 --- a/node/src/test/kotlin/core/node/storage/PerFileCheckpointStorageTests.kt +++ b/node/src/test/kotlin/node/services/PerFileCheckpointStorageTests.kt @@ -1,9 +1,11 @@ -package core.node.storage +package 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 org.assertj.core.api.Assertions.assertThat import org.assertj.core.api.Assertions.assertThatExceptionOfType import org.junit.After diff --git a/node/src/test/kotlin/core/node/services/TimestampCheckerTests.kt b/node/src/test/kotlin/node/services/TimestampCheckerTests.kt similarity index 94% rename from node/src/test/kotlin/core/node/services/TimestampCheckerTests.kt rename to node/src/test/kotlin/node/services/TimestampCheckerTests.kt index b721a4d444..aefcc6ce86 100644 --- a/node/src/test/kotlin/core/node/services/TimestampCheckerTests.kt +++ b/node/src/test/kotlin/node/services/TimestampCheckerTests.kt @@ -1,7 +1,8 @@ -package core.node.services +package node.services import core.contracts.TimestampCommand import core.seconds +import node.services.transactions.TimestampChecker import org.junit.Test import java.time.Clock import java.time.Instant diff --git a/node/src/test/kotlin/core/node/services/UniquenessProviderTests.kt b/node/src/test/kotlin/node/services/UniquenessProviderTests.kt similarity index 86% rename from node/src/test/kotlin/core/node/services/UniquenessProviderTests.kt rename to node/src/test/kotlin/node/services/UniquenessProviderTests.kt index 0c4dc16b98..19c31c2fde 100644 --- a/node/src/test/kotlin/core/node/services/UniquenessProviderTests.kt +++ b/node/src/test/kotlin/node/services/UniquenessProviderTests.kt @@ -1,8 +1,10 @@ -package core.node.services +package node.services import core.contracts.TransactionBuilder -import core.testutils.MEGA_CORP -import core.testutils.generateStateRef +import core.node.services.UniquenessException +import core.testing.MEGA_CORP +import core.testing.generateStateRef +import node.services.transactions.InMemoryUniquenessProvider import org.junit.Test import kotlin.test.assertEquals import kotlin.test.assertFailsWith diff --git a/node/src/test/kotlin/core/utilities/AffinityExecutorTests.kt b/node/src/test/kotlin/node/utilities/AffinityExecutorTests.kt similarity index 99% rename from node/src/test/kotlin/core/utilities/AffinityExecutorTests.kt rename to node/src/test/kotlin/node/utilities/AffinityExecutorTests.kt index 9b8a760c3b..86b95d3bc7 100644 --- a/node/src/test/kotlin/core/utilities/AffinityExecutorTests.kt +++ b/node/src/test/kotlin/node/utilities/AffinityExecutorTests.kt @@ -1,4 +1,4 @@ -package core.utilities +package node.utilities import org.junit.After import org.junit.Test diff --git a/node/src/test/kotlin/core/visualiser/GraphStream.kt b/node/src/test/kotlin/node/visualiser/GraphStream.kt similarity index 96% rename from node/src/test/kotlin/core/visualiser/GraphStream.kt rename to node/src/test/kotlin/node/visualiser/GraphStream.kt index bb84f1c40e..dc0e20d7c5 100644 --- a/node/src/test/kotlin/core/visualiser/GraphStream.kt +++ b/node/src/test/kotlin/node/visualiser/GraphStream.kt @@ -1,4 +1,4 @@ -package core.visualiser +package node.visualiser import org.graphstream.graph.Edge import org.graphstream.graph.Element @@ -42,7 +42,7 @@ fun createGraph(name: String, styles: String): SingleGraph { } } -class MyViewer(graph: Graph) : Viewer(graph, Viewer.ThreadingModel.GRAPH_IN_ANOTHER_THREAD) { +class MyViewer(graph: Graph) : Viewer(graph, ThreadingModel.GRAPH_IN_ANOTHER_THREAD) { override fun enableAutoLayout(layoutAlgorithm: Layout) { super.enableAutoLayout(layoutAlgorithm) diff --git a/node/src/test/kotlin/core/visualiser/GroupToGraphConversion.kt b/node/src/test/kotlin/node/visualiser/GroupToGraphConversion.kt similarity index 98% rename from node/src/test/kotlin/core/visualiser/GroupToGraphConversion.kt rename to node/src/test/kotlin/node/visualiser/GroupToGraphConversion.kt index ef8e057c0a..b5266d4858 100644 --- a/node/src/test/kotlin/core/visualiser/GroupToGraphConversion.kt +++ b/node/src/test/kotlin/node/visualiser/GroupToGraphConversion.kt @@ -1,9 +1,9 @@ -package core.visualiser +package node.visualiser import core.contracts.CommandData import core.contracts.ContractState import core.crypto.SecureHash -import core.testutils.TransactionGroupDSL +import 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/core/visualiser/StateViewer.form b/node/src/test/kotlin/node/visualiser/StateViewer.form similarity index 96% rename from node/src/test/kotlin/core/visualiser/StateViewer.form rename to node/src/test/kotlin/node/visualiser/StateViewer.form index 17e8f42caf..5d7749fa50 100644 --- a/node/src/test/kotlin/core/visualiser/StateViewer.form +++ b/node/src/test/kotlin/node/visualiser/StateViewer.form @@ -1,5 +1,5 @@ -
+ diff --git a/node/src/test/kotlin/core/visualiser/StateViewer.java b/node/src/test/kotlin/node/visualiser/StateViewer.java similarity index 99% rename from node/src/test/kotlin/core/visualiser/StateViewer.java rename to node/src/test/kotlin/node/visualiser/StateViewer.java index 9314229eb7..eedf90a779 100644 --- a/node/src/test/kotlin/core/visualiser/StateViewer.java +++ b/node/src/test/kotlin/node/visualiser/StateViewer.java @@ -1,4 +1,4 @@ -package core.visualiser; +package node.visualiser; import kotlin.*; diff --git a/node/src/test/resources/core/visualiser/graph.css b/node/src/test/resources/node/visualiser/graph.css similarity index 100% rename from node/src/test/resources/core/visualiser/graph.css rename to node/src/test/resources/node/visualiser/graph.css diff --git a/src/main/kotlin/demos/IRSDemo.kt b/src/main/kotlin/demos/IRSDemo.kt index 838e7bef7f..033b37dc71 100644 --- a/src/main/kotlin/demos/IRSDemo.kt +++ b/src/main/kotlin/demos/IRSDemo.kt @@ -4,17 +4,18 @@ import com.google.common.net.HostAndPort import com.typesafe.config.ConfigFactory import core.crypto.Party import core.logElapsedTime -import core.node.Node -import core.node.NodeConfiguration -import core.node.NodeConfigurationFromConfig +import node.internal.Node +import node.services.config.NodeConfiguration +import node.services.config.NodeConfigurationFromConfig import core.node.NodeInfo -import core.node.services.NetworkMapService -import core.node.services.NodeInterestRates -import core.node.services.NotaryService +import node.services.network.NetworkMapService +import node.services.clientapi.NodeInterestRates +import node.services.transactions.NotaryService import core.node.services.ServiceType -import core.node.subsystems.ArtemisMessagingService +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 @@ -76,8 +77,8 @@ fun main(args: Array) { } val node = logElapsedTime("Node startup") { Node(dir, myNetAddr, config, networkMapId, - advertisedServices, DemoClock(), - listOf(demos.api.InterestRateSwapAPI::class.java)).start() } + advertisedServices, DemoClock(), + listOf(InterestRateSwapAPI::class.java)).start() } // TODO: This should all be replaced by the identity service being updated // as the network map changes. diff --git a/src/main/kotlin/demos/RateFixDemo.kt b/src/main/kotlin/demos/RateFixDemo.kt index 6bb298f8b0..e1cb618aac 100644 --- a/src/main/kotlin/demos/RateFixDemo.kt +++ b/src/main/kotlin/demos/RateFixDemo.kt @@ -1,22 +1,23 @@ package demos import contracts.Cash -import core.* import core.contracts.DOLLARS import core.contracts.FixOf -import core.crypto.Party import core.contracts.TransactionBuilder -import core.node.Node -import core.node.NodeConfiguration +import core.crypto.Party +import core.logElapsedTime import core.node.NodeInfo -import core.node.services.NodeInterestRates import core.node.services.ServiceType -import core.node.subsystems.ArtemisMessagingService import core.serialization.deserialize -import core.utilities.ANSIProgressRenderer import core.utilities.BriefLogFormatter import core.utilities.Emoji +import 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 java.math.BigDecimal import java.nio.file.Files @@ -80,7 +81,7 @@ fun main(args: Array) { val node = logElapsedTime("Node startup") { Node(dir, myNetAddr, config, networkMapAddress, advertisedServices, DemoClock(), - listOf(demos.api.InterestRateSwapAPI::class.java)).start() } + listOf(InterestRateSwapAPI::class.java)).start() } val notary = node.services.networkMapCache.notaryNodes[0] diff --git a/src/main/kotlin/demos/TraderDemo.kt b/src/main/kotlin/demos/TraderDemo.kt index b120e155c6..e2a503f423 100644 --- a/src/main/kotlin/demos/TraderDemo.kt +++ b/src/main/kotlin/demos/TraderDemo.kt @@ -11,21 +11,21 @@ import core.crypto.generateKeyPair import core.days import core.logElapsedTime import core.messaging.SingleMessageRecipient -import core.messaging.StateMachineManager -import core.node.Node -import core.node.NodeConfigurationFromConfig +import node.services.statemachine.StateMachineManager +import node.internal.Node +import node.services.config.NodeConfigurationFromConfig import core.node.NodeInfo -import core.node.services.NetworkMapService -import core.node.services.NodeAttachmentService -import core.node.services.NotaryService +import node.services.network.NetworkMapService +import node.services.persistence.NodeAttachmentService +import node.services.transactions.NotaryService import core.node.services.ServiceType -import core.node.subsystems.ArtemisMessagingService -import core.node.subsystems.NodeWalletService +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 core.utilities.ANSIProgressRenderer +import node.utilities.ANSIProgressRenderer import core.utilities.BriefLogFormatter import core.utilities.Emoji import core.utilities.ProgressTracker diff --git a/src/main/kotlin/demos/api/InterestRateSwapAPI.kt b/src/main/kotlin/demos/api/InterestRateSwapAPI.kt index 3fc7e49c85..5ef092d4c4 100644 --- a/src/main/kotlin/demos/api/InterestRateSwapAPI.kt +++ b/src/main/kotlin/demos/api/InterestRateSwapAPI.kt @@ -1,11 +1,13 @@ package demos.api -import 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 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/demos/protocols/AutoOfferProtocol.kt index 13e4f02b7b..f174d176d7 100644 --- a/src/main/kotlin/demos/protocols/AutoOfferProtocol.kt +++ b/src/main/kotlin/demos/protocols/AutoOfferProtocol.kt @@ -7,11 +7,11 @@ import core.contracts.DealState import core.crypto.Party import core.contracts.SignedTransaction import core.messaging.SingleMessageRecipient -import core.node.Node +import node.internal.Node import core.protocols.ProtocolLogic import core.random63BitValue import core.serialization.deserialize -import core.utilities.ANSIProgressRenderer +import node.utilities.ANSIProgressRenderer import core.utilities.ProgressTracker import protocols.TwoPartyDealProtocol diff --git a/src/main/kotlin/demos/protocols/ExitServerProtocol.kt b/src/main/kotlin/demos/protocols/ExitServerProtocol.kt index c416d303ea..4bbd501b80 100644 --- a/src/main/kotlin/demos/protocols/ExitServerProtocol.kt +++ b/src/main/kotlin/demos/protocols/ExitServerProtocol.kt @@ -2,11 +2,11 @@ package demos.protocols import co.paralleluniverse.fibers.Suspendable import co.paralleluniverse.strands.Strand -import core.node.Node import core.node.NodeInfo import core.protocols.ProtocolLogic import core.serialization.deserialize -import core.testing.MockNetworkMapCache +import node.internal.Node +import node.services.network.MockNetworkMapCache import java.util.concurrent.TimeUnit diff --git a/src/main/kotlin/demos/protocols/UpdateBusinessDayProtocol.kt b/src/main/kotlin/demos/protocols/UpdateBusinessDayProtocol.kt index 89f54aa162..3c6e0ab9fd 100644 --- a/src/main/kotlin/demos/protocols/UpdateBusinessDayProtocol.kt +++ b/src/main/kotlin/demos/protocols/UpdateBusinessDayProtocol.kt @@ -4,16 +4,16 @@ import co.paralleluniverse.fibers.Suspendable import contracts.InterestRateSwap import core.contracts.DealState import core.contracts.StateAndRef -import core.node.Node import core.node.NodeInfo -import core.node.subsystems.linearHeadsOfType +import core.node.services.linearHeadsOfType import core.protocols.ProtocolLogic import core.random63BitValue import core.serialization.deserialize -import core.testing.MockNetworkMapCache -import core.utilities.ANSIProgressRenderer import core.utilities.ProgressTracker +import node.utilities.ANSIProgressRenderer import demos.DemoClock +import node.internal.Node +import node.services.network.MockNetworkMapCache import protocols.TwoPartyDealProtocol import java.time.LocalDate diff --git a/src/test/kotlin/core/testing/IRSSimulationTest.kt b/src/test/kotlin/core/testing/IRSSimulationTest.kt index 3f59572aaa..8063957d67 100644 --- a/src/test/kotlin/core/testing/IRSSimulationTest.kt +++ b/src/test/kotlin/core/testing/IRSSimulationTest.kt @@ -2,6 +2,7 @@ package core.testing import com.google.common.base.Throwables import core.utilities.BriefLogFormatter +import node.internal.testing.IRSSimulation import org.junit.Test class IRSSimulationTest {