Commit Graph

605 Commits

Author SHA1 Message Date
5d5bcbfb00 Merge branch 'master' into dynamic-loading 2016-03-22 13:37:33 +00:00
527b0f4817 Improved unit tests.
Cleaned up project structure a bit.
2016-03-22 12:15:47 +00:00
6c0e696107 Updated with new Tenor class that verifies string during construction.
Now uses new Tenor class for Interest Rate Oracle
2016-03-22 11:46:06 +00:00
d7d05a2f70 Merged in PLT-15-b (pull request #36)
Neater branch with IRS code.
2016-03-22 11:42:08 +00:00
a78c5b11d1 IRS Contract example 2016-03-22 11:36:40 +00:00
b1694e2d0d Move MockNode/InMemoryNetwork to the main sourceset, as these are useful not only for unit testing, but also simulation tools. 2016-03-22 10:54:35 +00:00
3675675277 Custom ClassLoader created from collection of attachments 2016-03-20 20:41:46 +01:00
7ef8397920 Use new Quasar API to skip serialisation of TLS slots. 2016-03-17 16:53:01 +01:00
3c4ce0a8fe Minor: fix a regression introduced by a bad merge that broke the rate fix demo 2016-03-17 13:07:19 +01:00
8ab5efe4a7 Quick fix for previous merge; missed fixing the tests for NodeInterestRates when the String.d function renamed to .bd 2016-03-15 18:42:59 +00:00
11d14001cd Unified the various StorageService implementations. Made getMap() private. Made the nested tables into instance variables. Moved StorageServiceImpl out into its own file to avoid merge conflicts in the future. 2016-03-15 17:08:28 +00:00
77fd6071a1 Merged in jmx-mbeans (pull request #32)
Export various ledger stats via JMX
2016-03-11 18:27:12 +01:00
3533e87953 Take out the fake signing delay in the trader demo. 2016-03-11 18:12:18 +01:00
07eee0233f Export wallet balances via JMX. 2016-03-11 17:55:03 +01:00
28869ad85d Export attachment count via JMX 2016-03-11 17:26:17 +01:00
730b7949ea Export stats to JMX from the state machine manager. 2016-03-11 17:26:17 +01:00
139bf1e450 Minor: fix trader demo 2016-03-11 17:02:35 +01:00
87e8562675 Make Jolokia return data as application/json 2016-03-11 11:57:38 +01:00
c436841461 Restrict Jolokia JMX access 2016-03-11 11:49:50 +01:00
fce799726f Minor: rename NetworkMap -> NetworkMapService for consistency 2016-03-11 11:49:50 +01:00
429ac589df Clean integration of Jersey & Jackson for JAX-RS support, with Config for setting up custom marshalling. No API classes configured by default
Enable Jersey monitoring JMX MBean

Updates based on Mike's feedback
2016-03-11 08:37:53 +00:00
a03352e6cd Export JMX statistics via JSON REST endpoints using Jolokia. 2016-03-09 15:53:32 +01:00
b2f9aa64d5 RatesFixProtocol: add progress tracking 2016-03-09 14:38:03 +01:00
4e15755883 RatesFixProtocol: add an empty, overridable beforeSigning method that lets you customise the logic of the protocol. 2016-03-09 14:08:37 +01:00
0f208d8b4d Check in a demo of how to get an interest rate fix from an oracle. 2016-03-08 17:31:35 +01:00
d63a3a8923 Minor: add a toString for the UnknownFix exception 2016-03-08 17:31:35 +01:00
6ac05c2edb Minor: don't check the file name in an upload if there isn't one 2016-03-08 17:31:35 +01:00
29e58ce3db Allow upload of interest rate fixes to the oracle over HTTP. 2016-03-08 17:31:35 +01:00
2b4a1eedc3 Generalise support for file uploads over HTTP to allow reuse of the upload servlet. 2016-03-08 17:29:56 +01:00
a7fec047ed Add an interest rates oracle.
Currently lacking the following useful things:
- Progress reporting
- Ability to upload new rates
- Demo app[s]
2016-03-08 17:29:56 +01:00
8d3c9643e9 Minor: Move TraderDemo to demos package 2016-03-08 17:29:23 +01:00
92a7363c83 Minor: add a couple more utilities for converting strings into the type safe endpoint address objects 2016-03-08 17:29:08 +01:00
5aaa6bd204 Minor: rename NodeAttachmentStorage -> NodeAttachmentService 2016-03-08 17:29:08 +01:00
ffcc0507c4 Return the hashes of newly uploaded attachments to the uploader. 2016-03-08 15:41:44 +01:00
5eda0e066e Minor: add a TODO about a little rpc framework to StateMachineManager 2016-03-08 15:19:44 +01:00
dc6ef73b6b Minor: more code motion ... TimestampingProtocol now split to top level class and moved to same location as the other protocols. Few other timestamping related classes reorganised. 2016-03-08 12:17:07 +01:00
2c4475b0d9 Minor: TimestamperNodeService -> NodeTimestamperService for consistency 2016-03-08 12:01:49 +01:00
8d041a6b1a Minor: yet another small move 2016-03-08 11:12:45 +01:00
bf3aed11e7 Minor: another small move 2016-03-08 11:10:31 +01:00
e9fddbc709 Reorganise the file hierarchy a bit. 2016-03-08 11:06:16 +01:00
d26b06c35c Allow download of attachments, and files within attachments, over HTTP. 2016-03-04 15:56:25 +01:00
6cb86ab840 Plumb attachments through to the contract verify functions (no contract uses them yet).
The right way to do this is probably to put the contracts onto the classpath before execution of the contract. However, this interacts closely with the sandboxing work, which isn't yet started, so for now this will do.
2016-03-02 15:35:46 +01:00
1123c28f02 Make the trader demo attach a PDF to the commercial paper self-issuance and then scan for it on the buyer side, print out the path on the filesystem where the PDF can be found. 2016-03-02 15:08:55 +01:00
8d906c703d Support auto-expansion of attachment jars on disk. 2016-03-02 14:51:42 +01:00
f0fa9e3097 Resolve and insert attachments to the local store when resolving transactions. Attachments aren't yet exposed to contract code. 2016-03-02 14:51:42 +01:00
7f5eb5bf2f Minor: make TwoPartyTradeProtocolTests use the new MockNode infrastructure 2016-03-02 14:51:42 +01:00
dc0925840a Make AbstractNode more customisable and upgrade the MockNode implementation. 2016-03-02 14:51:42 +01:00
1bd63c030c Minor: delete dead test-related code from Services.kt 2016-03-01 15:20:03 +01:00
3f19842632 Minor: logging, two more utility methods. 2016-03-01 15:13:43 +01:00
1330f33aba First pass trivial wallet: basic tracking of relevant states. 2016-02-29 22:14:25 +01:00