483 Commits

Author	SHA1	Message	Date
Mike Hearn	f6789c93dd	Disentangle the concept of CP issuer vs underlying redeemable asset issuer in the CP contract. ... This confusion was introduced by a previous refactoring.	2016-07-12 16:01:50 +02:00
Andras Slemmer	d7cc34c9a5	all: Full stops in comments!	2016-07-11 17:58:53 +01:00
Mike Hearn	0a2f313d40	Minor: run IntelliJ 'code cleanup'	2016-07-11 18:15:28 +02:00
Andras Slemmer	c3060c11c0	testdsl: Use and expose TransactionBuilder in TestTransactionDSLInterpreter	2016-07-11 14:25:27 +01:00
Clinton Alexander	c8be3f9276	Merged in irsdemocleanup (pull request #209) ... Added OkHttp library and improved help text to demos.	2016-07-08 16:40:30 +01:00
Clinton Alexander	639df4dcb9	Http Client is now lazy init.	2016-07-08 10:48:55 +01:00
Matthew Nesbit	8d31df5fe1	Remove @Suppress now we use standard Kotlin Int	2016-07-08 10:38:22 +01:00
Matthew Nesbit	1fb4371de9	Make the IRS Demo web api an api plugin (scanned from the Node classpath) and use the same permission checking entry point for web api's as the scheduler. ... Fix whitespace Change ProtocolLogicRefFactory to use Map<String, Set<String>> as whitelist definition	2016-07-08 10:34:30 +01:00
Clinton Alexander	01e64d3030	Fixed merge conflicts.	2016-07-07 17:23:14 +01:00
Clinton Alexander	d4da633b1e	Fixed merge issues	2016-07-07 16:31:52 +01:00
Clinton Alexander	24deb5a79c	Added more useful help message that includes basic usage to the TraderDemo.	2016-07-07 16:28:27 +01:00
Clinton Alexander	98b02e9d33	Added some simple documentation to the IRSDemo.	2016-07-07 16:25:01 +01:00
Clinton Alexander	3651bd54aa	Increased read timeout in order to avoid timeouts on long fixing periods (ie; 2020-01-01) on the IRS demo.	2016-07-07 16:22:09 +01:00
Clinton Alexander	6381b5e6a1	Added OkHttp and used it to clean up the HTTP calls in the demo and then moved those new functions to a util lib.	2016-07-07 16:22:09 +01:00
Shams Asari	5c0e7fbbf2	Moved topic parameter from send/receive methods to a ProtocolLogic property	2016-07-05 15:12:25 +01:00
Ross Nicoll	2121824662	Rename com.r3cord.contracts.cash package to ...asset	2016-06-30 13:31:59 +01:00
Shams Asari	a02263937c	send and sendAndReceive use Party for the destination	2016-06-30 12:04:39 +01:00
Andras Slemmer	9e174d3e3a	irsdemo: Fix api address in Date role	2016-06-30 11:30:05 +01:00
rick.parker	5271882dcd	Event scheduling and docs for event scheduling	2016-06-30 08:51:52 +01:00
Andras Slemmer	d29dd121ff	integtest: Change timestamp format to be compatible with Windows	2016-06-29 13:58:19 +01:00
Andras Slemmer	d17e649137	integtest: Double polling retry count	2016-06-28 17:55:04 +01:00
Andras Slemmer	9e5bf7c32c	integtest: Use separate folder for each integtest run, provide api address	2016-06-28 14:03:32 +01:00
Andras Slemmer	aa82d4441e	irs-demo: Fix advertised services	2016-06-28 14:03:32 +01:00
Andras Slemmer	54967afb78	irs-demo: Rework CLI parsing, add api-address	2016-06-28 14:03:32 +01:00
Andras Slemmer	1e15e7a206	trader-demo: Put demo directory under build/, add corresponding cli option	2016-06-28 14:03:32 +01:00
Andras Slemmer	f2505fb504	integtest: Put delay in status polling	2016-06-28 14:03:32 +01:00
Andras Slemmer	e54dad9a8b	node: Add apiAddress constructor parameter	2016-06-28 14:03:32 +01:00
Andras Slemmer	429d8aab74	node, integtest: Code style	2016-06-28 14:03:32 +01:00
Clinton Alexander	ffa9ad1bc9	Added port argument for IRS demo to allow web servers to not have binding collisions during testing and to allow more granular control over demos.	2016-06-28 14:03:32 +01:00
Clinton Alexander	4900c7eb26	Ports now randomised during demo tests.	2016-06-28 14:03:32 +01:00
Clinton Alexander	b52f344eb3	Ensured that nodes are killed by process.destroyForcibly. Added random port numbers to test.	2016-06-28 14:03:32 +01:00
Clinton Alexander	68867d21bb	Fixed merge conflict problems.	2016-06-28 14:03:32 +01:00
Clinton Alexander	5bf5e37572	Demos now fully handle process managment except in the case where the process is killed with something like pkill or the JVM being ended by task manager.	2016-06-28 14:03:32 +01:00
Clinton Alexander	5858ff5c45	Ensured that test passes under correct conditions, which may be slow, but also that the node lives until the end.	2016-06-28 14:03:32 +01:00
Clinton Alexander	ad45b5deaf	Tests now fail if spawned processes take too long to finish.	2016-06-28 14:03:32 +01:00
Clinton Alexander	9a2a7165a5	Fixed merge errors.	2016-06-28 14:03:32 +01:00
Clinton Alexander	21dc8e7fd4	Increased timeout time for reads during HTTP connections to avoid demo failing when date it set far in the future.	2016-06-28 14:03:32 +01:00
Clinton Alexander	7a4a1363cb	Removed unnecessary changes.	2016-06-28 14:03:32 +01:00
Clinton Alexander	5a4215a312	Fixed a change resulting from an incorrect merge.	2016-06-28 14:03:32 +01:00
Clinton Alexander	9973f8a33e	Moved integration test utilities into a utility folder.	2016-06-28 14:03:32 +01:00
Clinton Alexander	9638ea5b9e	IRS demo test now uses the new status endpoint	2016-06-28 14:03:32 +01:00
Clinton Alexander	03e2852880	The integration tests for demos now spawn a new JVM instead of using threads. Demos no longer need or contain any in memory node logic.	2016-06-28 14:03:32 +01:00
Clinton Alexander	22dd36950c	Moved the IRSSimulationTest back into the unit test directory.	2016-06-28 14:03:32 +01:00
Clinton Alexander	ecdd0a23a2	Fixed bug in IRS demo where the node threads never exit during integration tests and cause other tests to fail.	2016-06-28 14:03:32 +01:00
Clinton Alexander	99fdacd0dc	Integration tests now run separately from unit tests (with caveats described in the gradle file)	2016-06-28 14:03:32 +01:00
Clinton Alexander	532416ec5a	Corrected name of the TraderDemoTest file.	2016-06-28 14:03:32 +01:00
Clinton Alexander	2d9989c5df	Rearranged code for improved reading locality.	2016-06-28 14:03:32 +01:00
Clinton Alexander	3c11c26b12	Refactored IRSDemo to be more readable and to have minimal branches due to in memory mode in order to ensure tests are as similar to the real things as possible.	2016-06-28 14:03:32 +01:00
Clinton Alexander	5986e785cf	Broke up the runIRSDemo function into smaller functions for readability.	2016-06-28 14:03:32 +01:00
Clinton Alexander	560989a914	Trader Demo test now works again.	2016-06-28 14:03:32 +01:00