Commit Graph

605 Commits

Author SHA1 Message Date
5d75a661b1 Merged in rnicoll-protocol-request-response (pull request #60)
Refactor common elements in node services
2016-04-19 17:58:55 +01:00
8cdd57e4e0 Refactor common elements in node services 2016-04-19 17:57:04 +01:00
03cab8ba09 IRS demo fixes 2016-04-19 16:00:10 +01:00
fcbe1210f7 Minor: delete a dead unit test class 2016-04-18 19:51:26 +02:00
800151b774 Merge branch 'master' into dynamic-loading 2016-04-18 17:56:31 +02:00
8bac8f42e5 Fix the trader demo, the move to include services in NodeInfo objects broke it. 2016-04-18 17:28:04 +02:00
531e4a85fe Tweak the attachment classloader tests so that they don't break if IntelliJ has put the 'contracts:isolated' module on the classpath. 2016-04-14 19:42:39 +02:00
e91c46f045 Rewrite the AttachmentsClassLoader to avoid temporary file copies and fix the overlap check.
Throw a specialised exception that lists missing exceptions during deserialisation, so the dependency resolution code can access it (coming up).
2016-04-14 17:55:49 +02:00
7e9cbaa36e Minor: ClassLoaderTests reformatting 2016-04-14 16:09:19 +02:00
13f334ceba Dynamic class loading: check in a contract jar as a test resource to ensure tests can run from IntelliJ.
Minor tweak to use val more than var in tests.
2016-04-13 19:54:25 +02:00
7a9f74ca79 Merge branch 'master' into dynamic-loading 2016-04-13 19:03:04 +02:00
fc133de902 Minor: small changes to progress tracking in the IRS protocols 2016-04-13 15:20:27 +02:00
24cc56334b Minor: bugfix to simulation code (bug introduced during merging) 2016-04-13 15:20:27 +02:00
745f6251a6 Minor: better error message when an attempt is made to project coordinates with bad extents 2016-04-13 15:20:25 +02:00
9a8b3bd1ef Added interpolation functionality for the rates oracle. The oracle can be set up with different interpolation mechanisms, currently supported are: linear and cubic spline 2016-04-13 12:32:04 +01:00
265948dcee Clean up code based on feedback from Mike
* Move advertisedServices parameter in NodeInfo up one in the parameter order
* Change ServiceType away from being an enum
* Tweaked wording around what a NodeInfo is
* Renamed LocationStructures to PhysicalLocationStructures
* Move generator outside of function parameters
2016-04-11 16:09:15 +01:00
d05e6bb6a4 Merge branch 'master' into dynamic-loading 2016-04-09 01:01:36 +02:00
6fe8107d27 Merge branch 'master' into dynamic-loading 2016-04-08 22:40:18 +02:00
ca1db997ab Move node identity structures into core.node package
While node identity is used by services, it is not intrinsically part of services,
so moved it to the core.node package instead.
2016-04-08 15:19:56 +01:00
81b2935285 Move MockNetworkMapCache to core.testing 2016-04-08 15:18:43 +01:00
acee02f876 Add advertised services to NodeInfo 2016-04-08 15:15:54 +01:00
49d5fb33c4 Remove copyright headers from the files and put the text in the README instead, per feedback from Jacob and external counsel. 2016-04-08 11:46:07 +02:00
caf48b65c9 Run auto-formatter over the code. 2016-04-07 20:16:28 +02:00
931ce4a749 Minor: remove ugly bug workaround code now the issue has been fixed in Quasar upstream. 2016-04-07 20:03:46 +02:00
f3863ac5ef Minor: eliminate compiler warnings 2016-04-07 20:00:29 +02:00
1633ff1ef7 Add simulation classes, which build on top of the MockNetwork infrastructure but set up a group of nodes and performs scenarios between them. Currently there's a base class and two subclasses, one that does the trader demo scenario and one that does an IRS with fixings scenario. 2016-04-07 19:32:06 +02:00
a41524fc6a Add a reified inlined variant of WalletService.linearHeadsOfType 2016-04-07 19:32:06 +02:00
cd52ca21ce Minor: expose the rates oracle service (if the node provides one) as a property 2016-04-07 19:32:06 +02:00
10ee49d994 Minor: refactoring to reduce dependencies of the JSON object mapper. Clean up how mock identities are handled a little. This assists with the simulation code. 2016-04-07 19:32:06 +02:00
a2bd9f63a4 Move JSON objectmapper and serialiser code into a separate file. 2016-04-07 19:32:06 +02:00
a67267f562 Minor: add an SMM todo 2016-04-07 19:32:06 +02:00
345738f7de Rename classes
Rename LegallyIdentifiableNode to NodeInfo, to represent that legally identifiable is not a single concept.

Rename NetworkMapService to NetworkMapCache, as the API exposed is suited to a local cache, not a remote service.
2016-04-07 15:33:13 +01:00
34940c903b Merged in plt-17-api-server-merge5 (pull request #51)
IRS related protocols and scripts
2016-04-07 15:01:25 +01:00
55265e6115 IRS related protocols and scripts
Additional changes based on feedback

Additional changes based on feedback
2016-04-07 14:56:30 +01:00
c1ebf45834 Merged in rnicoll-typos (pull request #46)
Minor: Fix typo ('amounnt' to 'amount')
2016-04-06 13:16:31 +01:00
9561013b65 Replaced class Kryo2 with extension method on Kryo 2016-04-05 01:02:54 +02:00
bba0a4a55d Fixed bug in Kryo.useClassLoader
Renamed to AttachmentsClassLoader + autoformat
Added unit test to validate exception being throw when deserializing WireTransaction without contract jar in attachments.
2016-04-05 00:34:46 +02:00
88a7406ec9 Merge branch 'master' into dynamic-loading 2016-04-03 13:59:36 +02:00
420ecf80a0 Minor: fix a typo in a variable name, spotted by Rick 2016-03-30 18:50:12 +02:00
3adfd02e31 Support injection of latency into the mock (simulated) network. 2016-03-30 18:50:12 +02:00
d1e62c27c4 Unit testing: minor refactoring of MockNetwork 2016-03-30 18:50:12 +02:00
d1b5ada423 Add a notion of physical location.
This will be useful for various things in future, such as approximating the nearest consensus service (approximate because physical distance doesn't always match network distance), visualisation, simulation, etc.

LegallyIdentifiableNode now lists a physical place for the node to be in (which might not be totally accurate one day if we have super distributed mega-nodes, but will do for now).

The config file allows the admin to specify their nearest city.

There is a city database that can map such names through to coordinates, when known.

There is support for Mercator projection.
2016-03-30 18:50:11 +02:00
366860b2d8 Minor: Fix typo ('amounnt' to 'amount') 2016-03-30 16:13:33 +01:00
e122a57bf2 First working commit
First working commit

Formatting clean up

Revert All_tests.xml

Remove extra space

Feedback from code review
2016-03-30 15:04:08 +01:00
c0e2322414 Added comment on how to handle accidental gradle import in IDEA 2016-03-25 14:56:09 +01:00
58a509de63 Merge branch 'master' into dynamic-loading 2016-03-24 13:10:36 +00:00
e5dbf5d2a8 WireTransaction deserialization using AttachmentStorage 2016-03-24 12:06:41 +00:00
1344bfd6bb Replaced programRef in ContractState with a simple reference to contract 2016-03-23 17:51:14 +00:00
5b7fb86b6b Use TypeSafe Config library instead of Java properties files for the config file format. The default formats are compatible so this should not be disruptive. 2016-03-23 16:49:28 +00:00
9f7ae4c61d Basic JSON API with servertime call exposed at GET /api/servertime
Global Clock as part of ServiceHub to offer source of time in transactions, protocols, time stamping service etc (can be replace for demos and testing with a Clock that can be externally manipulated)

Edited with Mike's feedback

Edited with Mike's feedback
2016-03-23 09:34:45 +00:00