Commit Graph

6953 Commits

Author SHA1 Message Date
Shams Asari
60d215aaa8
Fixed incorrect usages of assertFailsWith (#4458)
The overload that takes in a String does NOT check that the exception thrown has that message, which is what these tests are assuming. Rather it's the assertion message when the test fails.
2018-12-24 09:44:48 +00:00
josecoll
6f9f6fd870 CORDA-2366 - Adjust assertions to cater for any ordering of results. (#4455) 2018-12-23 16:53:01 +00:00
Andrius Dagys
6f0bc42098 ENT-2813: Fix uniqueness provider double insertion issue
Fix an issue where a transction id is committed twice if a
reference-only transaction gets re-notarised.

Added more tests.

add fix
2018-12-21 22:29:16 +00:00
James Brown
8e8650e27b CORDA-2365 Update certificate hierarchy diagram (#4451) 2018-12-21 16:53:44 +00:00
Florian Friemel
3ce81b20aa [CORDA-2311] Create a subclass of CordaCaplet for the web server. (#4448)
* Create a subclass of CordaCaplet for the web server to put the cordapp JARs on its class path.

* Revert "[CORDA-2303]: Fix issue with corda-webserver not looking for plugins in cordapp jars (#4390)"

This reverts commit bad7b9b187.

* Revert "Create a subclass of CordaCaplet for the web server to put the cordapp JARs on its class path."

This reverts commit 12f14275c0.

* Create seperate webserver caplet
2018-12-21 14:04:12 +00:00
Mike Hearn
d976278a1c Docs: fix spelling errors. 2018-12-21 12:56:21 +01:00
Mike Hearn
8d15b8aea7 Docs: more work on the upgrade/release notes:
* Address Shams' review comments
* Add some more discussion of app splitting, note the finance jar changes.
2018-12-21 12:56:21 +01:00
Mike Hearn
08564808c0 Docs: add network-builder image and fix a couple of minor issues in make-docsite.sh 2018-12-21 12:56:21 +01:00
Mike Hearn
ec97e1aee3 Docs: address review comments from Jose. 2018-12-21 12:56:21 +01:00
Mike Hearn
f8026e9775 Docs: address review comments from Richard. 2018-12-21 12:56:21 +01:00
Mike Hearn
ee5536da14 Docs: add more info on target/min versioning to the app-upgrade-notes. 2018-12-21 12:56:21 +01:00
Mike Hearn
323effa236 Docs: release notes and improvements to upgrade notes for Corda 4.
Move release/app upgrade notes to the top of the toctree.

Authors: Kat Baker, Jose Coll, Mike Hearn, Tommy Lillehagen.
2018-12-21 12:56:21 +01:00
Shams Asari
e9c3e86e74 StateConsumptionDetails fixed to handle evolution properly (#4450)
The introduction of a non-null property requires the use of DeprecatedConstructorForDeserialization.
2018-12-21 10:43:57 +00:00
Dimos Raptis
8ac32f52f6 CORDA-1839 - Remove race condition between trackBy and notifyAll (#4412)
* CORDA-1839 - Remove race condition between trackBy and notifyAll

* Fix null check

* Improve filtering

* Switch equality test to refs

* Refine filtering of seen updates

* Add entry in the changelog

* Address comments
2018-12-21 09:40:07 +00:00
JamesHR3
39e5dc5749
[CORDA-1828] Documentation update for observer nodes (#4443)
CORDA-1828 Documentation update for observer nodes

* Update observer node documentation

* Added test to catch original issue if seen again
2018-12-21 08:18:14 +00:00
Tudor Malene
3c13c07c09
CORDA-2344 Set contextClassloader on the flow threads. (#4437)
* CORDA-2344 Set contextClassloader on the flow threads.

* CORDA-2344 Set contextClassloader on the flow threads.
2018-12-20 15:04:16 +00:00
Rick Parker
3efbad34cc
ENT-2848 remove need for generated IDs on some frequently used tables (#4446)
* Working version

* api-current.txt change to remove diff due to inheritance hierarchy change.

* api-current.txt change to remove warnings of abstract methods in new interfaces.

* Fix indent
2018-12-20 13:06:21 +00:00
Anthony Keenan
af75a05502
Fix irs-demo dependency issues (#4438)
* Fix irs-demo dependency issues

* Fixed a problem with the IRS demo test JAR.

* Fixed deployNodes problem and log4j info statement.
2018-12-20 12:31:16 +00:00
Shams Asari
830959c9f7
CORDA-2345: Simplified TestCordapp to make it inline with the recent CorDapp versioning changes (#4434)
TestCordapp has now two implementations to clearly separate the two use cases it has in the Corda repo:

* TestCordappImpl which implements the revised public API of TestCordapp; namely that a TestCordapp instance references a real CorDapp jar on the classpath. This is either an external dependency jar in which case it’s taken as is and given to the node, or it’s a local gradle project in which case it’s compiled using the gradle “jar” task to generate the CorDapp jar. This approach means the jar has all the original CorDapp versioning information, which is important that it’s correct when testing. To this end, TestCordapp only needs to expose the ability to specify the app’s config. All the remaining properties have moved to CustomCordapp.

* CustomCordapp for creating arbitrary custom CorDapps, including specifying the jar’s MANIFEST values. This is internal API and only used for testing the platform. Technically this shouldn’t implement TestCordapp but does so to reduce the complexity of the driver and mock network.
2018-12-20 09:49:58 +00:00
szymonsztuka
4aaefb4fe9 CORDA-2331 Split Workflow and contracts of Finance App into separate Cordapps (#4422)
* Split Workflow and contracts of Finance App into separate Cordapps, part 1 - content which is different between OS and ENT is still in contract Cordapp.

* Move CashSelection implementations to workflow module.

* Move CashSelection implmentations to workflow module.

* Move finance module to finance-flows, top level finance module is empty.

* Move finance module to finance-flows, top level finance module is empty.

* Updated build comment.

* Revert publication of combined (contracts and flows) corda-finance.jar (to maintain backwards compatibility with 3rd party cordapps dependent on finance)

* Added backwards compatibility clarification comment.

* Re-instate new cordapp metadata.

* Global rename of `finance-flows` to `finance-workflows` to follow adopted naming conventions.

* Addressed final review comments.

* Rename application to "Corda Finance Demo"

* Generation of original corda-finance jar from new sub-modules.

* Fixed and tested demobench with new split finance contract and workflow jars.

* Renamed finance sub-modules to contracts and workflows.

* Remove Michele!!!

* Minor fix to filtering logic.

* Align CorDapp configuration filename with workflows jar.

* Fix breaks caused by finance module naming changes.

* Final alignment between OS/ENT of finance contract code.
2018-12-19 18:02:51 +00:00
Rick Parker
a4037b374d
ENT-2848 More contract attachment caching to avoid database queries slowing the node down (#4433) 2018-12-19 17:53:48 +00:00
Dominic Fox
9d8618224a
CORDA-2352 Be more lenient with setter property signature validation (#4442) 2018-12-19 17:17:01 +00:00
Florian Friemel
466bff4121
Revert "[CORDA-2330] Turn on lenient mode in rpc serialization context. (#4409)" (#4439)
This reverts commit 58b0cdaef7.
2018-12-19 13:18:36 +00:00
James Brown
91bf149d0c CORDA-2350 update urllib version (#4436) 2018-12-19 07:58:08 +00:00
Matthew Nesbit
36bff744dc
Suppress core.server.lambda$channelActive$0 - AMQ224088 error from load balancer type connections. Note TLS handshake timeouts still occur, but do so silently. (#4432) 2018-12-18 15:58:53 +00:00
Venelin Stoykov
86b0e71f3a Add BelongsToContract for network verifier state (#4431) 2018-12-18 13:22:53 +00:00
Thomas Schroeter
17e7a3ad7c
Remove documentation of building container images with jib (#4430)
This is not inline with the official container image.
2018-12-18 12:27:33 +00:00
Michele Sollecito
5a601de584
[CORDA-2341]: Fixing ABI compatibility for TransactionBuilder vs Corda 3.3. (#4429) 2018-12-18 12:04:18 +00:00
Mike Hearn
43f241cb8b Docs: mention the new no-downgrade rule in the upgrade notes. 2018-12-18 12:48:51 +01:00
Mike Hearn
579b312237 Docs: give the "upgrading cordapps" page a slightly more compact name to improve toctree formatting. 2018-12-18 12:48:51 +01:00
Mike Hearn
d309fae2b4 Docs: demonstrate usage of the contracts/workflows jar split. 2018-12-18 12:48:51 +01:00
Mike Hearn
4f9a4a2c2b Docs: address more review comments, add mention of some new features. 2018-12-18 12:48:51 +01:00
Mike Hearn
fb89ab3151 Address review comment: mention that SwapIdentitiesFlow was adjusted in the same way. 2018-12-18 12:48:51 +01:00
Mike Hearn
cd0fd628e6 Address review comments 2018-12-18 12:48:51 +01:00
Mike Hearn
43e4279250 Docs: improve upgrade notes 2018-12-18 12:48:51 +01:00
Mike Hearn
d5169304cd Docs: add min/target version design doc to the toctree. Refresh versioning doc page. 2018-12-18 12:48:51 +01:00
Mike Hearn
d108517099 Docs: move the versioning page to the building a cordapp section, as it's more relevant to app devs than network operators. 2018-12-18 12:48:51 +01:00
Christian Sailer
e8a467cab8
CORDA-2304 Never give up on notarisations (#4420)
* Make TimedFlows retry forever, and cap the growth of the time out interval.

* Only time flows for restart if that is sensible (i.e. notary flows that actually have an alternative node to talk to).

* Move check for multi node notary into getter so it the `canBeRestarted` attribute can't be set too late.

* Make restartable timed flow a concept on SubFlow metadata and the relevant events so we can handle it properly for subflows based on their metadata.

* Addressing review comments.

* Consistent naming

* Update documentation

* Addressing documentation comments.
2018-12-18 09:18:12 +00:00
Christian Sailer
e70670368c
CORDA-2301 JVM args documentation (#4417)
* Document the ways and behaviours of setting JVM args on a corda node process.

* Small review fixes

* Clarification, removing outdated jvmArgs documentation
2018-12-17 16:43:22 +00:00
Matthew Nesbit
5cf64e5c23
Document the messagingServerExternal property on the OS node. (#4428) 2018-12-17 16:09:44 +00:00
Florian Friemel
58b0cdaef7
[CORDA-2330] Turn on lenient mode in rpc serialization context. (#4409) 2018-12-17 15:33:25 +00:00
Rick Parker
20e5bbf56f
ENT-2848 Add caching to contract attachment versions (#4410)
* Refactor into attachment service

Fix up mock service

First caching version, but with no invalidation currently

Set cache size

Fix up after rebase

Cache invalidation

Formatting tidy up

Sort out some nullability

Add kdocs.

Unit tests

More unit tests

Fix TODO

Unit test fixes

Unit test fixes

Fixed concurrent invalidating transaction support.

* Correct some transaction concurrency bug, including unit test.

* Added some unit tests for the method I added to persistence.

* Remove some blank lines

* Review feedback

* Fix imports
2018-12-17 15:14:14 +00:00
Thomas Schroeter
fe3182d22f
Remove safe cast at initial registration attempt (#4427) 2018-12-17 14:11:43 +00:00
Wawrzyniec 'Wawrzek' Niewodniczanski
3b8504289a
Merge pull request #4421 from corda/wn-docs-trival-log4j2
Trival change to improve search hits for log4j2
2018-12-17 09:49:15 +00:00
Dominic Fox
c1d005ff21
CORDA-2318 resolve type variables recursively (#4414)
* Resolve type variables recursively

* Clarify test

* Formatting
2018-12-17 09:40:09 +00:00
Shams Asari
9d7be5cf21
Renamed CordappInfoResolver to CordappResolver (#4419) 2018-12-14 19:17:06 +00:00
Wawrzyniec Niewodniczański
2acd973cb0 Trival change to improve search hits for log4j2
Make log4j2 consistence - to make docs search easier (log4 2) wasn't
catch by 'log4j2' search.
2018-12-14 16:34:19 +00:00
Shams Asari
1a065ef13d
CORDA-1942: Moved minimumPlatformVersion and targetPlatformVersion to Cordapp (#4416)
Otherwise ContractAndWorkflow ends up having these two duplicated three times.
2018-12-14 15:48:01 +00:00
Michele Sollecito
f2b6f96486
Fixed an issue with the port allocation. (#4418) 2018-12-14 13:18:01 +00:00
josecoll
9cdda3bd77
CORDA-2149 CorDapp Contract and Workflow version identifiers (#4363)
* Implementation of Contract and Workflow attribute identifiers.

* Fixes following rebase from master.

* Fix broken JUnit test.

* Fix broken JUnit test.

* Fix broken JUnit test.

* Added missing constants.

* Further clean-up.

* Updated documentation.

* Added changelog entry.

* Updated all samples (using new Gradle Plugin 4.0.37 functionality)

* Temporarily resolve gradle plugins from latest published snapshot.

* Temporarily resolve gradle plugins from latest published snapshot.

* Updates following feedback from PR review.

* Move constants into CordappInfo companion object.

* Contract and Workflow attribute `version` to `versionId` (as version is a reserved gradle variable)

* Clarified warning message on incorrect version identifier.

* Align version identifier processing logic with gradle cordapp plugin.

* Updated comment.

* Minor fixes following rebase from master.

* Fixed broken unit test.

* Improved exception reporting.

* Update to use 4.0.37 of Gradle Plugins.

* Added support for combined Contract and Workflow CorDapp info.

* Updated following discussions with Shams + cleanup.

* Updated following Shams PR review.

* Minor API improvements.

* Added missing cordapp info causing deployNodes to fail.
2018-12-14 09:39:23 +00:00