Commit Graph

183 Commits

Author SHA1 Message Date
Andrzej Cichocki
15f741f315 Spinoff driver into own project with demorun (#1401) 2017-09-05 09:50:51 +01:00
josecoll
b63df0ea39 Vault Service API final clean-up (#1348)
* Remove notify/notifyAll from public Vault Service API.

* 1st pass - remove ContractUpgrade public API calls from VaultService into self contained ContractUpgradeService.

* Fix compile error caused by cut'n'paste refactoring.
2017-08-31 14:01:10 +01:00
Andras Slemmer
e9f3b92e97 Add alwaysExcluded flag to quasar-hook, run config for generating exclude pattern 2017-08-30 17:14:01 +01:00
Shams Asari
1a879df0e7 Attempting to initiate flow that's not in the destination's classpath returns back a session reject 2017-07-28 10:22:26 +01:00
Andrzej Cichocki
0aadc037ef Make logging available in IntelliJ between gradle clean and assemble (#929)
* Enforce absence of node from client rpc smokeTest classpath
2017-06-28 09:54:09 +01:00
Shams Asari
b52d3706eb Moved Driver.kt to net.corda.testing.driver in the test-utils module 2017-06-14 15:12:39 +01:00
Shams Asari
afa3efb308 Fixes relating to testing flows and services.
Fixed issue where Corda services installed in unit tests were not being marked as serialise as singleton. Also the driver now automatically picks up the scanning annotations. This required moving the NodeFactory used in smoke tests into a separate module.
2017-06-06 15:22:43 +01:00
Andrzej Cichocki
bbe4c170c2 BFT notary demo (#725)
* Rename raft-notary-demo project to notary-demo
* Refactor serialisation filtering to allow BFT SMaRt to work, it no longer relies on the jdk.serialFilter system property
* In NodeBasedTest remove whitespace in node directory names for consistency with cordform and driver
2017-05-24 12:25:06 +01:00
Andrzej Cichocki
c8d71a96f5 One demo definition for both IntelliJ and gradle (#697)
* Raft notary demo now defined in one place that both IntelliJ/driver and gradle/runnodes can run
* New module cordform-common for code common to cordformation and corda
* Add single notary demo
2017-05-18 15:58:35 +01:00
Shams Asari
fe03680fdd Cleanup of the irs demo 2017-05-18 12:16:35 +01:00
Shams Asari
47c6b9c135 Making use of latest FastClasspathScanner version and cleanup of CollectSignaturesFlow.kt 2017-05-12 10:33:43 +01:00
Mike Hearn
b5dea88b39 Sync .idea/compiler.xml with Gradle 2017-05-08 14:11:34 +02:00
Rick Parker
18a0df4239 AMQP serialisation: Part 1 (#581)
Also turns on `-parameters` for java compiler
2017-05-05 12:14:02 +01:00
Chris Rankin
b597f05bd4 Delete IntelliJ RunConfiguration files for the demos. (#584) 2017-04-25 14:22:04 +01:00
Ross Nicoll
486368d926 Clean up messaging/RPC port configuration and docs (#296)
* Non-ssl artemis acceptor for RPC connection. (#271)

* New non-ssl acceptor in artemis server for RPC connection.

* Rename artemisAddress with messagingAddress

Rename artemisAddress with messagingAddress so that the node configuration file properties match
the code variable names.
Rename artemisPort to messagingPort in Gradle configuration to match node configuration naming.

* Add rpcPort configuration option for Gradle

* Update docs to reflect changes to RPC port configuration

* Renumber ports in example CorDapp to match numbering used elsewhere

* Restructure upgrade guide

* added config file checks on corda startup to make the upgrade path a bit smoother.
2017-03-17 10:32:14 +00:00
Shams Asari
b4b0e63c0d Removed Intellij dictionary file 2017-03-08 10:19:41 +00:00
Andrius Dagys
bbcaf5d98c Demo bug fixes (#217)
* Add webAddress back to NMS as it shifts the port allocation for all subsequent nodes and causes all demos to break.

* Attachment demo: fix node names

* Notary demo: fix certificate paths & ports

* IRS demo: role decider fixed to allocate roles properly. Previously it used to pick current node as the Fixer, causing both nodes to initiate the trade flow, resulting in double spend exceptions..
2017-02-07 17:18:21 +00:00
Clinton Alexander
e6da4909d3 Trader demo IntelliJ configurations and driver updated to work with the new RPC style demo. 2017-01-17 14:17:31 +00:00
Mike Hearn
b3fa9d62c1 Make the attachments demo IntelliJ run configs work again. 2017-01-09 15:55:02 +01:00
Mike Hearn
9a75adb0ab Simplify the attachments demo by getting rid of the web API and just using the RPC interface directly. The web API in this case wasn't actually adding anything that had to be server side. 2017-01-06 16:58:34 +01:00
Clinton Alexander
8a33b6b223 Renamed distributed and notary demo to 'Raft Notary Demo' to improve consistency in naming. 2017-01-05 11:43:24 +00:00
josecoll
eac2cb1cc6 Bank of Corda integration with Trader Demo and Explorer
Initial conversion of Explorer to use IssuerFlow (from BankOfCorda)

Initial conversion of TraderDemo to use IssuerFlow (from BankOfCorda)

Updated TraderDemo to use IssuerFlow (from BankOfCorda)

Fixed TraderDemo integration text (added new BankOfCorda node)

Updated Explorer with changes IssuerRequest params

Explorer now correctly displaying transaction id upon Issue.

Moved IssuerFlow into finance package so can be reused across multiple demos (TraderDemo) and applications (eg Explorer)

Refactored BankOfCorda demo to use Finance package and TestUtil constants

Updated TraderDemo to use IssuerFlow

Updated Explorer to use finance package IssuerFlow.

Advertised BankOfCorda as Issuer for usage by Explorer.

Explorer no longer depends on BankOfCorda demo since IssuerFlow promoted to Finance module

Added IssuerFlow to AbstractNode whitelist.
Explicit declarations of IssuerFlow no longer required.

Added plugin registration of IssuerFlow at bootstrap.

Revert whitelisting of IssuerFlow (plugin configured)

Refactored to use constant BOC definition.

Added gradle RPC security config.

Updated documentation

Fixed incorrect references.

Renamed Issuer banks.
Added new permission set (for Issuer nodes)
Added node nearestCity info
Added new Issuer Event Generator for Issuer nodes only

Associated currency with issuer using ServiceType naming structure.

Added argument flag (-S) to trigger event generator simulation node.

Fixed problem with issuers not resolving from network map.

Updated perms on Issuer rpc proxy nodes.

Fixed minor in cash generateExit identified by Explorer.

Changes applied in prep for AWG demo.

Added IntelliJ run-configurations for launching Explorer demo nodes (with and without simulation)

Updated documentation (and added additional gradle task to launch Explorer nodes in simulation mode).

Fix following rebase.

Addressed review items from PR.

Updated TraderDemo readme.

Updated TraderDemo gradle file to launch Bank of Corda node.

Updated JRE properties.

Updated IssuerModel to incorporate correct JFX Observable handling.
Fixed bug with Exit command not displaying any currency.

Added TODO's for revisiting correct Exception handling strategy.

Optimization for when issuing cash to self.

Minor updates following PR review.

Remove old refs to Royal Mint and Federal Reserve
2016-12-22 15:55:50 +00:00
Jose Coll
453f7cd223 Bank of Corda demo - Issuer of Cash
Resolve BankOfCorda through NMS in protocol

Fixes following Integration testing.

Register custom RPC Kryo classes.

Protocol -> Flow renaming

Bank of Corda demo - Issuer of Cash

Resolve BankOfCorda through NMS in protocol

Fixes following Integration testing.

Protocol -> Flow renaming

Addressed all comments in PR review.

Removed bank lines.

Updated minor inconsistency in README.md

All protocol references changed to flow.

changed protocol -> flow in TODO comment.

changed startProtocolPermission -> startFlowPermission in README.md

Added transaction id to IssuerFlow Success response.
Removed explicit call to record Cash Move transaction (as already recorded in subflow)

Removed quasar dependency.

Addressed comment in PR.

Updated to use CompositeKey.

Added arguments to pass in Currency and Amount.

Updated run configurations to pass in Currency and Amount values

Added additional parameter to IssuerFlow request: issueToPartyReference

Added Vault updates verification in RPC Integration test.

Fixed RPC Integration test (Vault assertions)

Updated run-time dependencies in line with other demos.

Applied changes following PR review (exception handling, party resolution handling, docs)

Updated gradle client run configs with new parameters.

Main driver app now uses standard out for display (was using logger info() but nothing was being displayed because of restrictive config)

Fixed formatting display problems.

Updated Web Api code to use new CordaRPCOps interface (and new partyFromName() exposed method)

Removed unused import.
2016-12-08 17:38:21 +00:00
Andrius Dagys
946cfda03e Added a distributed notary demo that runs a notary cluster and gets several transactions notarised 2016-11-25 17:09:57 +00:00
Mike Hearn
22198c06b5 Add back the SIMM run config 2016-11-23 13:07:49 +01:00
Mike Hearn
dcf7a8022f Fix some run configurations I broke without realising when I add a @file:JvmName annotation to the IRS demo 2016-11-22 15:04:15 +01:00
Mike Hearn
3743438b57 Cleanup: Delete a couple of run configs we don't need any more. 2016-11-22 15:04:14 +01:00
Mike Hearn
7c80971436 Remove .idea/modules.xml 2016-11-21 15:55:40 +01:00
Mike Hearn
859542b2df Samples: make the IRS demo usable from the command line again 2016-11-18 13:02:12 +01:00
Mike Hearn
b3a70c7acb Samples: make the attachment demo runnable from the command line again. 2016-11-18 13:02:11 +01:00
Mike Hearn
7265614d5c Samples: trader-demo can now be run from the command line with gradle 2016-11-18 13:02:11 +01:00
Mike Hearn
f630e15528 Fix build 2016-11-17 16:33:06 +01:00
Mike Hearn
90b083926f Reimport samples to main repo 2016-11-17 15:51:28 +01:00
Mike Hearn
02a90014e7 Delete duplicate module lines in modules.xml 2016-11-16 17:41:20 +01:00
Patrick Kuo
af899a98f4 Explorer corda branding 2016-11-16 13:26:05 +00:00
Mike Hearn
8a680b3726 Minor style tweaks to the universal contract. 2016-11-15 19:17:30 +01:00
Andras Slemmer
07df9f17b3 loadtest: Add loadtest code 2016-11-15 17:21:26 +00:00
Shams Asari
c326a9ae46 Moved the RPC user config out of the properties file and into the main config file 2016-11-15 12:52:08 +00:00
Clinton Alexander
70cf57f736 Added correct modules.xml for the finance project. 2016-11-04 13:38:46 +00:00
Clinton Alexander
7e198e7cf3 Renamed contracts project to finance to better reflect the purpose of the project. 2016-11-04 13:35:25 +00:00
Patrick Kuo
7d465999d6 Merged in pat-explorer-move (pull request #443)
move explorer to tools folder
2016-11-04 11:44:16 +00:00
Patrick Kuo
e29f281cfd Changed / to : to align with gradle include directive. 2016-11-04 11:20:02 +00:00
Clinton Alexander
30f7eadcd1 Renamed publishToMavenLocal to install in run configs. 2016-11-04 10:37:38 +00:00
Patrick Kuo
3cd8562b3b move explorer to tools folder 2016-11-03 17:28:38 +00:00
Clinton Alexander
54dfced4ab Added publish to maven local run config and added publish to the install run configuration. 2016-11-03 09:54:41 +00:00
Clinton Alexander
1e6cca4d5d Removed dead installDist configurations and moved Jolokia access to the correct resources dir. 2016-11-01 16:09:13 +00:00
Clinton Alexander
810a5eb899 Removed the plugin registry that pointed to non-existent classes. 2016-10-13 11:26:49 +01:00
Clinton Alexander
3ea7d382a2 Removed IRS demo and network simulator and placed them in separate repos. 2016-10-12 16:33:05 +01:00
Andras Slemmer
3b77de67b6 docs: add docs/source/example-code module, tutorial on the Client RPC API 2016-10-05 10:40:18 +01:00
Ross Nicoll
16a014e45a Add further words to dictionary 2016-09-21 10:50:28 +01:00
Ross Nicoll
89ead30e82 Add custom dictionary 2016-09-21 10:50:28 +01:00
Ross Nicoll
ae4513c8eb Update modules.xml to reflect rename of network explorer to simulator 2016-09-20 17:14:45 +01:00
Andras Slemmer
a5774adba1 .idea: Share explorer configuration 2016-09-20 13:42:01 +01:00
Andras Slemmer
9877299ba8 .idea: Remove superfluous lines 2016-09-19 15:05:22 +01:00
Andras Slemmer
91de256dcc explorer: reactfx->rx 2016-09-19 15:05:22 +01:00
Andras Slemmer
1ec89e07c4 explorer: Add explorer subproject with javafx screens for cash and transactions 2016-09-19 15:05:22 +01:00
Mike Hearn
e27a61ffe6 Make the name of the Network Map Visualiser tool consistent in the code and module naming. 2016-09-19 11:53:41 +01:00
rick.parker
0b1c3a09a9 Remove non-gradle "All tests" as seems to hang and add several Gradle based run configurations.
Added buildCordaJAR to install step.
2016-09-12 15:17:54 +01:00
Matthew Nesbit
9518c38f29 Ensure integration tests in modules are in separate configurations and not directly called from build or installDist. 2016-09-08 15:28:04 +01:00
Andras Slemmer
9cda99bbcc client: Add client submodule 2016-09-01 09:36:05 +01:00
Ross Nicoll
232db9a1fd Move test utilities into their own package
This moves a lot of the test support code into its own package which is only imported for tests,
so it's not shipped as a part of core Corda. The node currently depends on this support code to
compile, although future work could try to separate this out. This change highlights that parts
of production code is dependent on test elements (i.e. dummy keys), and makes it harder for
such accidental crosses to occur later.

An integration test category is also added as part of this work, to contribute towards COR-345.
2016-08-31 15:40:54 +01:00
Clinton Alexander
9375cd21c1 All Tests can now be run on Windows as tests are now forked by class. 2016-07-20 14:27:24 +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
ad45b5deaf Tests now fail if spawned processes take too long to finish. 2016-06-28 14:03:32 +01:00
Clinton Alexander
609d80e630 Integration test module set correctly. 2016-06-28 14:03:32 +01:00
Mike Hearn
809d1c5dcd Add an experimental module. 2016-06-22 18:00:36 +02:00
Ross Nicoll
795fba1165 Add buildSrc module to IntelliJ 2016-06-17 16:33:45 +01:00
Matthew Nesbit
ab5fc4a1d5 Fix up default IntelliJ run configuration 2016-05-23 15:10:45 +01:00
Matthew Nesbit
63a5fd1b9e Add com.r3corda to all namespaces. 2016-05-23 14:53:56 +01:00
Matthew Nesbit
988e00099d Capture file moves to separate Node implementation code into its own gradle module and leave only demo code in top level src folders.
I have to temporarily break\disable the IRS demo to which has a circular dependency. Will fix next.
2016-05-14 17:57:41 +01:00
Andrius Dagys
fa3f7e7fa6 Added a basic Notary service with protocol for signing transactions 2016-05-13 16:17:50 +01:00
Mike Hearn
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
sofusmortensen
88a7406ec9 Merge branch 'master' into dynamic-loading 2016-04-03 13:59:36 +02:00
Mike Hearn
eecdba9e26 Minor: fix "All tests" run config to actually run all tests again, post IJ2016.1 upgrade 2016-03-30 18:54:44 +02:00
sofusmortensen
e6ce1e5b76 Fixed unit test with contracts.isolated.jar in classpath when running from IDEA. 2016-03-22 14:48:59 +00:00
Mike Hearn
621c88b93a IJ 2016.1 2016-03-22 10:54:35 +00:00
Mike Hearn
8d3c9643e9 Minor: Move TraderDemo to demos package 2016-03-08 17:29:23 +01:00
Mike Hearn
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
Mike Hearn
0d9f5a955b Minor: fix IntelliJ build config so it runs tests in submodules too. 2016-02-24 14:49:25 +01:00
Mike Hearn
40d9b7686b Minor: tweak IntelliJ run configs so trader demo nodes check Quasar instrumentation when run in IntelliJ 2016-02-17 17:19:36 +01:00
Mike Hearn
f705eee312 Use buyer/seller instead of alpha/beta and allow nodes to both be named localhost. Update docs. 2016-02-05 15:48:58 +01:00
Mike Hearn
1e8ea8eb2c Implement the beginnings of a serving node.
It uses Artemis (an embeddable MQ broker) and can run in either a 'serving' mode, in which case it will sit around waiting to sell fake commercial paper assets, or a 'buying' mode in which case it will connect to a specified serving node and run the two party trade protocol.

Most services are either mocked out or too trivial to be useful at this point. They will be fleshed out in the future.
2016-02-03 16:57:01 +01:00
Mike Hearn
8a3f619480 Check in an "All tests" config and add quasar jar to lib directory to simplify IntelliJ configuration 2016-01-12 16:40:34 +01:00