Commit Graph

605 Commits

Author SHA1 Message Date
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
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
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
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
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
99fdacd0dc Integration tests now run separately from unit tests (with caveats described in the gradle file) 2016-06-28 14:03:32 +01:00
532416ec5a Corrected name of the TraderDemoTest file. 2016-06-28 14:03:32 +01:00
2d9989c5df Rearranged code for improved reading locality. 2016-06-28 14:03:32 +01:00
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
5986e785cf Broke up the runIRSDemo function into smaller functions for readability. 2016-06-28 14:03:32 +01:00
560989a914 Trader Demo test now works again. 2016-06-28 14:03:32 +01:00
10fa86002d Fixed merge error causing IRSDemo to fail. 2016-06-28 14:03:32 +01:00
a7ac54f280 Removed thread waits from tests instead relying on a lock passed to the demo environment. 2016-06-28 14:03:32 +01:00
929b752b42 Trader demo now works as a test using in memory messaging. 2016-06-28 14:03:32 +01:00
89b8b164f7 Trader Demo now has in memory nodes working. 2016-06-28 14:03:32 +01:00
b61b362891 Setup TraderDemo test. Moved DemoNode to a common file. Modified TraderDemo to be tested. 2016-06-28 14:03:32 +01:00
de27b1e8de Improved error handling in IRS demo 2016-06-28 14:03:32 +01:00
60daf8059f Removed dependency added in previous commit. Fixed upload code on IRS Demo 2016-06-28 14:03:32 +01:00
b050411810 Fixed compile error in IRSDemo and updated demo data to match new format. 2016-06-28 14:03:32 +01:00
5de855e045 Fixed a merge error and parameterised host for upload rates. 2016-06-28 14:03:32 +01:00
9fc89fc4a2 Connections now timeout correctly if something goes wrong with the server. 2016-06-28 14:03:32 +01:00
90a24588bc Added TODOs and replaced default path with an exception. 2016-06-28 14:03:32 +01:00
507d9ea4ae Added new integration test for the IRSDemo and refactored the demo to
run in integration tests.
2016-06-28 14:03:32 +01:00
9639768069 Corrected the currency mismatch in the example trade. 2016-06-28 14:03:32 +01:00
0788e8d64c IRS demo to now has roles for NodeA/NodeB and most options are now~ optional. NodeA can be run without the shell script. 2016-06-28 14:03:32 +01:00
aaeb99ac25 Validating notary: check for missing signatures. The notary can only sign if all other signatures are present
Please enter the commit message for your changes. Lines starting
2016-06-23 16:15:14 +01:00
7ee6bd05ce Refactor the wallet code:
- Rename NodeWalletService to InMemoryWalletService and move into the core module where it's available for unit testing.
- Make a new NodeWalletService that just inherits from InMemoryWalletService and doesn't customise it at all, for now.
- Take the cash specific functionality out of Wallet and into an extension property in the Cash contract (this compiles as CashKt.getCashBalance(wallet) for java users).
- Return the generated states in the fillWalletWithTestCash function.
2016-06-22 14:49:52 +02:00
f3d4639059 Testing: make the WalletFiller code a file-level singleton and fillTestWithCash an extension method. For Java users not much changes, the class is still called WalletFiller and the signature remains the same. Re-order some arguments to make it easier to use when accepting the defaults. 2016-06-22 14:49:52 +02:00
cdb3e2f126 Minor: move WalletFiller from node.testing to contracts.testing 2016-06-22 14:49:52 +02:00
37c89d7cf6 Minor: add a TODO that the trader protocol should be recording the transaction itself instead of letting the caller do it. 2016-06-22 13:46:57 +02:00
6b80530ac6 Changed DateOffset to be an integer instead of enum. Usages and examples also changed. Also renamed to fixingPeriodOffset
Renamed fixingPeriod -> fixingPeriodOffset in the .json files
2016-06-21 18:17:39 +01:00
3e82ee45f2 Merged in nodedircreate (pull request #139)
Todo resolution: Moved node directory creation into the abstract node.
2016-06-21 11:02:29 +01:00
b99ddfdb7d demo: Suppress unused var warning 2016-06-20 14:16:13 +01:00
780f2d7e82 demo: Remove warnings 2016-06-20 14:16:13 +01:00
03c1550394 node: add ability to pump sending as well as receiving, expose both streams 2016-06-20 12:37:42 +01:00
298b35ba4f demo: Remove unnecessary 'participants' field from IRS demo fixture 2016-06-20 12:11:58 +01:00
d8e0e8d548 test: Add JsonSupport testing using junit-quickcheck 2016-06-20 11:49:54 +01:00
478fe6110b test: Fix IRS demo JSON fixture 2016-06-20 11:49:15 +01:00
0a5b7ace35 Made TransactionBuilder abstract. Every transaction type now needs to implement and provide its own Builder. This is required since for specific types we need to run different logic when adding new items to the transaction. For example, when adding a new input state to a transaction of type NotaryChange we need to add all of the states participants to the signers list. 2016-06-17 15:05:35 +01:00