Anthony Keenan
c72b3ad4fa
Merge remote-tracking branch 'open/master' into anthony-os-merge-2
...
# Conflicts:
# .ci/api-current.txt
# client/jfx/src/integration-test/kotlin/net/corda/client/jfx/NodeMonitorModelTest.kt
# client/rpc/src/integration-test/kotlin/net/corda/client/rpc/FlowsExecutionModeRpcTest.kt
# docs/source/example-code/src/integration-test/kotlin/net/corda/docs/IntegrationTestingTutorial.kt
# docs/source/example-code/src/main/kotlin/net/corda/docs/tutorial/mocknetwork/TutorialMockNetwork.kt
# finance/src/test/kotlin/net/corda/finance/flows/CashPaymentFlowTests.kt
# node/src/integration-test/kotlin/net/corda/node/CordappScanningDriverTest.kt
# node/src/integration-test/kotlin/net/corda/node/NodePerformanceTests.kt
# node/src/integration-test/kotlin/net/corda/node/services/BFTNotaryServiceTests.kt
# node/src/integration-test/kotlin/net/corda/node/services/RaftNotaryServiceTests.kt
# node/src/integration-test/kotlin/net/corda/node/services/network/NetworkMapTest.kt
# node/src/integration-test/kotlin/net/corda/node/services/rpc/RpcSslTest.kt
# node/src/integration-test/kotlin/net/corda/node/services/statemachine/FlowVersioningTest.kt
# node/src/integration-test/kotlin/net/corda/node/services/statemachine/LargeTransactionsTest.kt
# node/src/integration-test/kotlin/net/corda/services/messaging/MQSecurityTest.kt
# node/src/integration-test/kotlin/net/corda/services/messaging/P2PMessagingTest.kt
# node/src/integration-test/kotlin/net/corda/test/node/NodeStatePersistenceTests.kt
# node/src/test/kotlin/net/corda/node/CordaRPCOpsImplTest.kt
# node/src/test/kotlin/net/corda/node/modes/draining/ScheduledFlowsDrainingModeTest.kt
# node/src/test/kotlin/net/corda/node/services/messaging/ArtemisMessagingTest.kt
# node/src/test/kotlin/net/corda/node/services/statemachine/FlowFrameworkTests.kt
# node/src/test/kotlin/net/corda/node/services/transactions/MaxTransactionSizeTests.kt
# samples/trader-demo/src/integration-test/kotlin/net/corda/traderdemo/TraderDemoTest.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/InMemoryMessagingNetwork.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/MockServices.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/NodeBasedTest.kt
# verifier/src/integration-test/kotlin/net/corda/verifier/VerifierTests.kt
2018-02-28 16:55:15 +00:00
joeldudleyr3
0f2077364e
Fix merge conflicts.
2018-02-28 14:12:54 +00:00
Anthony Keenan
577033441a
[CORDA-1035] Testing api KDoc Updates ( #2584 )
...
* Testing api KDoc Updates
* Update after code review
* Update api-current
* Revert changes to compiler.xml
* Made comment changes from review
* Fixing merge conflict
* Don't expose net.corda.node through test API (first pass)
* Fixing merge conflicts
* Update api-current
* Addressing review commits
* Fix exposure of internal implementation of MessageHandlerRegistration
* Make InProcess expose ServiceHub instead of internal StartedNodeServices
* Move InternalMockMessaginService interface to internal namespace
* Move MOCK_VERSION_INFO to internal namespace to avoid exposing VersionInfo
* Don't expose WritableTransactionStorage via testing api
* Create public VerifierType enum
* Update api-current and modify check-api-changes to check for net.corda.node exposures
* Fix merge conflicts
* Fixing another merge conflict
* Fix accidentally broken unit tests
* Make getInternalServices a property
* Fix failing unit tests
* Add todo to check-api-changes
* Fix rpc sender thread busy looping
* Fix tests
* Fixing tests
* Address mike's comments
* Fixing tests
* Make random port allocation internal
* Update api
2018-02-28 13:26:49 +00:00
Thomas Schroeter
40727f3bdd
Update documentation of Postgres support
2018-02-27 14:44:17 +00:00
Joel Dudley
0c62c6d850
Improves CorDapp build instructions by including other ext versions, and clearly pointing to the templates as a guide.
2018-02-27 12:48:08 +00:00
Thomas Schroeter
c7e03633c7
Merge remote-tracking branch 'open-source/master' into thomas-merge
2018-02-27 12:01:49 +00:00
Joel Dudley
f7c9f0d10e
Wrong file name.
2018-02-27 10:21:03 +00:00
Joel Dudley
3c8db47b5a
Updates shell example of starting flow to reflect cash API change.
2018-02-26 18:16:25 +00:00
Joel Dudley
f1c3f584ac
Showcase link in Quickstart guide. Remove Utilities link (merged with Samples).
2018-02-26 16:47:53 +00:00
Rick Parker
2da28c574e
CORDA-1040 docs for FlowLogic.sleep ( #2625 )
2018-02-26 16:07:40 +00:00
Joel Dudley
7517270dde
Improves node.conf page. Shows the defaults used.
2018-02-26 14:53:13 +00:00
Andrius Dagys
cc8e38922e
Merge remote-tracking branch 'open/master' into andrius-merge-02-26
2018-02-26 11:55:17 +00:00
Andrius Dagys
0edfef2409
CORDA-696 - Create separate transaction types for contract upgrade transactions ( #2589 )
...
* CORDA-986 and CORDA-985 CompositeKey and Signature verification performance fixes (#2467 )
* CORDA-696: Create separate transaction types for contract upgrade transactions.
Add rationale around upgrade transactions
Move contract upgrade transaction resolution logic into internal until it's stabilised.
Throw a better exception when contract attachment not found
Default legacy contract constraint to always accepting - needs to be changed to whitelist constraint before merging
Introduce a new upgraded contract interface that allows specifying the legacy constraint.
Remove StateLoader, make all tx resolution functions take in ServicesForResolution
Contract upgrade transactions can handle whitelist by zone constraints
When creating a contract upgrade transaction, make sure the attachment of the old cordapp gets attached when using hash constraints.
Attachment lookup for a given contract class name only scans currently loaded cordapps, and we don't load old versions of cordapps.
CORDA-696: Update upgrade docs
2018-02-26 11:29:25 +00:00
Joel Dudley
50ccb32700
Adds a 'provision the certificates' step to the Windows deployment instructions.
2018-02-26 09:21:27 +00:00
sollecitom
d41b9a0299
merged OS into master
2018-02-23 15:47:07 +00:00
Michele Sollecito
5be0e4b39e
[CORDA-941]: Add NetworkParameters contract implementation whitelist. ( #2580 )
2018-02-23 14:29:02 +00:00
Shams Asari
977836f4eb
Enable tests which were ignored due to recent flakiness on TC and issue with maxTransactionSize which should now be resolved. ( #2621 )
2018-02-23 13:45:18 +00:00
Andras Slemmer
67f9266b24
Merge pull request #2597 from corda/aslemmer-CORDA-1043
...
CORDA-1043
2018-02-22 14:56:20 +00:00
Joel Dudley
904f706e10
[CORDA-1035] Flow test API docs
2018-02-22 14:38:02 +00:00
Joel Dudley
c94b606cf0
Fixes a typo in the node deployment docs.
2018-02-22 14:15:25 +00:00
Michele Sollecito
5db4882668
[CORDA-1089]: Ensure graceful error message is shown on node startup if RPC settings are invalid. ( #2595 )
2018-02-22 09:47:56 +00:00
Andras Slemmer
6a2217ace6
Merge remote-tracking branch 'open/master' into aslemmer-merge-19-Feb
2018-02-21 18:10:37 +00:00
Andras Slemmer
66cbe8c56d
CORDA-1043
2018-02-21 15:56:29 +00:00
Mike Hearn
ffd726d592
Docs: discuss zone constraints, flow drains and more upgrade related topics ( #2585 )
...
Docs: discuss zone constraints, flow drains and more upgrade related topics.
2018-02-21 15:33:28 +01:00
Michele Sollecito
9ddd47ea39
[CORDA-1059]: Fix Driver hanging on duplicate node names. ( #2590 )
2018-02-21 11:28:51 +00:00
Mike Hearn
2cf2fdbc06
Address review comments
2018-02-20 18:45:38 +01:00
Mike Hearn
55a33acc32
Address review comments
2018-02-20 18:45:38 +01:00
Mike Hearn
7548c6c901
Docs: some work on the network map docs.
2018-02-20 18:45:38 +01:00
Andras Slemmer
a6a2008bb9
Ignore flaky test
2018-02-20 16:32:50 +00:00
Andras Slemmer
25263c20c7
Merge remote-tracking branch 'open/master' into aslemmer-merge-19-Feb
2018-02-20 15:52:09 +00:00
Andras Slemmer
d28c781597
Missing diff from merge
2018-02-20 13:54:11 +00:00
Andras Slemmer
38d0ad30df
Merge commit 'da591363fdccd220455a92f083d2ad59ed0e2d12' into aslemmer-merge-19-Feb
2018-02-20 13:52:03 +00:00
Andras Slemmer
6b2b7b6a3c
Merge commit 'fa4b5d16ba6249f85b50851c2f52dc697eebdee6' into aslemmer-merge-19-Feb
2018-02-20 13:26:31 +00:00
Andras Slemmer
1d7b0fc499
Merge commit '86fb1ed852c69121f989c9eeea92cfb4c27f9d13' into aslemmer-merge-19-Feb
2018-02-19 16:14:43 +00:00
Joel Dudley
65681e8e9d
plugins folder renamed to cordapps
2018-02-19 14:22:20 +00:00
Shams Asari
71c94f8a9d
Reversing the introduction of GlobalProperties (by CORDA-961), and added NetworkParameters to ServicesForResolution instead. ( #2563 )
...
Also, replaced the maxTransactionSize parameter of the driver and MockNetwork with NetworkParameters.
2018-02-19 12:23:59 +00:00
Konstantinos Chalkias
fe7c129ae7
CORDA-1038 Update verifySignaturesExcept in api-transactions.rst ( #2546 )
2018-02-16 12:32:53 +00:00
Katelyn Baker
307e2988c9
DOCS: update AMQP serialization ( #2543 )
...
* DOCS: update AMQP serialization
* Update serialization.rst
2018-02-16 12:14:31 +00:00
Anthony Keenan
c2485858f5
CORDA-1011 Add powershell script to update testing package imports ( #2528 )
...
* Add powershell script to update testing package imports
* Make sure script works with java files
* Address review comments
2018-02-16 10:22:41 +00:00
igor nitto
ed0cf91946
Start Jolokia agents if configured without modifying JVM options [CORDA-1042] ( #2541 )
...
* Jolokia agents are loaded dynamically if configured
* Renamed exportJmxTo (never used) to jmxMonitoringHttpPort and take it from config
* Updated documentation and tests
2018-02-15 17:10:07 +00:00
Shams Asari
2864ce1384
ENT-1519: Ensure NodeInfo always has at least one address by checking in the c'tor ( #2538 )
...
Further, the look up of the node's own node-info from its database has been tightened to ensure there isn't more than one.
Also fixed some brittle code which was assuming exactly one address rather than at least one.
2018-02-15 14:06:41 +00:00
Clinton
eeb96535ee
Re-added missing changelog entries
2018-02-14 17:04:08 +00:00
Anthony Keenan
3e8d76334e
CORDA-939 Modify Api Scanner to check api for internal exposures ( #2510 )
...
* Update check api changes to look for internals
* Update several more uses of internal
* Make check-api-changes script filter out internal class usages
* Make CordaClock part of API
* Update api-current.txt
* Remove exclusion of nodeapi.internal
* Remove access to CordaPersistence from public api
* Don't expose DB Connection from StartedMockNode and remove unnecessary transaction from CustomVaultQueryTest
* Make internal tests that use need db access use InternalMockNetwork
* Make test certificates internal
* Address further review comments
* Revert some accidental changes to api-current.txt
* Address Shams' review comments
* Update Api Scanner to filter out CordaInternal attribute
* Update api-current.txt
* Remove superfluous brackets
* Add transaction to StartedMockNode
* More leaky transaction fixes
2018-02-14 16:42:56 +00:00
Clinton
174ed3c64b
CORDA-556: Added Cordapp Config and a sample ( #2469 )
...
* Added per-cordapp configuration
* Added new API for Cordformation cordapp declarations to support per-cordapp configuration
* Added a cordapp configuration sample
2018-02-14 14:49:59 +00:00
Maksymilian Pawlak
b91dd43a83
Test driver default parameters removal ( #2519 )
...
* Removed long parameter list in test driver, replaced with DriverParameters object
2018-02-13 13:15:05 +00:00
CaisR3
949d4fd7fb
Fixing a small mistake added/uploaded, only one required.
2018-02-13 10:24:06 +00:00
Joel Dudley
ad1be79900
Reorders params to put non-default args first. Creates simpler default constructors.
2018-02-12 17:02:34 +00:00
Michele Sollecito
da591363fd
CORDA-990: Flows Draining Mode ( #2483 )
...
[CORDA-990]: Flows draining mode.
2018-02-12 16:13:43 +00:00
Anthony Keenan
1487c411b4
CORDA-716 - Update changelog for test package changes and provide upgrade script ( #2434 )
...
* Update changelog for test package changes and provide upgrade script
* Upgrade kotlin and java scripts
2018-02-12 15:53:29 +00:00
Joel Dudley
3f3e0e9973
Allows the webserver JAR used by each node in deployNodes to be configured.
2018-02-12 14:00:25 +00:00
