Michal Kit
c4df6b0c85
Fixing CRR signing execution mode ( #677 )
...
* Fixing CRR signing execution mode
* Addressing review comments
2018-04-06 17:00:47 +01:00
Anthony Keenan
ed7e9e64cf
Merge pull request #697 from corda/anthony-os-merge-20180406
...
OS Merge 20180406
2018-04-06 13:30:56 +01:00
Anthony Keenan
f798c58c36
Merge remote-tracking branch 'open/master' into anthony-os-merge-20180406
...
# Conflicts:
# testing/node-driver/src/main/kotlin/net/corda/testing/node/MockServices.kt
2018-04-06 11:43:34 +01:00
Anthony Keenan
2999f0eba2
Merge branch 'ak' into anthony-os-merge-20180406
...
# Conflicts:
# docs/source/api-persistence.rst
2018-04-06 11:01:34 +01:00
Viktor Kolomeyko
31e773876c
Merge pull request #696 from corda/feature/vkolomeyko/os-merge
...
OS->Ent merge
2018-04-06 10:40:43 +01:00
Rick Parker
130b1d9325
CORDA-1303 Regression: Recording a duplicate transaction attempts sec… ( #2935 )
...
* CORDA-1303 Regression: Recording a duplicate transaction attempts second insert to vault.
Added unit test, and merged mock and real logic.
2018-04-06 10:28:51 +01:00
Anthony Keenan
ec09188559
[CORDA-1292] Add CordaService testing documentation and improve tests in irs-demo ( #2929 )
...
* Add CordaService testing documentation and improve tests in irs-demo
* Addressed review comments
2018-04-06 09:22:58 +01:00
Viktor Kolomeyko
df6c6b99cd
Merge remote-tracking branch 'open/master' into feature/vkolomeyko/os-merge
...
# Conflicts:
# samples/irs-demo/src/integration-test/kotlin/net/corda/test/spring/SpringDriver.kt
2018-04-06 09:19:34 +01:00
Shams Asari
fb4f99d590
Merge pull request #693 from corda/os-merge-1b37cef
...
O/S merge from 1b37cef
2018-04-06 08:59:10 +01:00
Viktor Kolomeyko
d5317e074c
Remove errorLogPath parameter which is not used anyway. ( #2934 )
...
StdErr is always written to working directory if such path specified.
2018-04-05 18:10:47 +01:00
Shams Asari
a97abbc8c0
Merge remote-tracking branch 'open/master' into os-merge-1b37cef
2018-04-05 17:23:03 +01:00
Shams Asari
1b37cef822
Minor: use of ByteArray.inputStream() and introduced PublicKey.hash ( #2931 )
2018-04-05 17:18:27 +01:00
Michal Kit
c8b58a601f
Adding CRL support in the generated certificates. ( #2932 )
2018-04-05 16:39:41 +01:00
Viktor Kolomeyko
b5324b0b2d
Merge pull request #690 from corda/feature/vkolomeyko/ent-master-merge
...
OS->Ent merge
2018-04-05 15:43:41 +01:00
Shams Asari
53a0aae489
Introduced a few helper methods around InputStream.readBytes ( #2928 )
2018-04-05 14:27:42 +01:00
Michal Kit
84398362ab
ENT-1626 Validating cert path on node info submission ( #650 )
...
* Validating cert path on node info submission
* Addressing review comments
* Refactoring user exceptions
* Changing response message.
2018-04-05 14:21:54 +01:00
Viktor Kolomeyko
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
szymonsztuka
2543bb356e
Merge pull request #689 from corda/merges/os-merge-22391c2-attempt2
...
Merges/os merge 22391c2#686 ) didn't carry commits from OS
2018-04-05 12:44:01 +01:00
Michele Sollecito
54db391e3c
[CORDA-1294]: Fix corda-shell publication. ( #2926 )
2018-04-05 11:53:12 +01:00
Michal Kit
71fa61020e
Adding a unit test for SignedNodeInfo verification ( #2925 )
2018-04-05 11:25:41 +01:00
szymonsztuka
76c1b08b27
Merge remote-tracking branch 'remotes/open/master' attempt 2
2018-04-05 11:18:01 +01:00
Viktor Kolomeyko
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
Joel Dudley
e5b54a07c4
Adds a missing import.
2018-04-05 09:15:05 +01:00
szymonsztuka
c1065c557f
Add support of db integration tests for tests introduced by CORDA-1264. ( #674 )
2018-04-04 22:39:15 +01:00
szymonsztuka
3aeb35d940
Merge pull request #686 from corda/merges/os-merge-22391c2
2018-04-04 20:16:34 +01:00
szymonsztuka
ad5ceedbd9
Merge remote-tracking branch 'remotes/open/master'
...
# Conflicts:
# docs/source/changelog.rst
2018-04-04 18:01:35 +01:00
Shams Asari
4c123643ac
Merge pull request #680 from corda/shams-os-merge-0af42bd
...
O/S merge from 0af42bd
2018-04-04 17:38:18 +01:00
szymonsztuka
22391c21c5
Change log and upgrade notes for Shell changes in CORDA-792. ( #2919 )
2018-04-04 15:59:05 +01:00
Rick Parker
23184b7495
ENT-1729 P2P message de-duplication performance optimisation has a flaw ( #675 )
2018-04-04 15:49:00 +01:00
Joel Dudley
6572939e6e
Link to X509Utils. Makes it clear they are only an example.
2018-04-04 15:45:49 +01:00
Shams Asari
adac476dba
Merge remote-tracking branch 'origin/master' into shams-os-merge-0af42bd
2018-04-04 14:52:59 +01:00
Shams Asari
7296369541
Merge fixes
2018-04-04 14:52:24 +01:00
szymonsztuka
c998968e58
Update RpcExceptionHandlingTest tests introduced by CORDA-1264 ( #2916 )
2018-04-04 14:35:51 +01:00
Michal Kit
6c2cfc3880
ENT-1732 Preventing non-notaries composite keys being submitted in node info ( #676 )
...
* Preventing non-notaries composite keys being submitted in node info
* Addressing review comments
2018-04-04 14:33:40 +01:00
Shams Asari
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
Andras Slemmer
4334d38bf5
Merge pull request #672 from corda/aslemmer-merge-2f1b8ff23e5a0400f72ff603da10b849604c6b04
...
Merge OS up to 2f1b8ff23e
2018-04-04 12:07:07 +01:00
Matthew Nesbit
0af42bda44
Fix a bug in the AMQP protocol wrapper code which gives incorrect reply address information on received packets. ( #2914 )
2018-04-04 11:23:09 +01:00
Andrius Dagys
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
Andras Slemmer
ff3d497d15
Merge pull request #447 from corda/aslemmer-more-flow-metrics
...
Measure Action execution times, utilised flow threads
2018-04-04 09:47:53 +01:00
Matthew Nesbit
91e556c793
Merge pull request #668 from corda/mnesbit-bridgeperf-env
...
Add jmeter files required for testing bridge environment.
2018-04-04 09:21:43 +01:00
szymonsztuka
7ec65901b6
Corda-1286 Fix embedded shell when rpc users from remoted database ( #2910 )
2018-04-03 19:13:41 +01:00
Andras Slemmer
e9d2963912
Measure Action execution times, utilised flow threads
2018-04-03 18:54:48 +01:00
Joel Dudley
7deb802547
Adds link from changelog to upgrade notes.
2018-04-03 18:03:07 +01:00
Viktor Kolomeyko
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
Shams Asari
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
Andras Slemmer
fbafe36643
Merge commit '2f1b8ff23e5a0400f72ff603da10b849604c6b04' into aslemmer-merge-2f1b8ff23e5a0400f72ff603da10b849604c6b04
2018-04-03 17:10:33 +01:00
Matthew Nesbit
689aeac0e5
Add jmeter files required for testing bridge environment.
2018-04-03 17:08:35 +01:00
Michal Kit
6593560655
Adding revocation reasons to docs. ( #670 )
2018-04-03 16:59:40 +01:00
Chris Rankin
626ff5ec77
Merge pull request #669 from corda/chrisr3-merge-os
...
ENT-1463: Instantiate all contract classes before verifying any of them.
2018-04-03 16:34:48 +01:00
Michal Kit
2f1b8ff23e
Fixing SignedNodeInfoe security issue ( #2908 )
2018-04-03 15:49:06 +01:00
