2a247cd229
Refactoring of VaultQuery tests to accomodate changes from OS
2018-05-08 12:54:25 +01:00
406cdf39bb
Merge remote-tracking branch 'open/master' into kat-merge-20180508
2018-05-08 12:10:22 +01:00
0784f079ed
Revert "OS merge ( #806 )"
...
This reverts commit 5c0775f7b4
2018-05-04 16:09:11 +01:00
5c0775f7b4
OS merge ( #806 )
2018-05-04 15:47:36 +01:00
a772884d48
CORDA-1030 - allow nodes to be waited for in-process ( #2678 ) ( #3070 )
...
(cherry picked from commit 53bb986
2018-05-03 17:48:49 +01:00
db22c5259d
Feature to exclude CorDapps from specific MockNodes in a MockNetwork. ( #3028 )
...
* Feature to exclude CorDapps from specific MockNode's in a MockNetwork.
* Fixed API stability issue.
* * Added docs.
* Changed approach for the new parameter to be additive as opposed to exclusive.
* * Updated incorrect comments.
2018-05-03 15:39:52 +01:00
524ba27721
Fix merge issues
2018-05-03 13:52:11 +01:00
855f89b61e
Merge remote-tracking branch 'open/master' into andrius/os-merge
2018-05-03 13:37:39 +01:00
e5e98f3540
Merge OS commit 'ab80df342ab8a7ede0539daaee9fcecd02f6aeeb' into enterprise
2018-05-03 10:55:40 +01:00
c27003b471
Revert: Extensions to Corda Behave for CTS.
2018-05-02 15:51:45 +01:00
0d3c7e7762
CORDA-847 - RPC Server lib refactoring ( #3056 )
...
Just as we did for the RPC CLient, refactor kryo specific elements into
their own sub module. Also move kryo specific components out of generic
RPC files.
Thus, adding AMQP support will be a much smoother operation
2018-05-02 15:48:41 +01:00
8f47fe8c68
Extensions to Corda Behave for CTS.
...
Minor fixes following integration and regression testing with CordaRPCProxy
Remove unrelated code.
Address remaining PR review comments.
2018-05-02 12:31:22 +01:00
a5e2058a5b
Merge pull request #762 from corda/colljos-qa-scenarios
...
ENT-1834: Compatibility Test Suite QA scenarios
2018-05-02 12:30:47 +01:00
6b65bead21
Merge pull request #761 from corda/colljos-behave-rpc-proxy
...
ENT-1834: QA HTTP-RPC Proxy for mixed Corda Node testing using CTS
2018-05-02 12:14:25 +01:00
f013c1dcb7
Address remaining PR review comments.
2018-05-02 11:09:25 +01:00
ccd5f5fd5b
Re-apply previous fixes.
2018-05-02 10:47:12 +01:00
d840099049
Minor updates following PR review feedback.
2018-05-02 10:30:38 +01:00
2750017b8e
Bug fix: registration tool doesn't register for service identity if keystore already contains node cert ( #756 )
...
* fix a bug where registration tool will refuse to register for a service identity if the keystore contain NODE_CA key already.
some refactoring
(cherry picked from commit 5ed60ab
2018-05-02 09:59:12 +01:00
5ed60ab60d
Bug fix: registration tool doesn't register for service identity if keystore already contains node cert ( #756 )
...
* fix a bug where registration tool will refuse to register for a service identity if the keystore contain NODE_CA key already.
some refactoring
2018-05-02 09:54:28 +01:00
e338414cd4
CORDA-847 - RPC Clent lib refactoring ( #3052 )
...
Move Kryo into it's own sub module
2018-05-01 20:52:19 +01:00
764af04608
Moved RPC Proxy to own module in testing/qa/behave/tools
...
Incorporating PR review feedback.
Minor fixes to default path and additional copying of startup script.
2018-05-01 17:04:46 +01:00
29615f512e
Close DB after test
...
Add unique node prefix to DB source
2018-05-01 14:37:35 +01:00
ab80df342a
CORDA-1319 Adding CRL checking for nodes ( #2987 )
...
* Adding CRL support for nodes
* Addressing review comments
2018-04-30 09:26:26 +01:00
c3e6b39e59
artemis upgrade to 2.5.0 ( #3029 )
2018-04-27 19:54:08 +01:00
df5d45a4a6
Enable integration tests to run doorman against remote database (part of ENT-1447) ( #776 )
...
Change integration tests in remote database mode infrastracture to allow passing parameterised dataSource configuration to doorman. Add doorman tables to SQL clearup scripts.
2018-04-27 09:57:16 +01:00
61d2212840
Merge remote-tracking branch 'open-source/master' into thomas-merge
...
experimental/behave/src/main/kotlin/net/corda/behave/logging/LogUtilities.kt
node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt
node/src/test/kotlin/net/corda/node/services/config/NodeConfigurationImplTest.kt
node/src/test/kotlin/net/corda/node/services/messaging/ArtemisMessagingTest.kt
2018-04-26 14:47:29 +01:00
2ff3939e2e
Add exponential backoff to P2P messaging retry ( #2975 )
2018-04-26 13:58:41 +01:00
10a0891ab8
Updated scenarios to include official release versions of OS and R3 Corda.
...
Grouped duplicate scenarios using examples.
Added additional README.md with explanation of feature/scenario types.
Updated scripts to reflect new directory location.
2018-04-25 14:13:22 +01:00
f5483d1deb
ENT-1577 - Remove exposure of internal classes via test api ( #516 )
...
* Remove exposures of internal classes via testing api
* Remove deleted api from api-current
* Fix merge conflict
* Remove internal usage from api-current.txt
2018-04-25 11:59:20 +01:00
685897a7d2
Incorporating PR review feedback.
2018-04-24 19:14:14 +01:00
e135cf062c
Merge commit '5f70b6e04954a6dc64a1a56089eeccb2966bb0ae' into chrisr3-os-merge
2018-04-24 18:09:41 +01:00
8e507d0b88
CORDA-1263: Replace deprecated kotlin-stdlib-jre8 with kotlin-stdlib-jdk8. ( #2992 )
2018-04-24 14:03:41 +01:00
67f5bcc38e
Merge commit '640e5c60886b23068162205db82b1ae5c7c7eec8' into aslemmer-merge-640e5c60886b23068162205db82b1ae5c7c7eec8
2018-04-24 11:01:21 +01:00
65525d74e7
CORDA-1325: Bootstrapper unable to whitelist two versions of the same contract simultaneously ( #2980 )
...
Also added unit tests
2018-04-24 10:51:24 +01:00
c4ceca3787
Merge pull request #2989 from corda/ENT-1775-PR759
...
ENT-1775: reworked client to handle failover in HA mode instead of Artemis
2018-04-23 17:15:00 +01:00
5f781193b6
Merge remote-tracking branch 'open/master' into os-merge-d3446e2
...
# Conflicts:
# node/src/integration-test/kotlin/net/corda/node/BootTests.kt
# node/src/integration-test/kotlin/net/corda/node/services/AttachmentLoadingTests.kt
# node/src/main/kotlin/net/corda/node/services/statemachine/FlowStateMachineImpl.kt
# testing/smoke-test-utils/src/main/kotlin/net/corda/smoketesting/NodeProcess.kt
# tools/demobench/src/main/kotlin/net/corda/demobench/model/NodeController.kt
2018-04-23 15:50:24 +01:00
ce5fb66260
StateMachine rewrite
2018-04-23 15:36:16 +01:00
d3446e213c
Introduced a few more extension methods to Path, which are clearer than the static methods in Files. ( #2985 )
...
Also migrated code away from the old File API.
2018-04-23 14:31:49 +01:00
f1fd1cefd8
Merge remote-tracking branch 'remotes/open/master' into feature/vkolomeyko/corda-os-merge
2018-04-23 14:19:51 +01:00
3aaa176dd4
CORDA-1355: Introduce a dedicated property which controls what is going to be in scope for classpath scanning ( #2977 )
...
* CORDA-1355: Introduce a dedicated property which controls what is going to be in scope for classpath scanning
* CORDA-1355: Update change log
* CORDA-1355: Minor change to improve readability.
* CORDA-1355: Custom serializers documentation update to mention new system property.
2018-04-23 13:55:40 +01:00
4c3d223d5a
CTS QA Scenarios
2018-04-23 11:53:11 +01:00
3a17d4726f
ENT-1775: reworked client to handle failover in HA mode instead of relying on artemis ( #759 )
...
* ENT-1775: reworked client to handle failover in HA mode instead of relying on artemis
* ENT-1775: address PR comments
2018-04-22 14:48:16 +01:00
c0f254e3bb
ENT-1775: reworked client to handle failover in HA mode instead of relying on artemis ( #759 )
...
* ENT-1775: reworked client to handle failover in HA mode instead of relying on artemis
* ENT-1775: address PR comments
2018-04-20 10:52:00 +01:00
b6d43c0204
Merge remote-tracking branch 'open/master' into os-merge-1288f63
...
# Conflicts:
# constants.properties
# node/src/main/kotlin/net/corda/node/internal/cordapp/CordappConfigProvider.kt
# samples/cordapp-configuration/src/main/kotlin/net/corda/configsample/ConfigSampleFlow.kt
2018-04-16 17:35:43 +01:00
1288f63998
Fixed the CorDapp configuration demo ( #2967 )
2018-04-16 17:23:11 +01:00
a0bf0261bb
Merge commit 'd8bf1019b6c7ddbe709cff7c730e66eb576f9ad5' into christians/merge-CORDA-1336
2018-04-13 16:39:00 +01:00
05ec885afd
Update integration test setup in database mode after OS->ENT merge ( #732 )
...
Added Notary schema for SQL setup to tests.
Added SQL setup/tearDown to a loop starting the same node few times in DriverTests.
2018-04-13 15:28:07 +01:00
91c52af5ac
ENT-1584: Subscribe to private network maps using UUIDs ( #2922 )
...
Client private network map implementation
Add private network maps UUIDs to config as extraNetworkMapKeys. Adjust NetworkMapServer implementation accordingly.
Change NetworkMapUpdaterTest to use NetworkMapServer instead of mock
2018-04-13 10:52:45 +01:00
45d6bca071
Merge branch 'master' into os-merge-f88542f
2018-04-12 15:14:28 +01:00
b5f304a104
ENT-1323 Network map service to check all identities in submitted node info ( #499 )
...
* ENT-1323 Network map service to check all identities in submitted node info
* fixup after rebase
* address PR issues, refactored createValidNodeInfo
* address PR issues
(cherry picked from commit f9ed55b
2018-04-12 13:11:30 +01:00
