b71f0c49fb
Multi threaded state machine
2018-01-31 18:13:25 +00:00
4b86362391
Merge remote-tracking branch 'open/master' into shams-os-merge-250118
...
# Conflicts:
# client/rpc/src/integration-test/kotlin/net/corda/client/rpc/BlacklistKotlinClosureTest.kt
# client/rpc/src/integration-test/kotlin/net/corda/client/rpc/RPCStabilityTests.kt
# core/src/test/java/net/corda/core/flows/FlowsInJavaTest.java
# docs/source/changelog.rst
# docs/source/corda-configuration-file.rst
# docs/source/upgrade-notes.rst
# finance/src/test/kotlin/net/corda/finance/contracts/CommercialPaperTests.kt
# finance/src/test/kotlin/net/corda/finance/contracts/asset/CashTests.kt
# gradle/wrapper/gradle-wrapper.properties
# node-api/src/main/kotlin/net/corda/nodeapi/internal/KeyStoreConfigHelpers.kt
# node-api/src/test/kotlin/net/corda/nodeapi/internal/serialization/SetsSerializationTest.kt
# node/src/integration-test/kotlin/net/corda/node/AuthDBTests.kt
# node/src/integration-test/kotlin/net/corda/node/BootTests.kt
# node/src/integration-test/kotlin/net/corda/node/NodeKeystoreCheckTest.kt
# node/src/integration-test/kotlin/net/corda/node/NodePerformanceTests.kt
# node/src/integration-test/kotlin/net/corda/node/SSHServerTest.kt
# node/src/integration-test/kotlin/net/corda/node/services/AttachmentLoadingTests.kt
# node/src/integration-test/kotlin/net/corda/node/services/BFTNotaryServiceTests.kt
# node/src/integration-test/kotlin/net/corda/node/services/RaftNotaryServiceTests.kt
# node/src/integration-test/kotlin/net/corda/node/services/network/NetworkMapTest.kt
# node/src/integration-test/kotlin/net/corda/node/services/network/PersistentNetworkMapCacheTest.kt
# node/src/integration-test/kotlin/net/corda/node/services/statemachine/FlowVersioningTest.kt
# node/src/integration-test/kotlin/net/corda/node/utilities/registration/NodeRegistrationTest.kt
# node/src/integration-test/kotlin/net/corda/services/messaging/MQSecurityTest.kt
# node/src/integration-test/kotlin/net/corda/services/messaging/P2PMessagingTest.kt
# node/src/integration-test/kotlin/net/corda/test/node/NodeStatePersistenceTests.kt
# node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
# node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt
# node/src/main/resources/reference.conf
# node/src/test/java/net/corda/node/services/vault/VaultQueryJavaTests.java
# node/src/test/kotlin/net/corda/node/CordaRPCOpsImplTest.kt
# node/src/test/kotlin/net/corda/node/services/config/NodeConfigurationImplTest.kt
# node/src/test/kotlin/net/corda/node/services/network/NetworkMapCacheTest.kt
# node/src/test/kotlin/net/corda/node/services/persistence/DBCheckpointStorageTests.kt
# samples/attachment-demo/src/integration-test/kotlin/net/corda/attachmentdemo/AttachmentDemoTest.kt
# samples/network-visualiser/src/main/kotlin/net/corda/netmap/NetworkMapVisualiser.kt
# samples/notary-demo/src/main/kotlin/net/corda/notarydemo/RaftNotaryCordform.kt
# samples/simm-valuation-demo/src/integration-test/kotlin/net/corda/vega/SimmValuationTest.kt
# testing/node-driver/src/integration-test/kotlin/net/corda/testing/driver/DriverTests.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/InMemoryMessagingNetwork.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/MockNode.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/MockServices.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/NodeTestUtils.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/NodeBasedTest.kt
# testing/smoke-test-utils/src/main/kotlin/net/corda/smoketesting/NodeProcess.kt
# testing/test-utils/src/main/kotlin/net/corda/testing/internal/TestNodeInfoBuilder.kt
# tools/explorer/src/main/kotlin/net/corda/explorer/ExplorerSimulation.kt
# verifier/src/integration-test/kotlin/net/corda/verifier/VerifierTests.kt
# webserver/src/integration-test/kotlin/net/corda/webserver/WebserverDriverTests.kt
2018-01-25 17:51:13 +00:00
1fc646cfa8
CORDA-716 Move test-utils and node-driver to stable API section in docs ( #2335 )
...
* Move test-utils and node-driver to stable section.
* Move FlowStackSnapshotFactory to testing.services package & update docs
* Move SerializationTestHelpers to testing.core package
* Move TestConstants.kt to core namespace
* Move Expect.kt to core namespace
* Move CoreTestUtils to core.TestUtils - rename class and update imports
* Added some clarification to documents after re-reading them
* Added static imports
* Removing unused import
* Fix merge conflict
* Fixing merge conflict
2018-01-22 11:28:41 +00:00
6ddf684846
Fix compile errors.
2018-01-19 15:12:33 +00:00
52173219c3
Merge remote-tracking branch 'open/master' into shams-os-merge-020118
...
# Conflicts:
# client/rpc/src/integration-test/java/net/corda/client/rpc/CordaRPCJavaClientTest.java
# node/src/integration-test/kotlin/net/corda/node/NodeKeystoreCheckTest.kt
# node/src/integration-test/kotlin/net/corda/node/services/network/NetworkMapTest.kt
# node/src/integration-test/kotlin/net/corda/node/utilities/registration/NodeRegistrationTest.kt
# node/src/integration-test/kotlin/net/corda/services/messaging/MQSecurityTest.kt
# node/src/main/kotlin/net/corda/node/services/config/ConfigUtilities.kt
# node/src/test/kotlin/net/corda/node/services/events/NodeSchedulerServiceTest.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/DriverDSLImpl.kt
2018-01-02 15:32:32 +00:00
a2d14bd20d
Exclude jolokia packages from Quasar instrumentation. ( #2279 )
2017-12-21 11:06:44 +00:00
e9fc6f7c8d
Merge remote-tracking branch 'open/master' into colljos-os-merge-rc01
2017-12-18 10:24:38 +00:00
8114a20abd
CORDA-716 Move non-API things to internal ( #2256 )
2017-12-17 18:44:35 +00:00
d1998b2c94
Merge remote-tracking branch 'open-hc02/master' into colljos-os-hc02-merge-121217
2017-12-13 11:02:58 +00:00
c3b9955344
CORDA-716 Fix split packages in testing ( #2232 )
2017-12-12 19:37:01 +00:00
905c8252a6
CORDA-654 Remaining key constants ( #2226 )
2017-12-12 18:03:06 +00:00
499de12620
Merge remote-tracking branch 'open-hc02/master' into colljos-os-hc02-merge-121217
2017-12-12 11:22:57 +00:00
d8c7f0ae23
Inline DUMMY_CASH/OBLIGATION_ISSUER. ( #2214 )
2017-12-11 16:17:20 +00:00
544e19e277
CORDA-654 Remove key constants from NodeTestUtils ( #2205 )
...
* DUMMY_NOTARY was hiding in a couple more places
2017-12-11 11:44:01 +00:00
bb5d5d6944
Various modifications to debugging tools
2017-12-07 15:35:28 +00:00
63027a077d
State machine rewrite
2017-12-05 11:36:20 +00:00
2bdd8b681d
Merge OS to Enterprise.
...
Main differences preserved in Enterprise version:
* constants.properties: platform version 1 (OS has 2)
* gradle-wrapper.properties: higher Gradle version gradle-4.3.1 (OS has gradle-4.3)
* Driver.kt - setting system property "user.dir"
2017-11-30 23:54:12 +00:00
a314a6a125
CORDA-654 Simplify TransactionDSL API ( #2152 )
2017-11-30 16:28:44 +00:00
7a9364c8d5
Merge remote-tracking branch 'open/master' into colljos-merge-171117
...
# Conflicts:
# .idea/compiler.xml
# build.gradle
# client/rpc/src/integration-test/kotlin/net/corda/client/rpc/CordaRPCClientTest.kt
# docs/source/changelog.rst
# node/src/integration-test/kotlin/net/corda/node/services/AttachmentLoadingTests.kt
# node/src/main/kotlin/net/corda/node/internal/StartedNode.kt
# node/src/main/kotlin/net/corda/node/utilities/registration/HTTPNetworkRegistrationService.kt
# samples/network-visualiser/build.gradle
# samples/simm-valuation-demo/src/integration-test/kotlin/net/corda/vega/SimmValuationTest.kt
# testing/node-driver/src/integration-test/kotlin/net/corda/testing/driver/DriverTests.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/driver/Driver.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/MockNode.kt
2017-11-17 15:11:24 +00:00
12124bc0d9
Fixing failing build for the IntelliJ plugin ( #100 )
2017-11-13 10:25:11 +00:00
6b71c6cf75
Retire some initialiseSerialization booleans. ( #2019 )
2017-11-10 10:15:55 +00:00
db0969ebda
Merge from Corda master
2017-10-16 18:03:07 +01:00
af44c96c14
Merge pull request #1863 from corda/aslemmer-kryo-hook
...
Aslemmer kryo hook
2017-10-11 12:42:18 +01:00
4ee250a19b
Retire setCordappPackages. ( #1860 )
2017-10-11 10:35:21 +01:00
b354d335a3
Remove extra blank line
2017-10-11 10:35:11 +01:00
c56c9fd455
Add README.md, some docs
2017-10-11 10:06:27 +01:00
16b26970a9
Add kryo-hook javaagent
2017-10-11 09:54:19 +01:00
b1fb321230
Reformat files in experimental
2017-10-09 15:26:39 +01:00
0b35a99c5a
[CORDA-682]: Claim Jigsaw module names ( #1824 )
...
[CORDA-682] Specify Jigsaw module names for all JAR projects.
2017-10-06 15:37:33 +01:00
9874e1ff34
uncheckedCast crusade ( #1667 )
2017-09-27 12:58:48 +01:00
9284e731c0
Merge remote-tracking branch 'remotes/open/master' into enterprise-merge-september-26
...
# Conflicts:
# core/src/main/kotlin/net/corda/core/crypto/CryptoUtils.kt
# node-api/src/main/kotlin/net/corda/nodeapi/internal/serialization/Kryo.kt
# settings.gradle
2017-09-26 18:08:47 +01:00
532bbb5cca
Contract constraints ( #1518 )
...
* Contract constraints and attachment loading
Fix compiler warnings.
Fixed IdentitySyncFlowTests in confidential-identities.
Fixes.
Fix AttachmentClassLoaderTests.
Added a TODO.
Renamed cordapp service.
Fix compilation error in java code.
Fix RaftNotaryServiceTests
Fix AttachmentLoadingTest
Fix DistributedServiceTests and LargeTransactionTests.
Add cordapp packages to Verifier tests.
Refactor DummyContractBackdoor back out of internal package.
Resolve compiler warnings.
Consolidate excluding `isolated` project at top-level.
Fix contract attachment serialisation for remote verifier.
Fix integration tests for client:rpc.
Contract constraints and attachment loading
Fix compiler warnings.
Fixed IdentitySyncFlowTests in confidential-identities.
Fixes.
Fix AttachmentClassLoaderTests.
Added a TODO.
Renamed cordapp service.
Fix compilation error in java code.
Fix example compilation.
Fix RaftNotaryServiceTests
Fix AttachmentLoadingTest
Fix DistributedServiceTests and LargeTransactionTests.
Add cordapp packages to Verifier tests.
Refactor DummyContractBackdoor back out of internal package.
Resolve compiler warnings.
Consolidate excluding `isolated` project at top-level.
Fix integration tests for client:rpc.
Fixed issues with node driver and differing ZIPs.
Review changes.
Refactor GeneratedAttachment into node-api module.
Merge branch 'clint/hash-constraint' of https://github.com/corda/corda into clint/hash-constraint
Fixed compile error following rebase.
wip - test to check that app code isn't loaded from attachments sent over the wire.
Use Kotlin copyTo() rather than Apache's IOUtils.
Fixes
more fixes.
Removing unconstrained output.
More fixes.
Fixed another test.
Added missing plugin definition in net.corda.core.node.CordaPluginRegistry: net.corda.finance.contracts.isolated.IsolatedPlugin
Re-added missing magic string used in unit test.
Remove unused FlowSession variable.
* Review fixes.
* More review fixes.
* Moved Cordapp implementation to an internal package.
* More JVMOverloads.
2017-09-25 17:05:18 +01:00
c05e482c8f
Change public constant values to Kotlin constants ( #1588 )
...
* Make string constants into Kotlin constants
* Add JvmName annotation to KeyStoreUtilities
2017-09-21 15:32:02 +01:00
ea61e6e9d5
[CORDA-461] Remove deprecated APIs. ( #1480 )
...
https://r3-cev.atlassian.net/browse/CORDA-461
2017-09-13 15:39:39 +01:00
c18b0ecdc3
Clean up CordaX500Name ( #1487 )
...
* Remove unused imports
* Move X500 name generation into test code as it's no longer used in the main code
2017-09-12 13:08:43 +01:00
bc6628a072
ContractState now references contract by class name ( #1407 )
...
* ContractState's contract type has been moved to TransactionState and is now a string representing the class name of the contract class to allow classloading of arbitrary contracts from custom classloaders.
* Upgraded isolated JAR to new version.
2017-09-11 16:44:18 +01:00
c9e9242ff4
Merge remote-tracking branch 'open/master' into aslemmer-enterprise-merge-september-8
2017-09-08 11:14:40 +01:00
57412d4498
Enforce X500Name format defined in design doc ( #1427 )
...
* Standardise X500Name format - WIP
* address PR issues
* failing test fix and replace X500Name with getX500Name
* gradle plugin fix
* Added country code validation
2017-09-07 14:47:42 +01:00
15f741f315
Spinoff driver into own project with demorun ( #1401 )
2017-09-05 09:50:51 +01:00
7e3dd4c12c
Restructure net.corda.core.crypto package
...
* Rename KeyFactory to CompositeKeyFactory
* Move expandedCompositeKeys into TestDSL as the only place that uses it
* Move NullKeys out of their own package
* Move remaining crypto classes into superpackage
* Move utility classes out of crypto and into utilities package
2017-09-01 10:55:58 +01:00
03ddaaac11
Remove the copy of Guava from within the finance module. ( #1362 )
2017-08-31 14:40:32 +01:00
bbebea234d
remove reference to repository with JetBrains/Exposed library
2017-08-31 13:42:08 +01:00
660d012800
Merge pull request #1352 from corda/aslemmer-quasar-exclude
...
Add exclude pattern to the quasar agent
2017-08-30 17:39:05 +01:00
e9f3b92e97
Add alwaysExcluded flag to quasar-hook, run config for generating exclude pattern
2017-08-30 17:14:01 +01:00
a4ba8e4f2f
Merge open master
2017-08-30 11:41:30 +01:00
73664c3383
Test DSL: update tests to handle new transaction constraints
2017-08-29 17:05:13 +01:00
c86e78599f
Rename finance module to own package
...
Fixup after rebase
Correct bad merges
Fixup docs
Fix integration test
Correct doc references to finance
2017-08-22 13:25:31 +01:00
2829faa01f
Retire legalContractReference ( #1188 )
...
* Add LegalProseReference annotation
* Migrate code from autogenerated javascript to TypeScript source
* Add instructions to rebuild the web resources
* Make installWeb more reproducible
2017-08-18 13:30:39 +01:00
551a26d0a3
Changing flow stack snapshot tree node labeling ( #26 )
...
* Changing flow stack snapshot tree node labeling
* Removing stackObjects node from the hierarchy
2017-08-17 12:16:10 +01:00
62b26bcd89
Moved Currency stuff in ContractsDSL out of core and into finance
2017-08-15 18:08:02 +01:00
