Commit Graph

8400 Commits

Author SHA1 Message Date
Matthew Nesbit
c65a5cb089
Merge pull request #6030 from corda/chrisr3-44-merge
Merge from OS 4.4 up to bc410b4.
2020-03-06 09:50:39 +00:00
Stefano Franz
c3a59f5293
EG-464 Corda returns incorrect exit code in case if node is started with unknown/missing option (#6010)
* EG-464

Corda returns incorrect exit code in case if node is started with unknown/missing option

* fixed empty else block

* We should not use the parent's exception handler as it will quit and we have our own one

* SampleCordaCliWrapper implemented and tests to verify error handling.

* addressing code review comments
2020-03-05 15:38:56 +00:00
Chris Rankin
2911548a2e Restore Node's missing dependency on jansi. 2020-03-04 20:56:17 +00:00
Matthew Nesbit
9a406839fa
ENT-4494 split nodeapi tests (#6024)
* Split out node-api tests that require test-utils/node-driver

* Add node-api test artefacts to publication list.

* Make test-common a transient dependency - downstream tests assume that it's available.

* Switch dependencies to java-library

* Fix magic package name for cordapp scanning in test
2020-03-04 17:59:15 +00:00
Chris Rankin
e611064c9e Fix compilation error due to rigorousMock moving into coretesting. 2020-03-04 17:23:41 +00:00
Joseph Zuniga-Daly
e639091626
Delete extra characters at end of key-concepts-ledger.rst (#6028) 2020-03-04 16:40:01 +00:00
Chris Rankin
ffa2caed32 Merge branch 'release/os/4.4' into chrisr3-44-merge 2020-03-04 16:27:44 +00:00
Chris Rankin
bc410b4c99
CORDA-3377: Upgrade to DJVM 1.0-RC10. (#6021) 2020-03-04 16:18:59 +00:00
Andrei Palade
ba68970549
Updated error message to provide consistent logging (#6015) 2020-03-04 11:43:05 +00:00
Chris Rankin
e006b871c8
CORDA-3644: Scan the CorDapp classloader directly for SerializationWhitelist. (#6014)
* CORDA-3644: Scan the CorDapp classloader directly for SerializationWhitelist.

* CORDA-3644: Filter CorDapps from out-of-process node classpaths by their manifest attributes. Also exclude directories and blatant test artifacts.

* Fix IRS Demo - its "tests" artifact had a non-standard classifier of "test".
2020-03-04 10:09:40 +00:00
Stefano Franz
20c5040826
add ability to exit after config generation as is described in the docs (#6023) 2020-03-04 09:52:19 +00:00
Christian Sailer
e38cd9ec63
ENT-5043 separate out test utils (#5998)
* Remove unused dependencies from test-common

* Explicit imports and formatting

* Add core-test-utils project

* Add dependency

* Move Kryo serialization context to node-api (not serialization as we do not want to pull kryo into the serialization lib)

* Move AMQP server serialization scheme to node api

* Move serialization tests to node-api

* Move internal test helpers without further dependencies.

* Move out some types from RPCClientProxyHandler to node-api in preparation for moving the AMQP scheme

* Move client AMQP context to node-api so we can move the test serialization rule out.

* Move InternalSerializationTestHelpers to core-test-utils

* Moved testing.core to core-test-utils

* Make detekt happy

* Add api-scanner to core-test-utils

* Remove inlined package names introduced by IntelliJ refactoring

* Update api-current.txt to account for reordering.

* Add core-test-utils to list of published artifacts.

* Add missing import

* Location of things in api text has moved again (publish name of artefact?)

* Revert all additions to the API, leaving just the reordering

* Code review: fix up core-test-utils build.gradle and introduce kryo version constant.

* Remove OpenSsl flag from ssl config stub (can't be used from node-api)

* Suppress detekt warning

* Move core test util tests to the right module

* Expose kotlin test as a transient dependency - projects have come to rely on that.

* Fix typo in package name
2020-03-03 15:55:17 +00:00
Chris Rankin
fec2ef2fd3
CORDA-3638: Allow CordaFuture to complete even if an Error is thrown. (#5994)
* Allow CordaFuture to complete even if an Error is thrown.

* Allow CordaFuture.flatMap() to notify for failures due to Error.
2020-03-03 15:01:12 +00:00
Adel El-Beik
b86ae0d6a6
Web server fails to connect to node if node takes too long to startup (#6012)
* CORDA-3557: The web server attempts to reconnect to the client for a minute if initial attempt fails.

* CORDA-3557: Fixing detekt issues
2020-03-03 12:10:04 +00:00
Razvan Codreanu
bd197b5229
TM-204 Modifying regression builds to prevent bad dependency graphs (#6013)
* TM-204 attempting to fix regression builds

* TM-204 attempting to fix regression builds

* TM-204 reverting spring boot version and only removing missing dependency

* TM-204 reverting to original build.gradle

* TM-204 re applying dependency

* TM-204 consolidating dependencies

* TM-204 setting spring boot dependency

* TM-204 reverting and upgrading dependency management plugin version in parent gradle file

* TM-204 apply dependency plugin differently

* TM-204 new gradle files

* TM-204 try and fix corda rpc evaluation

* TM-204 try and fix corda rpc evaluation

* TM-204 separate slow integration and smoke test

* TM-204 modifying regression builds to separate slow integration tests and smoke tests as they sometimes result in a bad gradle dependency graph

* TM-204 separating slow integration tests from the rest

* TM-204 change to allow ci03 to run this jenkinsfile

* TM-204 switching to aks label to allow testing on ci03

* TM-204 now that test was successful, switching back to correct prod label
2020-03-03 11:16:37 +00:00
Ramzi El-Yafi
cd6098fd4f
Flag finance library as not for production use in documentation (#6011) 2020-03-03 08:42:10 +00:00
Razvan Codreanu
30167fd2e8
TM-204 Fixing regression builds (#6009)
* TM-204 attempting to fix regression builds

* TM-204 attempting to fix regression builds

* TM-204 reverting spring boot version and only removing missing dependency

* TM-204 reverting to original build.gradle

* TM-204 re applying dependency

* TM-204 consolidating dependencies

* TM-204 setting spring boot dependency

* TM-204 reverting and upgrading dependency management plugin version in parent gradle file

* TM-204 apply dependency plugin differently

* TM-204 new gradle files

* TM-204 try and fix corda rpc evaluation

* TM-204 try and fix corda rpc evaluation

* TM-204 separate slow integration and smoke test
2020-03-02 14:50:01 +00:00
jakubbielawa
da3adb40b4
ENT-5039 Improved help text for commands (#6006)
* Improved help text for commands

* Address feedback
2020-03-02 11:14:55 +00:00
Andrei Palade
f6c30453a2
EG-71 - Changed the default file limit in the log4j2 configuration (#5996)
* Changed the default file limit in the log4j2 configuration to address roll over issue described in EG-71

* Updated the default file limit in the comment
2020-03-02 09:26:46 +00:00
pnemeth
d037dc0d06
EG-466 - Fix bug: (#5999)
'shutdown' command is repeated twice in the list of available shell commands.
2020-02-28 12:16:53 +00:00
Joel Dudley
1bf311ce4f
Removes use of notaries.first. (#6008) 2020-02-27 13:27:38 +00:00
nargas-ritu
ae17669892
Merge pull request #5966 from corda/vcamp/os_release_notes_4.4
DOCS: release notes - Corda 4.4
2020-02-27 12:56:50 +00:00
Denis Rekalov
14c73d5f95
Merge pull request #6003 from corda/denis/ENT-4990-amqp-disconnect
ENT-4990: Proper AMQP disconnect handling when remote session was not opened
2020-02-26 11:43:36 +00:00
Denis Rekalov
0af88365a1 ENT-4990: Proper AMQP disconnect handling when remote session was not opened 2020-02-26 10:48:26 +00:00
Denis Rekalov
054563e40c ENT-4990: Port AMQP state machine logging and stability fixes from Enterprise to OS 2020-02-26 10:38:08 +00:00
Walter Oggioni
92a437f333
EG-69 - fixed bug with picocli that was causing uncaught exception's stacktrace to always be printed on stderr (#5985)
calling `picocli.CommandLine.AbstractHandler#andExit` causes the exception handler to forcefully terminate the program execution (calling `java.lang.System#exit`) at all costs, even in case of `ExecutionException` being throw by `picocli.CommandLine#parseWithHandlers(picocli.CommandLine.IParseResultHandler2<R>, picocli.CommandLine.IExceptionHandler2<R>, java.lang.String...)`, this was causing the program to always print the exception stack trace on the `stderr` and terminating even before entering the `catch` block from lines 85 to 93
2020-02-26 09:49:14 +00:00
amosmwsmith
4ea74a45b5
ENT-5018: Updated documentation for RPC Settings address field based on client … (#5991)
* Updated documentation for RPC Settings address field based on client feedback explain implications of specifying 0.0.0.0 as host.

* Further updates to p2pAddress and messagingServerAddress sections of node settings.

* Further updates to additionalP2pAddresses and explaining localhost vs loopback address implications.

* Correct messagingServerAddress and amend adminAddress section.
2020-02-25 17:28:04 +00:00
Viktor Kolomeyko
275e801094
ENT-4955: Hide usage of FlowHospital inside StateMachineManager (#5997) 2020-02-25 14:10:59 +00:00
Adel El-Beik
fe625d0f37
CORDA-3584: Now cope with 2 contract jars with same hash but different name (#5952)
* CORDA-3484: Now cope with 2 contract jars with same hash but different name, we just select one and use that.

* ENT-3584: Contract jars are now generated on the fly.

* CORDA-3584: Reverted changes to CordappProviderImpl. Exception is raised if node started with multiple jars with same hash.

* ENT-3584: Fixing test failure.

* CORDA-3584: Switch to test extension method instead of reflection to access internal member.

* ENT-3584: Address review comment. Dont fully qualify exception.

* CORDA-3584: Address review comment and converted lazy to a resettable one.

* CORDA-3584: Removed unused logger.

* CORDA-3584: Fixed visibility.

* CORDA-3584: Removed synchronized

* CORDA-3584: Removed CordappResolver

* CORDA-3584: Reverted change in gradle file and fixed test.

* CORDA-3584: Removed V3 from test description as it wasn't actually V3 specific.

* CORDA-3584: Address review comment. Let classes be garbage collected.
2020-02-25 11:18:01 +00:00
Chris Rankin
d2568b9077
NOTICK: Fix potential infinite loop when a SecurityManager is installed. (#5993) 2020-02-24 09:36:16 +00:00
Kyriakos Tharrouniatis
2c9c2985c0
CORDA-3381: Errors in vault updates publisher are unsubscribing stopping observers from working (#5912)
* Throw SQLException or PersistenceException plain, that may come out of an unsafe subscriber

* Add explanatory comment about why we changed Observer.tee to use unsafe subscribe

* Introducing not unsubscribing version of Rx.Subscriber

* Wrap PublishSubjects with FlowSafeSubjects in all tests that test Observer.tee

* Minor code formatting

* Make rawUpdates Rx.Observers not unsubscribe when accessed from CordaServices - Do not allow rawUpdates subscribing from flows

* Warning fix: Add else block to when statement

* Revert "Wrap PublishSubjects with FlowSafeSubjects in all tests that test Observer.tee"

This reverts commit e419af86

* Correcting log message

* Improve log message

* Add fiber's id to log message and exception message

* Added test, asserting FlowSafeSubscriber is alive and re-accessed upon flow retry

* Logging flow name instead of flow id at VaultService.rawUpdates subscribing error

* Add kdoc to OnNextFailedException

* Minor text correction

* Update kdocs of FlowSafeSubject/ PreventSubscriptionsSubject

* Moved FlowSafeSubject under package node.internal as it is only used by NodeVaultService

* Add comment and update kdoc explaining how to subscribe with SafeSubscriber to FlowSafeSubject

* Change PreventSubscriptionsSubject#errorAction to be more specific; to return an Exception

* Minor text update

* Update messy comment

* Replace assertThat with assertEquals

* Splitting heartBeat to heartBeat1 and hearBeat2 for more clear asserting

* Correcting comment

* Update messy comment

* Splitting heartBeat into heartBeatOnNext and heartBeatOnError

* Update test name

* Add explanatory comment to test

* Update test name

* Update test and add test comment

* Moving NotarisedTxs from SendStateFlow to VaultObserverExceptionTest inside NodeHandle.getNotarisedTransactionIds

* Moving SubscribingRawUpdatesFlow from ErrorHandling to VaultObserverExceptionTest

* Update kdoc of FlowSafeSubscriber and FlowSafeSubscriber.onNext

* Make kdoc more clear

* Throw exception upon accessing VaultService.rawUpdates from within a flow

* Changing exception thrown when accessing VaultService.rawUpdates from within a flow to a CordaRuntimeException

* Minor kdoc update

* Update test comment

* Update kdoc of FlowSafeSubscriber

* Introducing Observable.flowSafeSubscribe public API method to subscribe with -non unsubscribing- Rx.Subscribers to Observables. It also replaced FlowSafeSubject

* Move CustomSafeSubscriber outside test methods

* Minor text update

* Add timeout to tests

* Update kdoc of flowSafeSubscribe

* Update kdoc of flowSafeSubscribe

* Update kdoc of flowSafeSubscribe

* Move FlowSafeSubscriber and flowSafeSubscribe under their own package

* Fix detekt issue

* Update Detekt baseline

* Revert "Update Detekt baseline"

This reverts commit 793a8ed9

* Fix Detekt issue

* Moved strictMode flag from flowSafeSubscribe to OnFlowSafeSubscribe

Moved OnFlowSafeSubscribe into internal package

Integration tested flowSafeLooseSubscribe

* Suppress Rx Deprecation

* Rename flowSafeSubscribe to flowSafeObservable

* Renaming flowSafeObservable to continueOnError and FlowSafeSubscriber to ResilientSubscriber
2020-02-21 10:02:34 +00:00
Chris Rankin
b3ca720412
NOTICK: Fix more Gradle technical debt. (#5989)
* NOTICK: Use Gradle's "lazy" task API.

* Make Java8 vs Java11 check consisent.
2020-02-20 17:01:24 +00:00
Matthew Nesbit
49b2f10cdf
Merge pull request #5988 from corda/chrisr3-driver-shutdown
NOTICK: Tidy up driver shutdown so that resources are always released on error.
2020-02-20 14:34:26 +00:00
Matthew Nesbit
9dec5aac4b
Merge pull request #5935 from corda/denis/ENT-4926-node-identity-docs
ENT-4915, ENT-4926, CORDA-3585: Update docs for X500 name and SSH hostkey
2020-02-20 11:11:46 +00:00
Chris Rankin
e9c2af661d NOTICK: Tidy up driver shutdown so that resources are always released on error. 2020-02-19 16:45:41 +00:00
Matthew Nesbit
28cb9e6cf4
Merge pull request #5987 from corda/chrisr3-44-merge
Merge from OS 4.4 up to 88008b.
2020-02-19 16:44:38 +00:00
Chris Rankin
4c6f15c40c Merge commit '88008b71f03a539749e32e5e76b2dc5ea98f897f' into chrisr3-44-merge 2020-02-19 14:12:10 +00:00
Matthew Nesbit
88008b71f0
Merge pull request #5984 from corda/rfowler-os4.3-0s4.4-20200218
Rfowler os4.3 0s4.4 20200218
2020-02-19 13:53:14 +00:00
Matthew Nesbit
86a4b998d5
Merge pull request #5928 from corda/chrisr3-inprocess-whitelists
CORDA-3566: Always add TestCordapps to the classpath when building _driverSerializationEnv.
2020-02-19 13:52:34 +00:00
Chris Rankin
afcab51fe3 Update "in-process" test on basis it can be made to work. 2020-02-19 10:42:44 +00:00
Chris Rankin
d89ce6608a Create a unit test for serialization whitelists via driver. 2020-02-19 10:42:34 +00:00
Valerio Campanella
3eb88bca7d OS 4.4 release notes: added pargraph on bonus AppServiceHub call, revised section title, removed deprecations section 2020-02-18 17:37:41 +00:00
Matthew Nesbit
d6747ddcd6
Merge pull request #5981 from corda/chrisr3-44-merge
Merge from OS 4.4 up to ae478cc8
2020-02-18 16:21:07 +00:00
Ryan Fowler
6ec314fade Merge remote-tracking branch 'origin/release/os/4.3' into rfowler-os4.3-0s4.4-20200218
# Conflicts:
#	.ci/dev/integration/Jenkinsfile
#	.ci/dev/unit/Jenkinsfile
#	Jenkinsfile
#	build.gradle
#	create-jdk8u/build.gradle
#	docs/source/corda-network/UAT.md
#	docs/source/network-builder.rst
#	node/src/integration-test-slow/kotlin/net/corda/node/services/distributed/DistributedServiceTests.kt
2020-02-18 15:48:58 +00:00
nargas-ritu
dc92786d17
Merge pull request #5974 from corda/CORDA-3593-shell-exits-after-shutdown-cmd
CORDA-3593: exit the InteractiveShell on shutdown command
2020-02-18 11:10:54 +00:00
Chris Rankin
9fc6a203e0 Merge commit 'ae478cc8ad30d086e6748ba5f35433202d74aeba' into chrisr3-44-merge 2020-02-18 09:25:42 +00:00
Chris Rankin
ae478cc8ad
NOTICK: Add missing test for deserializing Duration for DJVM. (#5971) 2020-02-18 09:13:50 +00:00
Chris Rankin
20d1037610
NOTICK: Update Gradle scripts for deterministic modules. (#5978) 2020-02-18 09:12:19 +00:00
Chris Rankin
17f5bfc53b
Remove Schedulable states from core-deterministic. (#5975) 2020-02-18 09:10:19 +00:00
Chris Rankin
396a579c8b
NOTICK: Always use configured version of deterministic-rt.jar. (#5979) 2020-02-18 09:09:18 +00:00