b71f0c49fb
Multi threaded state machine
2018-01-31 18:13:25 +00:00
1c77736d50
merge os to enterprise
2018-01-30 14:00:22 +00:00
1ecf646f7e
Oracle 11xe and 12c database compatibility ( #206 )
...
* Sql setup scripts for Oracle and datasource configuration.
* CashSelection for Oracle.
* Workaround of forbidden distinct for BLOBs.
* ojdbc8.jar driver dependency from Oracle Maven repository, ojdbc6.jar from lib (it's not in Maven repo).
* allow to use random Port in node names and trim it from schema name, remove schema with port numbers from db setup (to cater for new test, non Oracle specific change)
* Removed unnecessary code from ConfigUtilities (non Oracle specific change)
* Removed db integration tests setup for RPCStabilityTest as it doesn't start any nodes
2018-01-29 18:35:58 +00:00
93054a9590
Add cmdline option for network root truststore and password ( #2407 )
...
* add cmdline option for network root truststore and password, instead of using node's truststore configuration to avoid confusion.
* revert line auto format
* fix failing integration test
* address PR issue
2018-01-29 13:43:16 +00:00
054c44d4bc
Merge from OS to ENT including Bridge manager work
2018-01-26 16:55:43 +00:00
336aeb96e5
Merge fixes
2018-01-26 13:45:03 +00:00
0ff9c9e2e3
Move to message based bridge control protocol ( #2410 )
...
Tidy up
Remove dead RPCSecurity logic from ArtemisMessageServer
Address PR comments
Address PR comments
2018-01-25 17:53:34 +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
17a6f61eba
Simplify CashTests and add some comments/convenience APIs to MockServices ( #2241 )
2018-01-25 16:29:26 +01:00
9783f11ba8
Exposed RPC SSL settings through Cordformation ( #2419 )
2018-01-25 14:32:58 +00:00
d17670c747
Provide an API to register callback on app shutdown ( #2402 )
...
Provide an API to register callback on app shutdown.
2018-01-24 16:19:24 +01:00
3c0e006456
Reverted incorrect additional advertised RPC address in NodeInfo ( #2417 )
2018-01-24 14:42:07 +00:00
61c7de22d6
Replaced KeyStoreWrapper with X509KeyStore, which is still a wrapper but assumes only X509 certs and has better APIs ( #2411 )
2018-01-24 07:51:55 +00:00
142f52fa82
[CORDA:936]: Enable RPC layer to work with SSL
2018-01-23 16:23:37 +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
d00438b86f
Fix MockNetwork non-daemon thread leak. ( #2397 )
2018-01-22 11:00:40 +00:00
ac7637e2b4
Revert "CORDA-599 RPCSecurityManager is no longer lateinit ( #2347 )"
...
This reverts commit 75e74e67a1
2018-01-19 17:52:59 +01:00
7ac1cbd379
Merge commit 'e699dad076fc1d81b8bd9529747e2922728ce2e0' into andr3ej-os-merges
...
# Conflicts:
# node/src/test/kotlin/net/corda/node/services/transactions/DistributedImmutableMapTests.kt
# node/src/test/kotlin/net/corda/node/services/transactions/PersistentUniquenessProviderTests.kt
2018-01-19 13:40:16 +00:00
35f89e03ea
Abstract InMemoryMessaging behind an interface so as not expose net.corda.nodeapi.internal.persistence.CordaPersistence in public API ( #2390 )
2018-01-19 10:57:08 +00:00
d19eb4a9d7
Removed useHTTPS from NodeConfiguration as it's not needed by the node. ( #2375 )
...
It's still expected to be present in node.conf if the web server needs to use SSL.
2018-01-17 17:47:40 +00:00
42b4b80545
Fixed imports
2018-01-16 13:24:53 +00:00
eb3798da5e
Merge remote-tracking branch 'open/master' into colljos-merge-160118
2018-01-16 12:13:49 +00:00
1367cd4adb
CORDA-912 Stop exposing internal node user, create user in testing infrastructu… ( #2361 )
...
* Stop exposing internal node user, create user in testing infrastructure instead
* Update kdocs
2018-01-15 19:30:33 +00:00
75e74e67a1
CORDA-599 RPCSecurityManager is no longer lateinit ( #2347 )
2018-01-15 19:11:00 +00:00
fb1d3087de
Raft notaries can share a single key pair for the service identity (in contrast to a shared composite public key, and individual signing key pairs). This allows adjusting the cluster size on the fly.
2018-01-13 16:36:41 +00:00
89b64da12b
Increase shutdown action timeout. In some tests using driver, the shutdown
...
can be invoked before the notary node gets started, and the node disposal action
times out, leading to unclosed message brokers and port conflicts.
2018-01-12 18:19:02 +00:00
c71ef3139b
Merge remote-tracking branch 'open/master' into shams-os-merge-120118
...
# Conflicts:
# core/src/main/kotlin/net/corda/core/schemas/CommonSchema.kt
# node-api/src/main/kotlin/net/corda/nodeapi/internal/network/NetworkMap.kt
# node/src/integration-test/kotlin/net/corda/node/services/RaftNotaryServiceTests.kt
# node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
# node/src/main/kotlin/net/corda/node/utilities/registration/HTTPNetworkRegistrationService.kt
# testing/test-utils/src/main/kotlin/net/corda/testing/internal/vault/DummyDealStateSchemaV1.kt
2018-01-12 08:06:44 +00:00
bbfbb08c43
CORDA-881: Signed network parameters has the network map cert attached to it instead of just the public key. ( #2346 )
...
Introduced DigitalSignatureWithCert and SignedDataWithCert as internal APIs, with the expectation that they will become public; renamed the network parameters end-point to network-parameters; updated the network-map.rst doc; and did some refactoring.
2018-01-12 07:59:08 +00:00
671f221451
Add jdbc connection autocommit=false property to mock configuration for integration tests. ( #338 )
...
'autocommit=false' is set now in NodeConfiguration (0c017fdfec
2018-01-11 18:03:28 +00:00
12546c0a7c
[ENT-1281]: Disable database.runMigration by default and enforce database version on startup. ( #264 )
...
* [ENT-1281]: set database.runMigration=false by default and add state check at startup
* [ENT-1281]: attempt to fix tests
* [ENT-1281]: attempt to fix tests
* [ENT-1281]: set runMigration=true in the cordformation plugin
* [ENT-1281]: attempt to fix tests
* [ENT-1281]: attempt to fix tests
* [ENT-1281]: attempt to fix tests
* [ENT-1281]: fix formatting
* [ENT-1281]: typo and javadocs
* [ENT-1281]: small refactoring and added test for SchemaMigration
* [ENT-1281]: update documentation to reflect changes
* [ENT-1281]: fix tests after merge
* [ENT-1339]: for h2, allow schemas without migrations to run (#294 )
* [ENT-1339]: for h2, allow schemas without migrations to run
* [ENT-1339]: fix various migration issues and change author name
* [ENT-1339]: add naming convention for migrations
* [ENT-1339]: change naming convention to use hyphens
* [ENT-1339]: change mapping of participants to be able to control the table name
* [ENT-1339]: change FK names to <=30 for oracle 11g compatibility
* [ENT-1339]: cmd line argument for migrations made consistent
* [ENT-1339]: revert abstract state superclasses
* Update db integration test setup - new tables.
* Update db integration test setup - new tables.
* [ENT-1339]: remove final from participants to allow table name config
* [ENT-1339]: shortened pk
* [ENT-1339]: revert constructor
* [ENT-1339]: change getMigrationResource api to Nullable
* fix compile error
* [ENT-1281]: fix tests after merge
* [ENT-1281]: fix tests after merge
2018-01-10 11:32:24 +00:00
979d7f2c63
ENT-1226 Improve Network client Error Handling ( #2344 )
...
* Improve Network client Error Handling
* Reformatted NetworkMapServer
* Removed line that is now redundant
2018-01-09 16:55:16 +00:00
63e1bdaa94
Revert "Raft notaries can share a single key pair for the service identity (i… ( #2269 )"
...
This reverts commit 3e00676851
2018-01-09 12:20:25 +00:00
46d88ed740
Adds JavaDocs for waitForAllNodesToFinish param
2018-01-09 11:56:48 +00:00
3e00676851
Raft notaries can share a single key pair for the service identity (i… ( #2269 )
...
* Raft notaries can share a single key pair for the service identity (in contrast to a shared composite public key, and individual signing key pairs). This allows adjusting the cluster size on the fly.
2018-01-09 08:17:59 +00:00
1e9e1a61d9
Moved IntegrationTest class into internal package
2018-01-04 22:08:16 +00:00
b577b680ff
Merge remote-tracking branch 'open/master' into shams-os-merge-040118
2018-01-04 18:32:15 +00:00
48be562a2a
ECDSA entropyToKeyPair + no idempotent signatures ( #2210 )
2018-01-04 17:52:31 +00:00
13619df0b1
Merge remote-tracking branch 'open/master' into shams-os-merge-040118
...
# Conflicts:
# node/src/integration-test/kotlin/net/corda/node/utilities/registration/NodeRegistrationTest.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/MockServices.kt
# testing/test-utils/src/main/kotlin/net/corda/testing/dsl/TransactionDSLInterpreter.kt
2018-01-04 10:58:44 +00:00
8a3299fa2a
CORDA-716 Configure api scanner for test modules ( #2259 )
2018-01-04 10:09:04 +00:00
d84105b60e
Using X509Certificate consistently throughout, rather than BC's X509CertificateHolder. ( #2305 )
...
The later is now only used where needed. This has reduced the amount of converting we have to do back and forth.
2018-01-03 22:00:39 +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
730fec2eb4
Internal driver now also does the registration for the notaries. ( #2304 )
...
Using the --just-generate-node-info flag for the notary nodes so that their identities can be submitted to the network map server, which does the network parameters generation.
2018-01-02 15:12:30 +00:00
4a2f157118
Validating the entire cert path in node registration, rather just checking the root cert. ( #2298 )
...
Also reduced duplicate code when creating the node CA cert path for testing, and renamed IdentityGenerator to DevIdentityGenerator.
2017-12-29 14:38:30 +00:00
39d25958e2
Fixed identity generation of single node notaries as used by the driver and MockNetwork. ( #2296 )
...
The identity cert generated used to be of type SERVICE_IDENTITY when it should have been a LEGAL_IDENTITY.
2017-12-28 15:32:09 +00:00
269a4ba79d
Refactor BFTNotaryServicetest and MySQLNotaryServiceTest to allow running database integration tests. ( #211 )
...
* BFTNotaryServiceTests.kt - instantiate MockServices before each test, not at the class level - to allow database integration test clean database before each test.
* MySQLNotaryServiceTests.kt - use H2 datasource for the notary in database integration tests (and as it was before during standard integration tests)
* Revert Enterprise way of makeTestDataSourceProperties MockNode.kt.
* Minor attempt to refactor Enterprise only parts of reading database config and make it less error prone during OS->Enterprise merge.
2017-12-21 13:24:13 +00:00
6db0490750
Fix node integration tests. ( #2233 )
...
* Add tests for node registration and communication
2017-12-21 11:48:00 +00:00
a2d14bd20d
Exclude jolokia packages from Quasar instrumentation. ( #2279 )
2017-12-21 11:06:44 +00:00
de9565b96a
Merge remote-tracking branch 'open/master' into shams-os-merge-191217
...
# Conflicts:
# core/src/main/kotlin/net/corda/core/node/services/NotaryService.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/services/messaging/P2PMessagingTest.kt
# node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
2017-12-19 23:44:07 +00:00
e1e715ee81
Removed all remaining special treatment of the X500 common name.
...
With network parameters the CN is no longer needed to identify notaries. This frees it up to be used in the node's name alongside the other attributes.
Also, the identity generation logic has been simplified, removing the need to have magic string values for storing distributed identities in the keystore. Now there are just two alias prefixes: "identity" as it was previously, and "distributed-notary".
2017-12-18 21:39:11 +00:00
f7445a5e6a
CORDA-876 MockNetwork no longer leaks serialization env if init fails ( #2272 )
2017-12-18 17:09:24 +00:00
