Commit Graph

1565 Commits

Author SHA1 Message Date
Andras Slemmer
d8ae07e771 node-driver: Use anyAddress for RandomFree port allication 2016-09-05 17:29:44 +01:00
Andras Slemmer
9836edd191 Revert reuseaddr 2016-09-05 16:08:58 +01:00
Roger Willis
a4d2b28b6b Merged in rog-timeout-patch (pull request #322)
waitForNodeStartup should now throw after 2 minutes rather than 20 seconds. Some bank devs were finding integration tests failing as nodes had still not started...

Added getFreeLocalPorts() for grabbing more than one port. Fixes bug in freeLocalHostAndPort() where the same port can be picked multiple times.

In README.md instruct users to grab IntelliJ16 instead of 15.
2016-09-05 16:06:05 +01:00
Andras Slemmer
da34be752a Merged in aslemmer-remove-reuse-addr (pull request #324)
node-driver: Remove reuseAddress = true as it breaks tests on osx
2016-09-05 15:43:27 +01:00
Andras Slemmer
6b37048a14 node-driver: Remove reuseAddress = true as it breaks tests on osx 2016-09-05 15:43:19 +01:00
Shams Asari
97e1a59770 Refactored FiberRequest into cleaner ProtocolIORequest and fixed checkpoint regression 2016-09-05 14:42:54 +01:00
Matthew Nesbit
a2d7490902 Merged in mnesbit-cleanup-protect-double-stop (pull request #323)
Some integration tests seem to be getting exceptions that suggest the ArtemisMQ session has been closed twice.
2016-09-05 14:27:38 +01:00
Matthew Nesbit
eb8510e7cc Some integration tests seem to be getting exceptions that suggest the ArtemisMQ session has been closed down already. Looking at the client code it is clear two threads can call stop and interfere with each other. Therefore this fixes the running flag logic. 2016-09-05 14:13:38 +01:00
Andras Slemmer
ea3c63e023 Merged in mike-so-reuseaddr (pull request #321)
Testing: Make PortAllocation set SO_REUSEADDR to avoid CI conflicts
2016-09-05 12:24:52 +01:00
Andras Slemmer
637a41401d node-driver: Reuse address when polling for port, poll for correct condition\(!\) 2016-09-05 11:04:31 +01:00
RogerWillis
9cfbb71030 In README.md instruct users to grab latest version of IntelliJ. 2016-09-05 10:45:16 +01:00
RogerWillis
f5b90ab8e5 In README.md instruct users to grab IntelliJ16 instead of 15. 2016-09-05 10:38:44 +01:00
Mike Hearn
3854fec17f Testing: Make PortAllocation set SO_REUSEADDR to avoid CI conflicts 2016-09-05 11:22:00 +02:00
sofusmortensen
fffc049e12 Universal: refactoring, reduction/evaluation with unit test first steps 2016-09-04 22:50:32 +02:00
Andras Slemmer
116bb7c1ba Merged in aslemmer-fix-wallet-monitor-service-tests (pull request #319)
Fix wallet monitor service tests
2016-09-02 09:26:40 +01:00
Ross Nicoll
32d96b78a8 Add missing dependency on test-utils 2016-09-01 18:36:19 +01:00
Andras Slemmer
ca1b0083ed node: Clean up messy issue in test 2016-09-01 18:15:47 +01:00
Andras Slemmer
0298ccf0d6 test-utils: Rename repeat to replicate due to name clashes 2016-09-01 18:15:47 +01:00
Andras Slemmer
dded4c6e8f node: FIx WalletMonitorService tests 2016-09-01 18:15:47 +01:00
Andras Slemmer
5b2157cdc8 client, test-utils: Move Expect dsl to test-utils 2016-09-01 18:15:47 +01:00
Ross Nicoll
0fb9f37518 Merged in rnicoll-warnings (pull request #315)
Correct warnings
2016-09-01 16:40:57 +01:00
Ross Nicoll
4d0b23ab6f Add log4j-web to node
Add log4j-web to node so it stops complaining that it's running in a web environment without that option.
Longer term we may want to split the web parts into their own optional extra for node, but for now I think
this is a sensible solution.
2016-09-01 16:15:15 +01:00
Ross Nicoll
9cccc7a2b7 Correct warnings 2016-09-01 16:15:15 +01:00
Ross Nicoll
b913b18e02 Merged in rnicoll-simulations (pull request #314)
Move test code from node to test-utils
2016-09-01 15:21:34 +01:00
Ross Nicoll
102e3f2048 Merged in rnicoll-clause-remove-concrete (pull request #316)
Merge ConcreteClause into Clause
2016-09-01 13:42:56 +01:00
Matthew Nesbit
a77556f72c Merged in mnesbit-exclude-bouncycastle-jdk14 (pull request #317)
Remove bouncycastle-jdk14 that is causing problems for one of the member banks.
2016-09-01 11:26:46 +01:00
Ross Nicoll
868b23a923 Move simulations to top level 2016-09-01 11:15:05 +01:00
Ross Nicoll
07f44e9e2a Move test code from node to test-utils 2016-09-01 11:15:05 +01:00
Matthew Nesbit
039229cdfd Remove bouncycastle-jdk14 that is causing problems for one of the member banks.
Only need testCompile scope
2016-09-01 11:04:48 +01:00
Andras Slemmer
6af7945dc6 Merged in aslemmer-node-client (pull request #305)
Aslemmer node client
2016-09-01 10:22:50 +01:00
Andras Slemmer
1f095533be client: Remove when (this) 2016-09-01 10:14:37 +01:00
Andras Slemmer
5d04bd2cad client: Small comment correction 2016-09-01 09:38:04 +01:00
Andras Slemmer
0f54aec6ac client: Add repeat\(n\) to Expect dsl 2016-09-01 09:36:06 +01:00
Andras Slemmer
af641ab977 client: Small cosmetics 2016-09-01 09:36:06 +01:00
Andras Slemmer
20ed97ff96 client: Port Expect reactfx->rx 2016-09-01 09:36:06 +01:00
Andras Slemmer
f682d7f173 client: Hide public Expect.kt types 2016-09-01 09:36:06 +01:00
Andras Slemmer
a2ace973ff client: reactfx->rx 2016-09-01 09:36:06 +01:00
Andras Slemmer
86d6ee0110 node: Cash Issue doesn't require notary 2016-09-01 09:36:06 +01:00
Andras Slemmer
2f7b022c8e client: Add WalletMonitorClient, Expect DSL and some tests for the client 2016-09-01 09:36:06 +01:00
Andras Slemmer
cfebccc495 node: Remove TransactionBuildResult.Complete, add pretty printing of ServiceToClientEvent 2016-09-01 09:36:06 +01:00
Andras Slemmer
9cda99bbcc client: Add client submodule 2016-09-01 09:36:05 +01:00
Ross Nicoll
203c4fb3d8 Merge ConcreteClause into Clause
Change Clause to an abstract class, and merge ConcreteClause into it. CompositeClause now
overrides defaults provided in Clause which are more suitable for composition of clauses.
2016-08-31 17:55:36 +01:00
Ross Nicoll
d81cbebe96 Merged in rnicoll-test-utils (pull request #313)
Move test utilities into their own package
2016-08-31 16:38:07 +01:00
Mike Hearn
89f5d9c4f7 Begin release M4 2016-08-31 17:22:52 +02:00
Mike Hearn
f7b2834461 Regen docsite 2016-08-31 17:16:06 +02:00
Mike Hearn
75a9c498a4 Fixup release notes 2016-08-31 17:14:42 +02:00
Ross Nicoll
232db9a1fd Move test utilities into their own package
This moves a lot of the test support code into its own package which is only imported for tests,
so it's not shipped as a part of core Corda. The node currently depends on this support code to
compile, although future work could try to separate this out. This change highlights that parts
of production code is dependent on test elements (i.e. dummy keys), and makes it harder for
such accidental crosses to occur later.

An integration test category is also added as part of this work, to contribute towards COR-345.
2016-08-31 15:40:54 +01:00
Matthew Nesbit
ce6d333914 Merged in mnesbit-document-corda-configuration (pull request #312)
Add some documentation of the configuration options of the standalone corda.jar
2016-08-31 11:48:24 +01:00
Matthew Nesbit
638dfc902a docs
Include database config section for completeness

Incorporate comments from review

Incorporate comments from review
2016-08-31 11:47:25 +01:00
Clinton Alexander
5439e0980f Merged in clint-driver-debug-fix (pull request #308)
Fixed driver debug mode.
2016-08-31 11:31:02 +01:00