Commit Graph

8714 Commits

Author SHA1 Message Date
LankyDan
d9c1907c88 Merge branch 'release/os/4.4' into dan/os-4.4-to-4.5-merge-2020-03-26 2020-03-26 14:26:41 +00:00
Rick Parker
a5d49ea111
Merge pull request #6104 from corda/jzd/merge-os4.3-into-os4.4-2020-03-26
[NOTICK] - Merge OS 4.3 into OS 4.4 (2020-03-26)
2020-03-26 14:21:00 +00:00
Joseph Zuniga-Daly
b766eff284 Merge remote-tracking branch 'origin/release/os/4.3' into jzd/merge-os4.3-into-os4.4-2020-03-26 2020-03-26 11:01:39 +00:00
Denis Rekalov
f1c14edd00
Merge pull request #6100 from corda/denis/ENT-4659-remove-crypto-service-factory
ENT-4659: Remove CryptoServiceFactory from OS
2020-03-26 10:54:24 +00:00
Rick Parker
d77c524381
Merge pull request #6103 from corda/dan/backport-corda-3677
Backport CORDA-3677
2020-03-26 10:48:28 +00:00
Kyriakos Tharrouniatis
f6952963a8 CORDA-3677 FlowExternalOperation serialising reference to FlowLogic (#6094)
* Stop capturing 'FlowLogic' references in flowAsyncOperation;

Creating concrete classes removes the implicit reference to FlowLogic (as this) being included in the anonymous object

* Modify test code so that lambdas no longer get implicit references to their enclosing 'FlowLogic'
2020-03-26 10:00:57 +00:00
Kyriakos Tharrouniatis
caf152f175
CORDA-3677 FlowExternalOperation serialising reference to FlowLogic (#6094)
* Stop capturing 'FlowLogic' references in flowAsyncOperation;

Creating concrete classes removes the implicit reference to FlowLogic (as this) being included in the anonymous object

* Modify test code so that lambdas no longer get implicit references to their enclosing 'FlowLogic'
2020-03-26 09:23:38 +00:00
Denis Rekalov
b1180b467b ENT-4659: Remove CryptoServiceFactory from OS 2020-03-25 12:56:33 +00:00
Joseph Zuniga-Daly
2dbf90cafe
ENT-4857: Fix race condition in trackTransaction (#6096)
- Fix issue
- Emit warning if we are inside a DB transaction
- Include a path that does not emit warning
- Add unit tests
2020-03-25 11:53:06 +00:00
Dimos Raptis
b73a498062
[ENT-4754] - Move subflow preparation logic in FlowStateMachine 2020-03-25 09:02:14 +00:00
Ramzi El-Yafi
c697b5850b
[EG-896] Additional uniqueness provider test cases (#6085) 2020-03-24 11:10:27 +00:00
Rick Parker
dbefd62d81
Merge pull request #6090 from corda/dan/os-4.4-to-4.5-merge-2020-03-23
OS 4.4 to 4.5 merge 2020-030-23
2020-03-23 14:38:00 +00:00
LankyDan
82e068be94 Merge branch 'release/os/4.4' into dan/os-4.4-to-4.5-merge-2020-03-23 2020-03-23 11:46:24 +00:00
przemolb
8f54ef740f
Merge pull request #5610 from corda/pb-add-docker-with-debug-tools
Add debug dockerfiles with additional tools useful for investigating …
2020-03-21 23:09:49 +00:00
Dan Newton
668748b054
CORDA-3669 Do not execute ExecuteAsyncOperation multiple times (#6087)
* CORDA-3669 Do not execute `ExecuteAsyncOperation` multiple times

When a `FlowExternalOperation` or `FlowExternalAsyncOperation` executes
and completes a flag (`isFlowResumed`) is switched to true.

This flag was used inside of `DoRemainingWorkTransition` to decide
whether to skip over the execution of an event.

Since this flag was being switched to true when the external operation's
 future completed, it was possible for _unexpected_ events to be placed
in the fiber's queue that would retrigger the
`FlowIORequest.ExecuteAsyncOperation`, that is held as the checkpoint's
next `FlowIORequest`to process.

By using the existing `StateMachineState.isTransactionTracked` (and
renaming it to `isWaitingForFuture`) we can decide to not process the
`FlowIORequest.ExecuteAsyncOperation` if it has already been called
before. This moves this code path in line with
`FlowIORequest.WaitForLedgerCommit`.

Random `DoRemainingWork` events can now be pushed to the fiber's queue
without causing the `FlowIORequest.ExecuteAsyncOperation` to execute
again.
2020-03-20 19:02:34 +00:00
Dimitris Gounaris
62e45c3a14
Bump dependx to 0.1.13 (#6086)
Co-authored-by: Dimitris Gounaris <dimitrisgounaris@20LDN-MAC257.local>
2020-03-20 16:09:57 +00:00
Christian Sailer
82d9995717
ENT-5109 Harmonize config-common, make everything compile again and harmonize NetworkParameterOverridesSpec. (#6082) 2020-03-19 15:43:08 +00:00
Chris Rankin
dd7852f2b8
CORDA-3668: Prevent AttachmentURLConnection from assigning ALL_PERMISSIONS. (#6080)
* CORDA-3668: Prevent AttachmentURLConnection from assigning ALL_PERMISSIONS to classes inside an attachment.

* Strengthen the comment warning about AttachmentURLConnection.getPermission.
2020-03-19 11:20:53 +00:00
Dimos Raptis
56067acd20
[CORDA-3628] - Remove overloads for sendAll (#6078) 2020-03-18 14:37:04 +00:00
Chris Rankin
29a36c6b4f
Prevent Quasar from instrumenting classes that belong to AttachmentsClassLoader. (#6077) 2020-03-18 13:59:10 +00:00
Dan Newton
fb64e47326
NOTICK Increase timeouts in external operation tests (#6076)
* NOTICK Increase timeouts in external operation tests

It seems these tests are timing out when they shouldn't be when running
on the CI servers.

To resolve this, the timeouts of `getOrThrow` calls have been increased
to a minute.

Reliance on timeouts has also been reduced through using locks. This
should speed up tests that don't need to wait for the timeout anymore to
 progress.

* NOTICK Remove hospital checking code

* NOTICK Change locking code
2020-03-18 13:56:51 +00:00
Christian Sailer
f9ccb88fea
ENT-4494 Harmonize Kryo serialalization (#6069)
* Harmonize Kryo serialalization (Custom serializer for iterators/collections)

* Fix package name

* Revert checkpoint compression change.

* Clean imports
2020-03-18 09:37:56 +00:00
Ryan Fowler
349bd5a511
CORDA-3662: Use an INNER JOIN for network map cache queries, (#6062)
- rename add or update function for clarity
- put removal of old nodes after retrieval of new ones to avoid gaps in the map
- plus add a test
2020-03-17 17:02:08 +00:00
Matthew Nesbit
2c10b6c3b9
Merge pull request #6075 from corda/jzd/os4.4-to-os4.5-merge-2020-03-17
OS 4.4 to OS 4.5 merge 2020-03-17
2020-03-17 17:00:59 +00:00
Dimos Raptis
eba113621c
[CORDA-3628] - Avoid sending actions to the state machine if no messages are to be sent (#6074) 2020-03-17 16:51:07 +00:00
Joseph Zuniga-Daly
9b6d2cd979 Merge remote-tracking branch 'origin/release/os/4.4' into jzd/os4.4-to-os4.5-merge-2020-03-17 2020-03-17 14:37:50 +00:00
Dan Newton
861b769499
NOTICK Update release-notes about database transaction limitations (#6052)
* NOTICK Update release-notes about database transaction limitations
2020-03-17 13:55:10 +00:00
Chris Rankin
f476c1581d
CORDA-3377: Upgrade to DJVM 1.0. (#6071) 2020-03-17 08:48:45 +00:00
Joel Dudley
9495efc50c
Updates DJVM docs. (#6043) 2020-03-16 12:27:55 +00:00
Denis Rekalov
80cf34b81a
Merge pull request #6065 from corda/chrisr3-no-location
NOTICK: Prevent learning the location of a Class inside sandbox.
2020-03-16 10:11:38 +00:00
Christian Sailer
ea22a10b3e
ENT-4494 Harmonize network stack (#6059)
* ENT-4494 harmonize proton wrapper with ENT

* Harmonise Artemis and Bridge implementation

* Move tests across

* detekt changes

* Fix AMQP tests in node
2020-03-13 14:26:24 +00:00
Chris Rankin
723399d3a1 NOTICK: Prevent learning the location of a Class inside sandbox. 2020-03-13 08:58:33 +00:00
Dan Newton
3b335ebb00
NOTICK Fix statemachine error handling tests (#6057)
Due to a change in how messaging works, `ActionExecutorImpl
.executeSendInitial` was no longer being called. Changing the byteman
script to throw exception on hits to `ActionExecutorImpl
.executeSendMultiple` allowed the tests to pass.
2020-03-12 12:48:40 +00:00
Razvan Codreanu
8973c5ba96
TM-168 reusable configurations for distributed testing (#6048)
* TM-168 reusable configurations for distributed testing

* TM-168 switching to class

* TM-168 switching to ext properties

* TM-168 large scale set is too aggressive and prone to failure so switching to general purpose
2020-03-12 10:04:22 +00:00
Denis Rekalov
bc5224b97f
Merge pull request #6049 from corda/christians/ENT-4494-crypto-service
ENT-4494 Harmonize CryptoService
2020-03-12 09:48:29 +00:00
Christian Sailer
2680d95546
Merge pull request #6051 from corda/christians/ENT-4494-config
ENT-4494 Harmonize configuration classes.
2020-03-12 09:44:32 +00:00
Stefano Franz
c565d47adc
use proxied gradle to prevent slow lorrising due to too many requests (#6056)
* use proxied gradle to prevent slow lorrising  due to too many requests

* fix typo
2020-03-12 08:15:28 +00:00
VCAMP
d61536c6ff
OS 4.4 release notes: added warning about integration testing changes (#6025)
* OS 4.4 release notes: added warning about integration testing changes

* OS 4.4 release notes: more datail on integration testing changes
2020-03-11 11:56:46 +00:00
Dimitris Gounaris
67e3e09a4e
TM-209: Dependx introduction for test running optimization (#6036)
* Add dependx step to build, in monitor state

* Bump plugin version

* Update plugin version

Co-authored-by: Dimitris Gounaris <dimitrisgounaris@20LDN-MAC257.local>
2020-03-11 10:51:38 +00:00
Christian Sailer
53d92771bb ENT-4494 Harmonize configuration classes. 2020-03-10 14:21:40 +00:00
Christian Sailer
ab6bf315c4 ENT-4494 Harmonize CryptoService interface/base class between OS and ENT, move OS BC implementation to node project. 2020-03-10 12:36:30 +00:00
Christian Sailer
68bb7a0e7b
Merge pull request #6047 from corda/chrisr3-core-testing
CORDA-3644: Add Corda-Testing tag to core-test-utils manifest.
2020-03-10 11:23:51 +00:00
Christian Sailer
ee6d966263
Merge pull request #6046 from corda/jzd/ENT-4334-fix-unit-test
ENT-4334 - Don't stop the node inside the unit test
2020-03-10 10:09:52 +00:00
Chris Rankin
35f7cd349f CORDA-3644: Add Corda-Testing tag to core-test-utils manifest. 2020-03-09 21:26:53 +00:00
Joseph Zuniga-Daly
a18c544de1 Don't stop the node inside the unit test
The test node had not been started and is causing tests to fail.
2020-03-09 17:17:36 +00:00
Dimos Raptis
dcf659e643
[CORDA-3628] - Implement sendAll API (#5990)
* [CORDA-3628] - Implement sendAll API

* detekt

* Some minor refactorings and docs

* Eliminate warnings

* Address Rick's comments

* Switch sendAll to use a set
2020-03-09 17:09:13 +00:00
Denis Rekalov
13e54c1346
Merge pull request #6045 from corda/jzd/CORDA-3394-move-unit-test
CORDA-3394: Move the unit test to the correct location
2020-03-09 16:58:36 +00:00
Joel Dudley
3973fe46f2
Update contributing-philosophy.rst (#6044) 2020-03-09 15:11:53 +00:00
Joseph Zuniga-Daly
b02768aa6e CORDA-3394: Move unit test to correct location 2020-03-09 15:08:40 +00:00
Walter Oggioni
8ea6564cb9
fixed unformatted and hardcoded link (#6035) 2020-03-09 14:05:28 +00:00