dc1bf3ad34
Merge remote-tracking branch 'remotes/origin/tudor_merge_14_05_2018' into merges/may-14-15-21
...
# Conflicts:
# testing/node-driver/src/main/kotlin/net/corda/testing/driver/Driver.kt
2018-05-14 17:19:51 +01:00
a1616767b8
Fix merge
2018-05-14 17:17:48 +01:00
61245c9675
Fixed copy names in Driver.
2018-05-14 16:40:09 +01:00
ec20359518
Fix merge
2018-05-14 16:05:30 +01:00
9a69a36904
Merge remote-tracking branch 'remotes/open/master' into merges/may-14-15-21
...
# Conflicts:
# .idea/compiler.xml
# constants.properties
# experimental/behave/src/main/kotlin/net/corda/behave/network/Network.kt
# experimental/behave/src/main/kotlin/net/corda/behave/node/Distribution.kt
# experimental/behave/src/test/kotlin/net/corda/behave/service/PostreSQLServiceTests.kt
# node-api/src/main/kotlin/net/corda/nodeapi/internal/bridging/AMQPBridgeManager.kt
# node-api/src/main/kotlin/net/corda/nodeapi/internal/persistence/CordaPersistence.kt
# node-api/src/main/kotlin/net/corda/nodeapi/internal/persistence/HibernateConfiguration.kt
# node-api/src/main/kotlin/net/corda/nodeapi/internal/protonwrapper/netty/AMQPChannelHandler.kt
# node-api/src/main/kotlin/net/corda/nodeapi/internal/protonwrapper/netty/AMQPClient.kt
# node/src/integration-test/kotlin/net/corda/node/AuthDBTests.kt
# node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
# node/src/main/kotlin/net/corda/node/internal/NodeStartup.kt
# node/src/main/kotlin/net/corda/node/services/config/ConfigUtilities.kt
# node/src/main/kotlin/net/corda/node/services/messaging/MessagingExecutor.kt
# node/src/main/kotlin/net/corda/node/services/persistence/AbstractPartyToX500NameAsStringConverter.kt
# node/src/main/kotlin/net/corda/node/services/persistence/DBTransactionMappingStorage.kt
# node/src/main/kotlin/net/corda/node/utilities/AddOrRemove.kt
# node/src/test/kotlin/net/corda/node/services/config/NodeConfigurationImplTest.kt
# samples/attachment-demo/src/integration-test/kotlin/net/corda/attachmentdemo/AttachmentDemoTest.kt
# samples/irs-demo/web/src/test/kotlin/net/corda/irs/web/IrsDemoWebApplicationTests.kt
# samples/simm-valuation-demo/src/integration-test/kotlin/net/corda/vega/SimmValuationTest.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/driver/Driver.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/InternalTestUtils.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/RPCDriver.kt
# testing/smoke-test-utils/src/main/kotlin/net/corda/smoketesting/NodeConfig.kt
# webserver/src/integration-test/kotlin/net/corda/webserver/WebserverDriverTests.kt
2018-05-14 15:56:43 +01:00
9b42dd3a87
Merge branch 'tudor_os_merge' into tudor_merge_14_05_2018
...
# Conflicts:
# constants.properties
# node/src/main/kotlin/net/corda/node/services/config/ConfigUtilities.kt
# node/src/test/kotlin/net/corda/node/services/config/NodeConfigurationImplTest.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/driver/Driver.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/RPCDriver.kt
2018-05-14 15:20:14 +01:00
d027b5b8f2
[CORDA-1472]: Crackdown on warnings. ( #3136 )
2018-05-14 21:15:52 +07:00
eea7ae3a67
Merge pull request #832 from corda/mike-merge-ea81548d6
...
Merge to ea81548d6
2018-05-11 21:44:59 +02:00
543491c7df
CORDA-1461 improve devMode ( #3100 )
...
* CORDA-1461 improve devMode
* CORDA-1461 set devMode=true for driver
* CORDA-1461 fix tests and improve UI
* CORDA-1461 Address code review changes
* CORDA-1461 Missing developer emoji
* CORDA-1461 use latest cordform that sets devMode=true
* CORDA-1461 fix test and add driver overrides for notary
* CORDA-1461 fix tests, fix api-scanner version
* CORDA-1461 fix api
* CORDA-1461 formatting
* CORDA-1461 comment style
2018-05-11 17:48:02 +01:00
509a52ad5e
CORDA-866: Implement removal of stale nodes from network ( #774 )
...
* Implement removal of stale nodes from network
Add eventHorizon to NetworkParameters structure. Add republishing of
node info on 1 day intervals - it is treated by network map as heartbeat from node indicating if it's alive or not. Add removal of old node infos on network map signing.
* Add copy method to NetworkParameters data class
Add JvmOverloads annotation to the constructor, because it's data class
exposed in API
2018-05-11 17:11:56 +01:00
ce7ba2182b
Merge remote-tracking branch 'open/master' into mike-merge-ea81548d6
2018-05-11 16:41:39 +02:00
4afc7f3824
Behave: fix compilation problem in IntelliJ ( #830 )
...
* Sprinkled new gradle dust to make both IntelliJ and TC (gradle) compilation happy.
* Fix compilation problem once and for all + ignore the RPCProxyWebServiceTest smoke test.
2018-05-11 15:21:42 +01:00
ea81548d60
[CORDA-1269]: Changed usages of arrayOf() in Entities to use Kotlin 1.2 style. ( #3122 )
2018-05-11 21:07:53 +07:00
99d70fc197
Merge pull request #821 from corda/bogdan-merge-10-05-18
...
Bogdan os-ent merge 10 05 18
2018-05-10 11:52:27 +01:00
1c2d6d8100
Unrevert artemis upgrade to 2.5.0 ( #3029 ) ( #815 )
...
* Revert "Revert "artemis upgrade to 2.5.0 (#3029 )""
2018-05-10 10:01:37 +01:00
b4a402de36
Merge remote-tracking branch 'open/master' into bogdan-merge-10-05-18
2018-05-10 09:47:54 +01:00
3bb95c3ed1
Cleanup and improvements to the serialisation format of JacksonSupport (needed for CORDA-1238) ( #3102 )
...
Also deprecated all the public members that shouldn't have leaked into the public API.
2018-05-09 21:42:55 +01:00
96ab22f1da
Merge remote-tracking branch 'open/master' into kat-merge-20180508
2018-05-09 11:00:07 +01:00
1963c29f01
Merge branch 'master' into kat-merge-20180508
2018-05-08 21:52:24 +07:00
28644b6514
Merge pull request #751 from corda/colljos-compatibility-testing
...
ENT-1834: Corda Behave extensions for CTS
2018-05-08 15:42:11 +01:00
0072d41958
Fixed incorrect references to (renamed) feature files.
2018-05-08 14:00:47 +01:00
5318c395ee
[CORDA-860]: Retrieving state by recordTime.max() throws a cast exception (fixed) ( #3090 )
2018-05-08 19:16:19 +07:00
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
