Commit Graph

5358 Commits

Author SHA1 Message Date
6dad7efa22 Replace references to cash, with (fungible) asset 2016-06-30 12:47:18 +01:00
a02263937c send and sendAndReceive use Party for the destination 2016-06-30 12:04:39 +01:00
aef111114f Merged in mike-m1-docs-refresh (pull request #196)
Refresh docs for M1 release.
2016-06-30 13:01:07 +02:00
15a135f648 Merged master into mike-m1-docs-refresh 2016-06-30 13:00:34 +02:00
63cc3a04ce Review feedback 2016-06-30 12:59:19 +02:00
b30e431766 Update release notes regarding use of TransactionBuilder 2016-06-30 11:46:26 +01:00
9e174d3e3a irsdemo: Fix api address in Date role 2016-06-30 11:30:05 +01:00
55675ef799 Refresh docs for M1 release. 2016-06-30 12:23:27 +02:00
4213da31b2 Merged in cor-133-events-modelling (pull request #132)
Scheduled activities / events support
2016-06-30 09:11:37 +01:00
5271882dcd Event scheduling and docs for event scheduling 2016-06-30 08:51:52 +01:00
b3af0ce218 Merged in rnicoll-upgrade-infrastructure (pull request #193)
Infrastructure ahead of contract upgrade support
2016-06-29 17:26:44 +01:00
11eff398a0 Minor: Typo (classfiles -> class files) 2016-06-29 17:16:47 +01:00
c767638127 Move DummyContract.State into its own file
DummyContract.State isn't actually used by the DummyContract any more, so shouldn't
be part of that contract class.
2016-06-29 17:16:46 +01:00
779034691e Add AbstractTransactionSubstitutionProtocol
Abstracts the NotaryChangeProtocol to be extensible for other use-cases.
2016-06-29 17:16:46 +01:00
dd9a653ab4 TransactionBuilder: added a comment explaining the default notary parameter purpose 2016-06-29 16:32:29 +01:00
d29dd121ff integtest: Change timestamp format to be compatible with Windows 2016-06-29 13:58:19 +01:00
22e5a5dddc Merged in rnicoll-warnings (pull request #192)
Remove warnings from Obligation contract
2016-06-29 13:49:05 +01:00
dc304199c8 Remove warnings from Obligation contract 2016-06-29 13:27:00 +01:00
549a72bf77 Merged in fix-zip-path (pull request #191)
Fix up bug in attachment Zip file processing when path might not be normalised to start with
2016-06-29 09:26:33 +01:00
cfe54c5f21 Fix up bug in attachment Zip file processing when path might not be normalised to start with 2016-06-29 09:10:18 +01:00
d17e649137 integtest: Double polling retry count 2016-06-28 17:55:04 +01:00
5eefbaf622 Merged in add-integrationTest-to-test (pull request #190)
build: add integrationTest as a test dependency
2016-06-28 17:31:41 +01:00
2daa8098c9 build: add integrationTest as a test dependency 2016-06-28 16:46:45 +01:00
93ea1db17c Merged in irsdemotest (pull request #136)
Added integration build step and created two integration tests (IRS Demo and Trader Demo tests)
2016-06-28 17:37:32 +02:00
9e5bf7c32c integtest: Use separate folder for each integtest run, provide api address 2016-06-28 14:03:32 +01:00
aa82d4441e irs-demo: Fix advertised services 2016-06-28 14:03:32 +01:00
54967afb78 irs-demo: Rework CLI parsing, add api-address 2016-06-28 14:03:32 +01:00
1e15e7a206 trader-demo: Put demo directory under build/, add corresponding cli option 2016-06-28 14:03:32 +01:00
f2505fb504 integtest: Put delay in status polling 2016-06-28 14:03:32 +01:00
e54dad9a8b node: Add apiAddress constructor parameter 2016-06-28 14:03:32 +01:00
429d8aab74 node, integtest: Code style 2016-06-28 14:03:32 +01:00
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
4900c7eb26 Ports now randomised during demo tests. 2016-06-28 14:03:32 +01:00
b52f344eb3 Ensured that nodes are killed by process.destroyForcibly. Added random port numbers to test. 2016-06-28 14:03:32 +01:00
68867d21bb Fixed merge conflict problems. 2016-06-28 14:03:32 +01:00
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
9d4f75f241 Improved readability and brevity of hasEmojiTerminal. 2016-06-28 14:03:32 +01:00
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
ad45b5deaf Tests now fail if spawned processes take too long to finish. 2016-06-28 14:03:32 +01:00
9a2a7165a5 Fixed merge errors. 2016-06-28 14:03:32 +01:00
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
609d80e630 Integration test module set correctly. 2016-06-28 14:03:32 +01:00
7a4a1363cb Removed unnecessary changes. 2016-06-28 14:03:32 +01:00
5a4215a312 Fixed a change resulting from an incorrect merge. 2016-06-28 14:03:32 +01:00
9973f8a33e Moved integration test utilities into a utility folder. 2016-06-28 14:03:32 +01:00
9638ea5b9e IRS demo test now uses the new status endpoint 2016-06-28 14:03:32 +01:00
36a0ff0503 Added an endpoint that allows querying for status of node. 2016-06-28 14:03:32 +01:00
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
22dd36950c Moved the IRSSimulationTest back into the unit test directory. 2016-06-28 14:03:32 +01:00
bef4258430 Fixed Emoji crash where LANG envvar is not defined in particularly exotic setups (msys bash in Powershell for example) 2016-06-28 14:03:32 +01:00