1b37cef822
Minor: use of ByteArray.inputStream() and introduced PublicKey.hash ( #2931 )
2018-04-05 17:18:27 +01:00
c8b58a601f
Adding CRL support in the generated certificates. ( #2932 )
2018-04-05 16:39:41 +01:00
53a0aae489
Introduced a few helper methods around InputStream.readBytes ( #2928 )
2018-04-05 14:27:42 +01:00
375b4638ba
Merge remote-tracking branch 'remotes/open/master' into feature/vkolomeyko/ent-master-merge
...
# Conflicts:
# node/src/integration-test/kotlin/net/corda/node/modes/draining/FlowsDrainingModeContentionTest.kt
# node/src/integration-test/kotlin/net/corda/node/persistence/NodeStatePersistenceTests.kt
2018-04-05 13:12:13 +01:00
76c1b08b27
Merge remote-tracking branch 'remotes/open/master' attempt 2
2018-04-05 11:18:01 +01:00
9a1c27e3e0
Improve performance of NodeStatePersistenceTests ( #2921 )
...
Packages re-jig was meant to reduce the size of the jars that are being produced by the
node driver. E.g. previously `MessageState` was in package `net.corda` which resulted in jar file
of around 2MB to be created. Same for `NodeStatePersistenceTests` which was in `net.corda.node`
2018-04-05 09:33:03 +01:00
c1065c557f
Add support of db integration tests for tests introduced by CORDA-1264. ( #674 )
2018-04-04 22:39:15 +01:00
ad5ceedbd9
Merge remote-tracking branch 'remotes/open/master'
...
# Conflicts:
# docs/source/changelog.rst
2018-04-04 18:01:35 +01:00
4c123643ac
Merge pull request #680 from corda/shams-os-merge-0af42bd
...
O/S merge from 0af42bd
2018-04-04 17:38:18 +01:00
23184b7495
ENT-1729 P2P message de-duplication performance optimisation has a flaw ( #675 )
2018-04-04 15:49:00 +01:00
7296369541
Merge fixes
2018-04-04 14:52:24 +01:00
c998968e58
Update RpcExceptionHandlingTest tests introduced by CORDA-1264 ( #2916 )
2018-04-04 14:35:51 +01:00
6283462548
Merge remote-tracking branch 'open/master' into shams-os-merge-0af42bd
...
# Conflicts:
# node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
2018-04-04 14:18:24 +01:00
4334d38bf5
Merge pull request #672 from corda/aslemmer-merge-2f1b8ff23e5a0400f72ff603da10b849604c6b04
...
Merge OS up to 2f1b8ff23e
2018-04-04 12:07:07 +01:00
5909a49c30
ENT-1725: Introduce FlowAsyncOperation ( #658 )
...
* ENT-1725: Introduce FlowAsyncOperation, which allows suspending a flow on a custom operation, such as long running I/O requests, notary commit, etc.
* Move async execute to internal, add more tests.
* Add a 30s test timeout
* Update API doc
2018-04-04 09:52:49 +01:00
7ec65901b6
Corda-1286 Fix embedded shell when rpc users from remoted database ( #2910 )
2018-04-03 19:13:41 +01:00
e9d2963912
Measure Action execution times, utilised flow threads
2018-04-03 18:54:48 +01:00
1f5559e3c4
Speed-up NodeRegistrationTest ( #2873 )
...
* Improve logging for NetworkMap requests
* Allow interrupt in polling if the process started successfully
* Put `advertiseNewParameters` back
* Additional log line to indicate when all the nodes are started
* Improve logging and use concurrent map since it is updated from multiple threads
* Change NetworkMap response validity duration and rename parameter accordingly
* Changes following code review from @shamsasari
2018-04-03 17:33:42 +01:00
65ff214130
CORDA-1276: Cleaned up creation of node-info object on node start and when using --just-generate-node-info ( #2909 )
2018-04-03 17:30:53 +01:00
fbafe36643
Merge commit '2f1b8ff23e5a0400f72ff603da10b849604c6b04' into aslemmer-merge-2f1b8ff23e5a0400f72ff603da10b849604c6b04
2018-04-03 17:10:33 +01:00
ef723b1b68
CORDA-1295: Use ConcurrentHashMap instead of synchronised multimap
2018-04-03 12:06:59 +01:00
6d5e08b44e
CORDA-1295: Clean up client->observable association on observable finish
2018-04-03 11:43:17 +01:00
10e97f4919
Remove logback SLF4J backend from node tests. ( #659 )
...
* Remove logback SLF4J backend from node tests.
* Use netty_version build variable.
2018-03-30 23:52:53 +01:00
558f5cddce
Porting change to make JPA entities non-final and serializable.
2018-03-29 13:17:22 +01:00
89ecfb96c5
Merge remote-tracking branch 'remotes/open/master' into merges/march-29-13-11
2018-03-29 13:12:00 +01:00
0d1d7daedc
[CORDA-1264]: Ensure correct serialisation and masking for throwables raised by a node and propagated through RPC. ( #2892 )
2018-03-29 13:01:41 +01:00
ed9a31522b
Merge remote-tracking branch 'open/master' into ags_2018-03-29
2018-03-29 09:22:10 +01:00
2863f8403b
CORDA-1277 Remove double quotes from keys in reference.conf
...
CORDA-1277 Remove double quotes from keys in reference.conf
2018-03-29 09:15:30 +01:00
71baccf167
Merge remote-tracking branch 'open/master' into os-merge-d2b7f8b
2018-03-28 17:06:15 +01:00
d2b7f8b91f
ENT-1686: Improve error message on parameters mismatch ( #2891 )
...
Improve error message on parameters mismatch
2018-03-28 16:48:56 +01:00
43ead64240
updating docs
2018-03-28 15:54:58 +01:00
2e4b223bd8
ENT-1668: Don't crash on node startup when network map is not available ( #2887 )
...
Fix ENT-1668
Don't crash on node startup when network map is not available
2018-03-28 15:42:39 +01:00
51567e944d
detect quotes in config keys
2018-03-28 15:23:12 +01:00
768dd32417
ENT-1663 - Inclusion of the cert path and root cert in the exception message when cert path validation fails. ( #2890 )
...
Also, added check to node startup that --initial-registration cannot occur in devMode
2018-03-28 15:18:50 +01:00
447b41d936
MySQL notary service: improve database failover and exception handling.
...
Transactions are now retried if a communication failure occurs during execute() or commit().
Note that this may result in duplicate entries in the notary request log, and false state
commit conflicts (the notary client would still receive a successful response).
We need to tidy this up in the future.
2018-03-28 14:46:27 +01:00
e60b816b19
double quotes in reference conf confuse people
2018-03-28 14:28:55 +01:00
1baa89e9cb
Merge pull request #630 from corda/kat-merge-28-03-18
...
Kat merge 28/03/18
2018-03-28 13:50:17 +01:00
7370e6272e
Add support for database integration tests for DrainingMode tests ( #607 )
2018-03-28 12:49:09 +01:00
4558651b58
ENT-1716 Documentation for hot cold ha ( #628 )
2018-03-28 11:44:07 +01:00
b93f12d413
Finished porting change to make JPA entities non-final and serializable.
2018-03-28 10:58:41 +01:00
bc3605e8da
Merge remote-tracking branch 'open/master' into kat-merge-28-03-18
2018-03-28 09:47:49 +01:00
36f02ff4b4
[CORDA-1267]: Making Corda's JPA classes non-final and Serializable. ( #2882 )
...
* Making Corda's JPA classes non-final and Serializable.
* Making Corda's JPA classes non-final and Serializable.
* Making Corda's JPA classes non-final and Serializable.
* Making Corda's JPA classes non-final and Serializable.
2018-03-28 08:40:28 +01:00
94557c7b88
Merge remote-tracking branch 'remotes/opensource/master' into merges/drainingmode-integration-tests-27-03-2018 - fix compilation error
...
# Conflicts:
# node/src/integration-test/kotlin/net/corda/node/modes/draining/P2PFlowsDrainingModeTest.kt
2018-03-27 15:04:35 +01:00
097233478a
Merge remote-tracking branch 'remotes/opensource/master' into merges/drainingmode-integration-tests-27-03-2018
...
# Conflicts:
# node/src/integration-test/kotlin/net/corda/node/modes/draining/P2PFlowsDrainingModeTest.kt
2018-03-27 14:11:36 +01:00
4269e4a02e
DrainingMode integration tests - explicit node names, changed column names of a test table. ( #2879 )
...
Align DrainingMode integration tests (related to CORDA-1243) with Enterprise repo.
2018-03-27 14:00:28 +01:00
f6e14b8d4d
Distributed notary setup fixes ( #606 )
...
* MySQL notary is clustered notary
* Fix registration tool app class
* Allow config file without parent
* Fix `MySQLNotaryServiceTest`
2018-03-27 13:03:46 +01:00
23e4f4cb6f
Fix merge conflicts
2018-03-26 15:52:00 +01:00
7dbceaadcb
Merge remote-tracking branch 'open/master'
...
# Conflicts:
# node/src/main/kotlin/net/corda/node/services/events/NodeSchedulerService.kt
# node/src/test/kotlin/net/corda/node/services/events/NodeSchedulerServiceTest.kt
2018-03-26 15:46:26 +01:00
329fa94a09
CORDA-1002 Add node scheduler persistence tests ( #2860 )
...
* Add node scheduler persistence tests
* Kill the scheduler threads after node scheduler tests
* Address review comments
2018-03-26 14:48:58 +01:00
a01c9b41e1
Merge remote-tracking branch 'open/master' into merge/tudor-26-03
...
# Conflicts:
# testing/node-driver/src/main/kotlin/net/corda/testing/driver/Driver.kt
2018-03-26 14:07:28 +01:00
